From 9051fc347c428500090e814c98e9d8503dc7a205 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 8 Dec 2023 15:14:42 -0800
Subject: [PATCH] remove redundant patch

---
 .../1.20.3}/0748-Kick-on-main-for-illegal-chat.patch          | 1 +
 ...patch => 0748-Multi-Block-Change-API-Implementation.patch} | 0
 ...0-Fix-NotePlayEvent.patch => 0749-Fix-NotePlayEvent.patch} | 0
 ...ze-Tick-Lock-API.patch => 0750-Freeze-Tick-Lock-API.patch} | 0
 .../server/{0752-Dolphin-API.patch => 0751-Dolphin-API.patch} | 0
 ...ectType-API.patch => 0752-More-PotionEffectType-API.patch} | 0
 ... 0753-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} | 0
 ...PI-for-creating-command-sender-which-forwards-feedb.patch} | 0
 ...atch => 0755-Add-missing-structure-set-seed-configs.patch} | 0
 ...nerateChunk.patch => 0756-Implement-regenerateChunk.patch} | 0
 ...> 0757-Fix-cancelled-powdered-snow-bucket-placement.patch} | 0
 ...dd-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} | 0
 ...Add-GameEvent-tags.patch => 0759-Add-GameEvent-tags.patch} | 0
 ...xecute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} | 0
 ...cipesUsed-API.patch => 0761-Furnace-RecipesUsed-API.patch} | 0
 ...ch => 0762-Configurable-sculk-sensor-listener-range.patch} | 0
 ...patch => 0763-Add-missing-block-data-mins-and-maxes.patch} | 0
 ...ption-to-have-default-CustomSpawners-in-custom-worl.patch} | 0
 ...5-Put-world-into-worldlist-before-initing-the-world.patch} | 0
 ...ion-Desync.patch => 0766-Fix-Entity-Position-Desync.patch} | 0
 ...stom-Potion-Mixes.patch => 0767-Custom-Potion-Mixes.patch} | 0
 ...reen.patch => 0768-Force-close-world-loading-screen.patch} | 0
 ...thods.patch => 0769-Fix-falling-block-spawn-methods.patch} | 0
 ...s.patch => 0770-Expose-furnace-minecart-push-values.patch} | 0
 ...ix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} | 0
 ...re-Projectile-API.patch => 0772-More-Projectile-API.patch} | 0
 ...patch => 0773-Fix-swamp-hut-cat-generation-deadlock.patch} | 0
 ...on-t-allow-vehicle-movement-from-players-while-tele.patch} | 2 +-
 ...me-API.patch => 0775-Implement-getComputedBiome-API.patch} | 0
 ...-nonnull.patch => 0776-Make-some-itemstacks-nonnull.patch} | 0
 ...s-API.patch => 0777-Implement-enchantWithLevels-API.patch} | 0
 ...unloadWorld.patch => 0778-Fix-saving-in-unloadWorld.patch} | 0
 ...Block-calls.patch => 0779-Buffer-OOB-setBlock-calls.patch} | 0
 ...geEvent.patch => 0780-Add-TameableDeathMessageEvent.patch} | 0
 ... 0781-Fix-new-block-data-for-EntityChangeBlockEvent.patch} | 0
 ...ix-player-loottables-running-when-mob-loot-gamerule.patch} | 0
 ...Ensure-entity-passenger-world-matches-ridden-entity.patch} | 0
 ...atch => 0784-Guard-against-invalid-entity-positions.patch} | 0
 ...che-resource-keys.patch => 0785-cache-resource-keys.patch} | 0
 ...0786-Allow-to-change-the-podium-for-the-EnderDragon.patch} | 0
 ...ix-NBT-pieces-overriding-a-block-entity-during-worl.patch} | 0
 ...788-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} | 0
 ...h => 0789-Prevent-tile-entity-copies-loading-chunks.patch} | 4 ++--
 ...se-username-instead-of-display-name-in-PlayerList-g.patch} | 0
 ...tch => 0791-Pass-ServerLevel-for-gamerule-callbacks.patch} | 4 ++--
 ...-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} | 0
 ...wnLoaded.patch => 0793-WorldCreator-keepSpawnLoaded.patch} | 0
 ... => 0794-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} | 0
 ...rigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} | 0
 ...96-Add-EntityDyeEvent-and-CollarColorable-interface.patch} | 0
 ...ch => 0797-Fire-CauldronLevelChange-on-initial-fill.patch} | 0
 ...0798-fix-powder-snow-cauldrons-not-turning-to-water.patch} | 0
 ...temEvent.patch => 0799-Add-PlayerStopUsingItemEvent.patch} | 0
 ...Don-t-tick-markers.patch => 0800-Don-t-tick-markers.patch} | 0
 ...lingBlock-API.patch => 0801-Expand-FallingBlock-API.patch} | 0
 ...patch => 0802-Do-not-accept-invalid-client-settings.patch} | 4 ++--
 ...otocol.patch => 0803-Add-support-for-Proxy-Protocol.patch} | 0
 ...patch => 0804-Fix-OfflinePlayer-getBedSpawnLocation.patch} | 0
 ...Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} | 0
 ...ity-NBT.patch => 0806-Sanitize-Sent-BlockEntity-NBT.patch} | 0
 ...isable-component-selector-resolving-in-books-by-def.patch} | 0
 ...> 0808-Prevent-entity-loading-causing-async-lookups.patch} | 0
 ...-Throw-exception-on-world-create-while-being-ticked.patch} | 0
 ... 0810-Add-Alternate-Current-redstone-implementation.patch} | 0
 ...date.patch => 0811-Dont-resent-entity-on-art-update.patch} | 0
 ...hangeEvent.patch => 0812-Add-WardenAngerChangeEvent.patch} | 0
 ...-Add-option-for-strict-advancement-dimension-checks.patch} | 0
 ...dd-missing-important-BlockStateListPopulator-method.patch} | 0
 ...meable-Banner-API.patch => 0815-Nameable-Banner-API.patch} | 0
 ... => 0816-Don-t-broadcast-messages-to-command-blocks.patch} | 0
 ... 0817-Prevent-empty-items-from-being-added-to-world.patch} | 2 +-
 ...ix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} | 0
 ...er-getFishHook.patch => 0819-Add-Player-getFishHook.patch} | 0
 ...o-not-sync-load-chunk-for-dynamic-game-event-listen.patch} | 0
 ... 0821-Add-various-missing-EntityDropItemEvent-calls.patch} | 0
 ...Fix-Bee-flower-NPE.patch => 0822-Fix-Bee-flower-NPE.patch} | 0
 ...ix-Spigot-Config-not-using-commands.spam-exclusions.patch} | 4 ++--
 ...5-More-Teleport-API.patch => 0824-More-Teleport-API.patch} | 2 +-
 ...ReadyEvent.patch => 0825-Add-EntityPortalReadyEvent.patch} | 0
 ... 0826-Don-t-use-level-random-in-entity-constructors.patch} | 0
 ...> 0827-Send-block-entities-after-destroy-prediction.patch} | 2 +-
 ...ch => 0828-Warn-on-plugins-accessing-faraway-chunks.patch} | 0
 ...atch => 0829-Custom-Chat-Completion-Suggestions-API.patch} | 0
 ...s.patch => 0830-Add-and-fix-missing-BlockFadeEvents.patch} | 0
 .../{0832-Collision-API.patch => 0831-Collision-API.patch}    | 0
 ...ix-suggest-command-message-for-brigadier-syntax-exc.patch} | 0
 ...4-Block-Ticking-API.patch => 0833-Block-Ticking-API.patch} | 0
 ...rt.patch => 0834-Add-Velocity-IP-Forwarding-Support.patch} | 0
 ...thods.patch => 0835-Add-NamespacedKey-biome-methods.patch} | 0
 ...patch => 0836-Fix-plugin-loggers-on-server-shutdown.patch} | 0
 ...37-Stop-large-look-changes-from-crashing-the-server.patch} | 0
 ... => 0838-Fire-EntityChangeBlockEvent-in-more-places.patch} | 0
 ...n-reason.patch => 0839-Missing-eating-regain-reason.patch} | 0
 ...ing-effect-cause.patch => 0840-Missing-effect-cause.patch} | 0
 ...dded-byte-array-serialization-deserialization-for-P.patch} | 0
 ...dd-a-consumer-parameter-to-ProjectileSource-launchP.patch} | 0
 ...ten.patch => 0843-Call-BlockPhysicsEvent-more-often.patch} | 0
 ...-limit.patch => 0844-Configurable-chat-thread-limit.patch} | 0
 ...itigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} | 0
 ...ng-user.patch => 0846-fix-Jigsaw-block-kicking-user.patch} | 0
 ...847-use-BlockFormEvent-for-mud-converting-into-clay.patch} | 0
 ...BlockState.patch => 0848-Add-getDrops-to-BlockState.patch} | 0
 ...illa-bugs.patch => 0849-Fix-a-bunch-of-vanilla-bugs.patch} | 2 +-
 ...emove-unnecessary-onTrackingStart-during-navigation.patch} | 0
 ...d-items.patch => 0851-Fix-custom-piglin-loved-items.patch} | 0
 ...ent-fixes.patch => 0852-EntityPickupItemEvent-fixes.patch} | 0
 ...orrectly-handle-interactions-with-items-on-cooldown.patch} | 0
 ...nt.patch => 0854-Add-PlayerInventorySlotChangeEvent.patch} | 0
 ...nce-API.patch => 0855-Elder-Guardian-appearance-API.patch} | 0
 ...atch => 0856-Allow-changing-bed-s-occupied-property.patch} | 0
 ...nockback-API.patch => 0857-Add-entity-knockback-API.patch} | 0
 ...ct-headless-JREs.patch => 0858-Detect-headless-JREs.patch} | 0
 ...859-fixed-entity-vehicle-collision-event-not-called.patch} | 0
 ...ing.patch => 0860-optimized-dirt-and-snow-spreading.patch} | 0
 ...leSitEvent.patch => 0861-Added-EntityToggleSitEvent.patch} | 0
 ...lay-option.patch => 0862-Add-fire-tick-delay-option.patch} | 0
 ...ving-Piston-API.patch => 0863-Add-Moving-Piston-API.patch} | 0
 ...awn-tick.patch => 0864-Ignore-impossible-spawn-tick.patch} | 0
 ...rack-projectile-source-for-fireworks-from-dispenser.patch} | 0
 ...ix-EntityArgument-suggestion-permissions-to-align-w.patch} | 0
 ...ix-EntityCombustEvent-cancellation-cant-fully-preve.patch} | 0
 ...s.patch => 0868-Prevent-compass-from-loading-chunks.patch} | 0
 ...yEvent.patch => 0869-Add-PrePlayerAttackEntityEvent.patch} | 0
 ...ch => 0870-ensure-reset-EnderDragon-boss-event-name.patch} | 0
 ...71-fix-MC-252817-green-map-markers-do-not-disappear.patch} | 0
 ...ing-API.patch => 0872-Add-Player-Warden-Warning-API.patch} | 0
 ...0873-More-vanilla-friendly-methods-to-update-trades.patch} | 0
 ...mmand.patch => 0874-Add-paper-dumplisteners-command.patch} | 0
 ... => 0875-check-global-player-list-where-appropriate.patch} | 0
 ...ch => 0876-Fix-async-entity-add-due-to-fungus-trees.patch} | 0
 ...Stack-damage-API.patch => 0877-ItemStack-damage-API.patch} | 0
 .../{0879-Friction-API.patch => 0878-Friction-API.patch}      | 0
 ...9-Ability-to-control-player-s-insomnia-and-phantoms.patch} | 0
 ...-shutdown.patch => 0880-Fix-player-kick-on-shutdown.patch} | 0
 ...t-in-menus.patch => 0881-Sync-offhand-slot-in-menus.patch} | 0
 ...-Events.patch => 0882-Player-Entity-Tracking-Events.patch} | 0
 ...look-distance.patch => 0883-Limit-pet-look-distance.patch} | 0
 ...end-entities.patch => 0884-Properly-resend-entities.patch} | 4 ++--
 ... => 0885-Fixes-and-additions-to-the-SpawnReason-API.patch} | 0
 ...{0887-fix-Instruments.patch => 0886-fix-Instruments.patch} | 0
 ...mprove-inlining-for-some-hot-BlockBehavior-and-Flui.patch} | 0
 ...ix-inconsistencies-in-dispense-events-regarding-sta.patch} | 0
 ...ockCheckEvent.patch => 0889-Add-BlockLockCheckEvent.patch} | 0
 ...ntities.patch => 0890-Add-Sneaking-API-for-Entities.patch} | 0
 ...and-errors.patch => 0891-Improve-logging-and-errors.patch} | 4 ++--
 ...ove-PortalEvents.patch => 0892-Improve-PortalEvents.patch} | 0
 ...3-Add-config-option-for-spider-worldborder-climbing.patch} | 0
 ... => 0894-Add-missing-SpigotConfig-logCommands-check.patch} | 4 ++--
 ...0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} | 0
 ...Flying-Fall-Damage.patch => 0896-Flying-Fall-Damage.patch} | 0
 ...dd-exploded-block-state-to-BlockExplodeEvent-and-En.patch} | 0
 ...xpose-pre-collision-moving-velocity-to-VehicleBlock.patch} | 0
 ....patch => 0899-config-for-disabling-entity-tag-tags.patch} | 0
 ...> 0900-Use-single-player-info-update-packet-on-join.patch} | 4 ++--
 ...-Correctly-shrink-items-during-EntityResurrectEvent.patch} | 0
 .../{0903-Win-Screen-API.patch => 0902-Win-Screen-API.patch}  | 0
 ...903-Remove-CraftItemStack-setAmount-null-assignment.patch} | 0
 ....patch => 0904-Fix-force-opening-enchantment-tables.patch} | 0
 ...-Body-Yaw-API.patch => 0905-Add-Entity-Body-Yaw-API.patch} | 0
 ...ix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} | 0
 ...pdate-the-flag-when-a-captured-block-state-is-outda.patch} | 0
 ...eEggEvent.patch => 0908-Add-EntityFertilizeEggEvent.patch} | 0
 ...09-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} | 0
 ...910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} | 0
 ...ch => 0911-Correctly-handle-ArmorStand-invisibility.patch} | 0
 ... => 0912-Fix-advancement-triggers-for-entity-damage.patch} | 0
 ...spawn.patch => 0913-Fix-text-display-error-on-spawn.patch} | 0
 ...14-Fix-certain-inventories-returning-null-Locations.patch} | 0
 ...6-Add-Shearable-API.patch => 0915-Add-Shearable-API.patch} | 0
 ...e.patch => 0916-Fix-SpawnEggMeta-get-setSpawnedType.patch} | 0
 ...918-Optimize-Hoppers.patch => 0917-Optimize-Hoppers.patch} | 0
 ...=> 0918-Fix-beehives-generating-from-using-bonemeal.patch} | 0
 ...ix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} | 0
 ... 0920-Treat-sequence-violations-like-they-should-be.patch} | 2 +-
 ...=> 0921-remove-duplicate-animate-packet-for-records.patch} | 0
 ...revent-causing-expired-keys-from-impacting-new-join.patch} | 4 ++--
 ...Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} | 2 +-
 ...torage.patch => 0924-Use-array-for-gamerule-storage.patch} | 0
 ...s.patch => 0925-Fix-a-couple-of-upstream-bed-issues.patch} | 0
 ....patch => 0926-Fix-demo-flag-not-enabling-demo-mode.patch} | 0
 ...ard-API.patch => 0927-Add-Mob-Experience-reward-API.patch} | 0
 ...h => 0928-Break-redstone-on-top-of-trap-doors-early.patch} | 0
 ...ks.patch => 0929-Fix-DamageCause-for-Falling-Blocks.patch} | 0
 ...h => 0930-Avoid-Lazy-Initialization-for-Enum-Fields.patch} | 0
 ...impl.patch => 0931-More-accurate-isInOpenWater-impl.patch} | 0
 ...ix-concurrenct-access-to-lookups-field-in-RegistryO.patch} | 0
 ... 0933-Optimise-recalcBlockCounts-for-empty-sections.patch} | 0
 ...mMendEvent.patch => 0934-Expand-PlayerItemMendEvent.patch} | 0
 ...ch => 0935-Refresh-ProjectileSource-for-projectiles.patch} | 0
 ...difier-API.patch => 0936-Add-transient-modifier-API.patch} | 0
 ...ock-place-logic.patch => 0937-Fix-block-place-logic.patch} | 0
 ...8-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} | 0
 ...-Ignore-inline-definitions-of-trim-material-pattern.patch} | 0
 ...atch => 0940-Call-BlockGrowEvent-for-missing-blocks.patch} | 0
 ...on-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} | 0
 ...h => 0942-fix-MapLike-spam-for-missing-key-selector.patch} | 0
 ...on.patch => 0943-Fix-sniffer-removeExploredLocation.patch} | 0
 ...0944-Add-method-to-remove-all-active-potion-effects.patch} | 0
 ...emp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch} | 0
 ...-Fix-incorrect-crafting-result-amount-for-fireworks.patch} | 0
 ...le-Items.patch => 0947-Properly-Cancel-Usable-Items.patch} | 2 +-
 ...ign.patch => 0948-Add-event-for-player-editing-sign.patch} | 0
 ...=> 0949-Only-tick-item-frames-if-players-can-see-it.patch} | 0
 ... => 0950-Improve-command-function-perm-level-checks.patch} | 0
 ...s.patch => 0951-Add-option-to-disable-block-updates.patch} | 0
 ...Event.patch => 0952-Call-missing-BlockDispenseEvent.patch} | 0
 ... 0953-Don-t-load-chunks-for-supporting-block-checks.patch} | 0
 ...s.patch => 0954-Optimize-player-lookups-for-beacons.patch} | 0
 ...deFor.patch => 0955-Add-Sign-getInteractableSideFor.patch} | 0
 ...data.patch => 0956-Array-backed-synched-entity-data.patch} | 0
 ...ets.patch => 0957-fix-item-meta-for-tadpole-buckets.patch} | 0
 ....patch => 0958-Suppress-Item-Meta-Validation-Checks.patch} | 0
 ...{0960-Fix-BanList-API.patch => 0959-Fix-BanList-API.patch} | 0
 ...etermine-lava-and-water-fluid-explosion-resistance-.patch} | 0
 ...patch => 0961-Fix-possible-NPE-on-painting-creation.patch} | 0
 ...nly-set-despawnTimer-for-Wandering-Traders-spawned-.patch} | 0
 ... => 0963-ExperienceOrb-should-call-EntitySpawnEvent.patch} | 0
 ...965-Don-t-tick-signs.patch => 0964-Don-t-tick-signs.patch} | 0
 ...965-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} | 0
 ...whitelist-events.patch => 0966-Add-whitelist-events.patch} | 0
 ...veEvent.patch => 0967-Implement-PlayerFailMoveEvent.patch} | 2 +-
 ....patch => 0968-Folia-scheduler-and-owned-region-API.patch} | 0
 ...=> 0969-Only-erase-allay-memory-on-non-item-targets.patch} | 0
 ...s.patch => 0970-API-for-updating-recipes-on-clients.patch} | 0
 ...=> 0971-Fix-rotation-when-spawning-display-entities.patch} | 0
 ...rowth.patch => 0972-Only-capture-actual-tree-growth.patch} | 0
 ...-Use-correct-source-for-mushroom-block-spread-event.patch} | 0
 ...espect-randomizeData-on-more-entities-when-spawning.patch} | 0
 ...ad.patch => 0975-Use-correct-seed-on-api-world-load.patch} | 0
 ...Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} | 0
 ...m-frames.patch => 0977-Cache-map-ids-on-item-frames.patch} | 0
 ...atch => 0978-Fix-custom-statistic-criteria-creation.patch} | 0
 ...fix-for-Effect.patch => 0979-Bandaid-fix-for-Effect.patch} | 0
 ...yst-bloom-API.patch => 0980-SculkCatalyst-bloom-API.patch} | 0
 ...e.patch => 0981-API-for-an-entity-s-scoreboard-name.patch} | 0
 ...mprove-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} | 0
 ...eprecate-and-replace-methods-with-old-StructureType.patch} | 0
 ...on-t-tab-complete-namespaced-commands-if-send-names.patch} | 2 +-
 ...=> 0985-Properly-handle-BlockBreakEvent-isDropItems.patch} | 0
 ...ch => 0986-Fire-entity-death-event-for-ender-dragon.patch} | 0
 ...-Configurable-entity-tracking-range-by-Y-coordinate.patch} | 0
 ...for-Player.patch => 0988-Add-Listing-API-for-Player.patch} | 0
 ...atch => 0989-Configurable-Region-Compression-Format.patch} | 0
 ...90-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} | 0
 ...t-getStatus.patch => 0991-Fix-NPE-on-Boat-getStatus.patch} | 0
 ...{0993-Expand-Pose-API.patch => 0992-Expand-Pose-API.patch} | 0
 ...ragonBattle-API.patch => 0993-More-DragonBattle-API.patch} | 0
 ...bt-tags.patch => 0994-Deep-clone-unhandled-nbt-tags.patch} | 0
 ...PickItemEvent.patch => 0995-Add-PlayerPickItemEvent.patch} | 2 +-
 ...ts.patch => 0996-Improve-performance-of-mass-crafts.patch} | 0
 ...om-damage.patch => 0997-Allow-trident-custom-damage.patch} | 0
 ...patch => 0998-Expose-hand-during-BlockCanBuildEvent.patch} | 0
 ...=> 0999-Optimize-nearest-structure-border-iteration.patch} | 0
 ...d.patch => 1000-Implement-OfflinePlayer-isConnected.patch} | 0
 ...inventory-desync.patch => 1001-Fix-inventory-desync.patch} | 0
 ...tch => 1002-Add-titleOverride-to-InventoryOpenEvent.patch} | 0
 ...time.patch => 1003-Configure-sniffer-egg-hatch-time.patch} | 0
 ...o-crystal-portal-proximity-check-before-entity-look.patch} | 0
 ....patch => 1005-Skip-POI-finding-if-stuck-in-vehicle.patch} | 0
 ... => 1006-Add-slot-sanity-checks-in-container-clicks.patch} | 4 ++--
 ...patch => 1007-Call-BlockRedstoneEvents-for-lecterns.patch} | 0
 ... => 1008-Allow-proper-checking-of-empty-item-stacks.patch} | 0
 ....patch => 1009-Fix-silent-equipment-change-for-mobs.patch} | 0
 ...orced-Stats.patch => 1010-Fix-spigot-s-Forced-Stats.patch} | 0
 ...=> 1011-Add-missing-InventoryHolders-to-inventories.patch} | 0
 ...o-not-read-tile-entities-in-chunks-that-are-positio.patch} | 0
 ...plosions.patch => 1013-Actually-optimise-explosions.patch} | 0
 ... => 1014-Add-missing-logs-for-log-ips-config-option.patch} | 0
 ...6.patch => 1015-Remove-Spigot-Bug-Fix-for-MC-109346.patch} | 0
 ...iciousStewMeta.patch => 1016-Fix-SuspiciousStewMeta.patch} | 0
 ...eration.patch => 1017-Optimise-chunk-tick-iteration.patch} | 0
 ...ensation-ticks.patch => 1018-Lag-compensation-ticks.patch} | 2 +-
 ...ix-race-condition-on-UpgradeData.BlockFixers-class-.patch} | 0
 ... 1020-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} | 0
 ... 1021-Fix-team-sidebar-objectives-not-being-cleared.patch} | 0
 ...eval.patch => 1022-Optimise-nearby-player-retrieval.patch} | 2 +-
 ...ger-AI.patch => 1023-Remove-streams-for-villager-AI.patch} | 0
 ...patch => 1024-Fix-missing-map-initialize-event-call.patch} | 0
 ...pdate-entity-data-when-attaching-firework-to-entity.patch} | 0
 ...se-correct-variable-for-initializing-CraftLootTable.patch} | 0
 ...ake-setVelocity-method-of-Fireballs-change-the-trav.patch} | 0
 ...ment.patch => 1028-Fix-UnsafeValues-loadAdvancement.patch} | 0
 ...tion-API.patch => 1029-Add-player-idle-duration-API.patch} | 0
 ...1030-Don-t-check-if-we-can-see-non-visible-entities.patch} | 0
 ...tch => 1031-Fix-NPE-in-SculkBloomEvent-world-access.patch} | 0
 ...Allow-null-itemstack-for-Player-sendEquipmentChange.patch} | 0
 ...034-Optimize-VarInts.patch => 1033-Optimize-VarInts.patch} | 0
 ...dd-API-to-get-the-collision-shape-of-a-block-before.patch} | 0
 ...ch => 1035-Add-predicate-for-blocks-when-raytracing.patch} | 0
 ...roadcast-take-item-packets-with-collector-as-source.patch} | 0
 ...h => 1037-fix-secure-profile-with-proxy-online-mode.patch} | 0
 ...Potion-API.patch => 1038-Expand-LingeringPotion-API.patch} | 0
 ...MaterialTagsTest.patch => 1039-Add-MaterialTagsTest.patch} | 0
 ...ix-strikeLightningEffect-powers-lightning-rods-and-.patch} | 0
 ...-Add-hand-to-fish-event-for-all-player-interactions.patch} | 0
 ...ch => 1042-Fix-several-issues-with-EntityBreedEvent.patch} | 0
 ...r-API.patch => 1043-Add-UUID-attribute-modifier-API.patch} | 0
 ...1044-Fix-missing-event-call-for-entity-teleport-API.patch} | 0
 ...ch => 1045-Lazily-create-LootContext-for-criterions.patch} | 0
 ...-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch} | 0
 ...ix-CraftMetaItem-getAttributeModifier-duplication-c.patch} | 0
 ...patch => 1048-Restore-vanilla-entity-drops-behavior.patch} | 0
 ...ure-check-API.patch => 1049-Add-Structure-check-API.patch} | 0
 ...ns.patch => 1050-Dont-resend-blocks-on-interactions.patch} | 0
 ...dventure-update.patch => 1051-Temp-adventure-update.patch} | 0
 ... => 1052-Keep-previous-behavior-for-setResourcePack.patch} | 0
 306 files changed, 34 insertions(+), 33 deletions(-)
 rename patches/{server => removed/1.20.3}/0748-Kick-on-main-for-illegal-chat.patch (97%)
 rename patches/server/{0749-Multi-Block-Change-API-Implementation.patch => 0748-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0750-Fix-NotePlayEvent.patch => 0749-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0751-Freeze-Tick-Lock-API.patch => 0750-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0752-Dolphin-API.patch => 0751-Dolphin-API.patch} (100%)
 rename patches/server/{0753-More-PotionEffectType-API.patch => 0752-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0754-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0753-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0755-API-for-creating-command-sender-which-forwards-feedb.patch => 0754-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0756-Add-missing-structure-set-seed-configs.patch => 0755-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0757-Implement-regenerateChunk.patch => 0756-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0758-Fix-cancelled-powdered-snow-bucket-placement.patch => 0757-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0759-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0758-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0760-Add-GameEvent-tags.patch => 0759-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0761-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0760-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0762-Furnace-RecipesUsed-API.patch => 0761-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0763-Configurable-sculk-sensor-listener-range.patch => 0762-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0764-Add-missing-block-data-mins-and-maxes.patch => 0763-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0765-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0764-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0766-Put-world-into-worldlist-before-initing-the-world.patch => 0765-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0767-Fix-Entity-Position-Desync.patch => 0766-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0768-Custom-Potion-Mixes.patch => 0767-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0769-Force-close-world-loading-screen.patch => 0768-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0770-Fix-falling-block-spawn-methods.patch => 0769-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0771-Expose-furnace-minecart-push-values.patch => 0770-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0772-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0771-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0773-More-Projectile-API.patch => 0772-More-Projectile-API.patch} (100%)
 rename patches/server/{0774-Fix-swamp-hut-cat-generation-deadlock.patch => 0773-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0775-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0774-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (93%)
 rename patches/server/{0776-Implement-getComputedBiome-API.patch => 0775-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0777-Make-some-itemstacks-nonnull.patch => 0776-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0778-Implement-enchantWithLevels-API.patch => 0777-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0779-Fix-saving-in-unloadWorld.patch => 0778-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0780-Buffer-OOB-setBlock-calls.patch => 0779-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0781-Add-TameableDeathMessageEvent.patch => 0780-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0782-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0781-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0783-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0782-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0784-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0783-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0785-Guard-against-invalid-entity-positions.patch => 0784-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0786-cache-resource-keys.patch => 0785-cache-resource-keys.patch} (100%)
 rename patches/server/{0787-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0786-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0788-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0787-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0789-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0788-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0790-Prevent-tile-entity-copies-loading-chunks.patch => 0789-Prevent-tile-entity-copies-loading-chunks.patch} (89%)
 rename patches/server/{0791-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0790-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0792-Pass-ServerLevel-for-gamerule-callbacks.patch => 0791-Pass-ServerLevel-for-gamerule-callbacks.patch} (98%)
 rename patches/server/{0793-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0792-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0794-WorldCreator-keepSpawnLoaded.patch => 0793-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0795-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0794-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0796-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0795-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0797-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0796-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0798-Fire-CauldronLevelChange-on-initial-fill.patch => 0797-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0799-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0798-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0800-Add-PlayerStopUsingItemEvent.patch => 0799-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0801-Don-t-tick-markers.patch => 0800-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0802-Expand-FallingBlock-API.patch => 0801-Expand-FallingBlock-API.patch} (100%)
 rename patches/server/{0803-Do-not-accept-invalid-client-settings.patch => 0802-Do-not-accept-invalid-client-settings.patch} (90%)
 rename patches/server/{0804-Add-support-for-Proxy-Protocol.patch => 0803-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0805-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0804-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0806-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0805-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0807-Sanitize-Sent-BlockEntity-NBT.patch => 0806-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0808-Disable-component-selector-resolving-in-books-by-def.patch => 0807-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0809-Prevent-entity-loading-causing-async-lookups.patch => 0808-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0810-Throw-exception-on-world-create-while-being-ticked.patch => 0809-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0811-Add-Alternate-Current-redstone-implementation.patch => 0810-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0812-Dont-resent-entity-on-art-update.patch => 0811-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0813-Add-WardenAngerChangeEvent.patch => 0812-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0814-Add-option-for-strict-advancement-dimension-checks.patch => 0813-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0815-Add-missing-important-BlockStateListPopulator-method.patch => 0814-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0816-Nameable-Banner-API.patch => 0815-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0817-Don-t-broadcast-messages-to-command-blocks.patch => 0816-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0818-Prevent-empty-items-from-being-added-to-world.patch => 0817-Prevent-empty-items-from-being-added-to-world.patch} (93%)
 rename patches/server/{0819-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0818-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0820-Add-Player-getFishHook.patch => 0819-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0821-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0820-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0822-Add-various-missing-EntityDropItemEvent-calls.patch => 0821-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0823-Fix-Bee-flower-NPE.patch => 0822-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0824-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (87%)
 rename patches/server/{0825-More-Teleport-API.patch => 0824-More-Teleport-API.patch} (99%)
 rename patches/server/{0826-Add-EntityPortalReadyEvent.patch => 0825-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0827-Don-t-use-level-random-in-entity-constructors.patch => 0826-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0828-Send-block-entities-after-destroy-prediction.patch => 0827-Send-block-entities-after-destroy-prediction.patch} (98%)
 rename patches/server/{0829-Warn-on-plugins-accessing-faraway-chunks.patch => 0828-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0830-Custom-Chat-Completion-Suggestions-API.patch => 0829-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0831-Add-and-fix-missing-BlockFadeEvents.patch => 0830-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0832-Collision-API.patch => 0831-Collision-API.patch} (100%)
 rename patches/server/{0833-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0832-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0834-Block-Ticking-API.patch => 0833-Block-Ticking-API.patch} (100%)
 rename patches/server/{0835-Add-Velocity-IP-Forwarding-Support.patch => 0834-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0836-Add-NamespacedKey-biome-methods.patch => 0835-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0837-Fix-plugin-loggers-on-server-shutdown.patch => 0836-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0838-Stop-large-look-changes-from-crashing-the-server.patch => 0837-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0839-Fire-EntityChangeBlockEvent-in-more-places.patch => 0838-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0840-Missing-eating-regain-reason.patch => 0839-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0841-Missing-effect-cause.patch => 0840-Missing-effect-cause.patch} (100%)
 rename patches/server/{0842-Added-byte-array-serialization-deserialization-for-P.patch => 0841-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0843-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0842-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0844-Call-BlockPhysicsEvent-more-often.patch => 0843-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0845-Configurable-chat-thread-limit.patch => 0844-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0846-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0845-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0847-fix-Jigsaw-block-kicking-user.patch => 0846-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0848-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0847-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0849-Add-getDrops-to-BlockState.patch => 0848-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0850-Fix-a-bunch-of-vanilla-bugs.patch => 0849-Fix-a-bunch-of-vanilla-bugs.patch} (99%)
 rename patches/server/{0851-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0850-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0852-Fix-custom-piglin-loved-items.patch => 0851-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0853-EntityPickupItemEvent-fixes.patch => 0852-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0854-Correctly-handle-interactions-with-items-on-cooldown.patch => 0853-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0855-Add-PlayerInventorySlotChangeEvent.patch => 0854-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0856-Elder-Guardian-appearance-API.patch => 0855-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0857-Allow-changing-bed-s-occupied-property.patch => 0856-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0858-Add-entity-knockback-API.patch => 0857-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0859-Detect-headless-JREs.patch => 0858-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0860-fixed-entity-vehicle-collision-event-not-called.patch => 0859-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0861-optimized-dirt-and-snow-spreading.patch => 0860-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0862-Added-EntityToggleSitEvent.patch => 0861-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0863-Add-fire-tick-delay-option.patch => 0862-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0864-Add-Moving-Piston-API.patch => 0863-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0865-Ignore-impossible-spawn-tick.patch => 0864-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0866-Track-projectile-source-for-fireworks-from-dispenser.patch => 0865-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0867-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0866-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0869-Prevent-compass-from-loading-chunks.patch => 0868-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0870-Add-PrePlayerAttackEntityEvent.patch => 0869-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0871-ensure-reset-EnderDragon-boss-event-name.patch => 0870-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0872-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0871-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0873-Add-Player-Warden-Warning-API.patch => 0872-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0874-More-vanilla-friendly-methods-to-update-trades.patch => 0873-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0875-Add-paper-dumplisteners-command.patch => 0874-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0876-check-global-player-list-where-appropriate.patch => 0875-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0877-Fix-async-entity-add-due-to-fungus-trees.patch => 0876-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0878-ItemStack-damage-API.patch => 0877-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0879-Friction-API.patch => 0878-Friction-API.patch} (100%)
 rename patches/server/{0880-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0879-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0881-Fix-player-kick-on-shutdown.patch => 0880-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0882-Sync-offhand-slot-in-menus.patch => 0881-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0883-Player-Entity-Tracking-Events.patch => 0882-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0884-Limit-pet-look-distance.patch => 0883-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0885-Properly-resend-entities.patch => 0884-Properly-resend-entities.patch} (98%)
 rename patches/server/{0886-Fixes-and-additions-to-the-SpawnReason-API.patch => 0885-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0887-fix-Instruments.patch => 0886-fix-Instruments.patch} (100%)
 rename patches/server/{0888-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0889-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0888-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0890-Add-BlockLockCheckEvent.patch => 0889-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0891-Add-Sneaking-API-for-Entities.patch => 0890-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0892-Improve-logging-and-errors.patch => 0891-Improve-logging-and-errors.patch} (97%)
 rename patches/server/{0893-Improve-PortalEvents.patch => 0892-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0894-Add-config-option-for-spider-worldborder-climbing.patch => 0893-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0895-Add-missing-SpigotConfig-logCommands-check.patch => 0894-Add-missing-SpigotConfig-logCommands-check.patch} (88%)
 rename patches/server/{0896-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0897-Flying-Fall-Damage.patch => 0896-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0898-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0897-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/server/{0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0900-config-for-disabling-entity-tag-tags.patch => 0899-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0901-Use-single-player-info-update-packet-on-join.patch => 0900-Use-single-player-info-update-packet-on-join.patch} (95%)
 rename patches/server/{0902-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0901-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0903-Win-Screen-API.patch => 0902-Win-Screen-API.patch} (100%)
 rename patches/server/{0904-Remove-CraftItemStack-setAmount-null-assignment.patch => 0903-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0905-Fix-force-opening-enchantment-tables.patch => 0904-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0906-Add-Entity-Body-Yaw-API.patch => 0905-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0907-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0908-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0907-Update-the-flag-when-a-captured-block-state-is-outda.patch} (100%)
 rename patches/server/{0909-Add-EntityFertilizeEggEvent.patch => 0908-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/server/{0910-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0909-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0911-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0912-Correctly-handle-ArmorStand-invisibility.patch => 0911-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0913-Fix-advancement-triggers-for-entity-damage.patch => 0912-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0914-Fix-text-display-error-on-spawn.patch => 0913-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0915-Fix-certain-inventories-returning-null-Locations.patch => 0914-Fix-certain-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0916-Add-Shearable-API.patch => 0915-Add-Shearable-API.patch} (100%)
 rename patches/server/{0917-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0916-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0918-Optimize-Hoppers.patch => 0917-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0919-Fix-beehives-generating-from-using-bonemeal.patch => 0918-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0920-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0919-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0921-Treat-sequence-violations-like-they-should-be.patch => 0920-Treat-sequence-violations-like-they-should-be.patch} (91%)
 rename patches/server/{0922-remove-duplicate-animate-packet-for-records.patch => 0921-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0923-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0922-Prevent-causing-expired-keys-from-impacting-new-join.patch} (95%)
 rename patches/server/{0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0923-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (90%)
 rename patches/server/{0925-Use-array-for-gamerule-storage.patch => 0924-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0926-Fix-a-couple-of-upstream-bed-issues.patch => 0925-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0927-Fix-demo-flag-not-enabling-demo-mode.patch => 0926-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0928-Add-Mob-Experience-reward-API.patch => 0927-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0929-Break-redstone-on-top-of-trap-doors-early.patch => 0928-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0930-Fix-DamageCause-for-Falling-Blocks.patch => 0929-Fix-DamageCause-for-Falling-Blocks.patch} (100%)
 rename patches/server/{0931-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0930-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0932-More-accurate-isInOpenWater-impl.patch => 0931-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0933-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0932-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0934-Optimise-recalcBlockCounts-for-empty-sections.patch => 0933-Optimise-recalcBlockCounts-for-empty-sections.patch} (100%)
 rename patches/server/{0935-Expand-PlayerItemMendEvent.patch => 0934-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/server/{0936-Refresh-ProjectileSource-for-projectiles.patch => 0935-Refresh-ProjectileSource-for-projectiles.patch} (100%)
 rename patches/server/{0937-Add-transient-modifier-API.patch => 0936-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0938-Fix-block-place-logic.patch => 0937-Fix-block-place-logic.patch} (100%)
 rename patches/server/{0939-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0938-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0940-Ignore-inline-definitions-of-trim-material-pattern.patch => 0939-Ignore-inline-definitions-of-trim-material-pattern.patch} (100%)
 rename patches/server/{0941-Call-BlockGrowEvent-for-missing-blocks.patch => 0940-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0941-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (100%)
 rename patches/server/{0943-fix-MapLike-spam-for-missing-key-selector.patch => 0942-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0944-Fix-sniffer-removeExploredLocation.patch => 0943-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0945-Add-method-to-remove-all-active-potion-effects.patch => 0944-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0946-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch => 0945-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch} (100%)
 rename patches/server/{0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0946-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0948-Properly-Cancel-Usable-Items.patch => 0947-Properly-Cancel-Usable-Items.patch} (97%)
 rename patches/server/{0949-Add-event-for-player-editing-sign.patch => 0948-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0950-Only-tick-item-frames-if-players-can-see-it.patch => 0949-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0951-Improve-command-function-perm-level-checks.patch => 0950-Improve-command-function-perm-level-checks.patch} (100%)
 rename patches/server/{0952-Add-option-to-disable-block-updates.patch => 0951-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0953-Call-missing-BlockDispenseEvent.patch => 0952-Call-missing-BlockDispenseEvent.patch} (100%)
 rename patches/server/{0954-Don-t-load-chunks-for-supporting-block-checks.patch => 0953-Don-t-load-chunks-for-supporting-block-checks.patch} (100%)
 rename patches/server/{0955-Optimize-player-lookups-for-beacons.patch => 0954-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0956-Add-Sign-getInteractableSideFor.patch => 0955-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0957-Array-backed-synched-entity-data.patch => 0956-Array-backed-synched-entity-data.patch} (100%)
 rename patches/server/{0958-fix-item-meta-for-tadpole-buckets.patch => 0957-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0959-Suppress-Item-Meta-Validation-Checks.patch => 0958-Suppress-Item-Meta-Validation-Checks.patch} (100%)
 rename patches/server/{0960-Fix-BanList-API.patch => 0959-Fix-BanList-API.patch} (100%)
 rename patches/server/{0961-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0960-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0962-Fix-possible-NPE-on-painting-creation.patch => 0961-Fix-possible-NPE-on-painting-creation.patch} (100%)
 rename patches/server/{0963-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0962-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0964-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0963-ExperienceOrb-should-call-EntitySpawnEvent.patch} (100%)
 rename patches/server/{0965-Don-t-tick-signs.patch => 0964-Don-t-tick-signs.patch} (100%)
 rename patches/server/{0966-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0965-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0967-Add-whitelist-events.patch => 0966-Add-whitelist-events.patch} (100%)
 rename patches/server/{0968-Implement-PlayerFailMoveEvent.patch => 0967-Implement-PlayerFailMoveEvent.patch} (98%)
 rename patches/server/{0969-Folia-scheduler-and-owned-region-API.patch => 0968-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/server/{0970-Only-erase-allay-memory-on-non-item-targets.patch => 0969-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0971-API-for-updating-recipes-on-clients.patch => 0970-API-for-updating-recipes-on-clients.patch} (100%)
 rename patches/server/{0972-Fix-rotation-when-spawning-display-entities.patch => 0971-Fix-rotation-when-spawning-display-entities.patch} (100%)
 rename patches/server/{0973-Only-capture-actual-tree-growth.patch => 0972-Only-capture-actual-tree-growth.patch} (100%)
 rename patches/server/{0974-Use-correct-source-for-mushroom-block-spread-event.patch => 0973-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0975-Respect-randomizeData-on-more-entities-when-spawning.patch => 0974-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0976-Use-correct-seed-on-api-world-load.patch => 0975-Use-correct-seed-on-api-world-load.patch} (100%)
 rename patches/server/{0977-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0976-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0978-Cache-map-ids-on-item-frames.patch => 0977-Cache-map-ids-on-item-frames.patch} (100%)
 rename patches/server/{0979-Fix-custom-statistic-criteria-creation.patch => 0978-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{0980-Bandaid-fix-for-Effect.patch => 0979-Bandaid-fix-for-Effect.patch} (100%)
 rename patches/server/{0981-SculkCatalyst-bloom-API.patch => 0980-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0982-API-for-an-entity-s-scoreboard-name.patch => 0981-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%)
 rename patches/server/{0984-Deprecate-and-replace-methods-with-old-StructureType.patch => 0983-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/server/{0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (95%)
 rename patches/server/{0986-Properly-handle-BlockBreakEvent-isDropItems.patch => 0985-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{0987-Fire-entity-death-event-for-ender-dragon.patch => 0986-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{0988-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0987-Configurable-entity-tracking-range-by-Y-coordinate.patch} (100%)
 rename patches/server/{0989-Add-Listing-API-for-Player.patch => 0988-Add-Listing-API-for-Player.patch} (100%)
 rename patches/server/{0990-Configurable-Region-Compression-Format.patch => 0989-Configurable-Region-Compression-Format.patch} (100%)
 rename patches/server/{0991-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0990-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%)
 rename patches/server/{0992-Fix-NPE-on-Boat-getStatus.patch => 0991-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{0993-Expand-Pose-API.patch => 0992-Expand-Pose-API.patch} (100%)
 rename patches/server/{0994-More-DragonBattle-API.patch => 0993-More-DragonBattle-API.patch} (100%)
 rename patches/server/{0995-Deep-clone-unhandled-nbt-tags.patch => 0994-Deep-clone-unhandled-nbt-tags.patch} (100%)
 rename patches/server/{0996-Add-PlayerPickItemEvent.patch => 0995-Add-PlayerPickItemEvent.patch} (96%)
 rename patches/server/{0997-Improve-performance-of-mass-crafts.patch => 0996-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{0998-Allow-trident-custom-damage.patch => 0997-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{0999-Expose-hand-during-BlockCanBuildEvent.patch => 0998-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{1000-Optimize-nearest-structure-border-iteration.patch => 0999-Optimize-nearest-structure-border-iteration.patch} (100%)
 rename patches/server/{1001-Implement-OfflinePlayer-isConnected.patch => 1000-Implement-OfflinePlayer-isConnected.patch} (100%)
 rename patches/server/{1002-Fix-inventory-desync.patch => 1001-Fix-inventory-desync.patch} (100%)
 rename patches/server/{1003-Add-titleOverride-to-InventoryOpenEvent.patch => 1002-Add-titleOverride-to-InventoryOpenEvent.patch} (100%)
 rename patches/server/{1004-Configure-sniffer-egg-hatch-time.patch => 1003-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{1005-Do-crystal-portal-proximity-check-before-entity-look.patch => 1004-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 rename patches/server/{1006-Skip-POI-finding-if-stuck-in-vehicle.patch => 1005-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{1007-Add-slot-sanity-checks-in-container-clicks.patch => 1006-Add-slot-sanity-checks-in-container-clicks.patch} (94%)
 rename patches/server/{1008-Call-BlockRedstoneEvents-for-lecterns.patch => 1007-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{1009-Allow-proper-checking-of-empty-item-stacks.patch => 1008-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/server/{1010-Fix-silent-equipment-change-for-mobs.patch => 1009-Fix-silent-equipment-change-for-mobs.patch} (100%)
 rename patches/server/{1011-Fix-spigot-s-Forced-Stats.patch => 1010-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{1012-Add-missing-InventoryHolders-to-inventories.patch => 1011-Add-missing-InventoryHolders-to-inventories.patch} (100%)
 rename patches/server/{1013-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (100%)
 rename patches/server/{1014-Actually-optimise-explosions.patch => 1013-Actually-optimise-explosions.patch} (100%)
 rename patches/server/{1015-Add-missing-logs-for-log-ips-config-option.patch => 1014-Add-missing-logs-for-log-ips-config-option.patch} (100%)
 rename patches/server/{1016-Remove-Spigot-Bug-Fix-for-MC-109346.patch => 1015-Remove-Spigot-Bug-Fix-for-MC-109346.patch} (100%)
 rename patches/server/{1017-Fix-SuspiciousStewMeta.patch => 1016-Fix-SuspiciousStewMeta.patch} (100%)
 rename patches/server/{1018-Optimise-chunk-tick-iteration.patch => 1017-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{1019-Lag-compensation-ticks.patch => 1018-Lag-compensation-ticks.patch} (98%)
 rename patches/server/{1020-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 1019-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%)
 rename patches/server/{1021-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 1020-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%)
 rename patches/server/{1022-Fix-team-sidebar-objectives-not-being-cleared.patch => 1021-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%)
 rename patches/server/{1023-Optimise-nearby-player-retrieval.patch => 1022-Optimise-nearby-player-retrieval.patch} (98%)
 rename patches/server/{1024-Remove-streams-for-villager-AI.patch => 1023-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{1025-Fix-missing-map-initialize-event-call.patch => 1024-Fix-missing-map-initialize-event-call.patch} (100%)
 rename patches/server/{1026-Update-entity-data-when-attaching-firework-to-entity.patch => 1025-Update-entity-data-when-attaching-firework-to-entity.patch} (100%)
 rename patches/server/{1027-Use-correct-variable-for-initializing-CraftLootTable.patch => 1026-Use-correct-variable-for-initializing-CraftLootTable.patch} (100%)
 rename patches/server/{1028-Make-setVelocity-method-of-Fireballs-change-the-trav.patch => 1027-Make-setVelocity-method-of-Fireballs-change-the-trav.patch} (100%)
 rename patches/server/{1029-Fix-UnsafeValues-loadAdvancement.patch => 1028-Fix-UnsafeValues-loadAdvancement.patch} (100%)
 rename patches/server/{1030-Add-player-idle-duration-API.patch => 1029-Add-player-idle-duration-API.patch} (100%)
 rename patches/server/{1031-Don-t-check-if-we-can-see-non-visible-entities.patch => 1030-Don-t-check-if-we-can-see-non-visible-entities.patch} (100%)
 rename patches/server/{1032-Fix-NPE-in-SculkBloomEvent-world-access.patch => 1031-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%)
 rename patches/server/{1033-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 1032-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (100%)
 rename patches/server/{1034-Optimize-VarInts.patch => 1033-Optimize-VarInts.patch} (100%)
 rename patches/server/{1035-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 1034-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/server/{1036-Add-predicate-for-blocks-when-raytracing.patch => 1035-Add-predicate-for-blocks-when-raytracing.patch} (100%)
 rename patches/server/{1037-Broadcast-take-item-packets-with-collector-as-source.patch => 1036-Broadcast-take-item-packets-with-collector-as-source.patch} (100%)
 rename patches/server/{1038-fix-secure-profile-with-proxy-online-mode.patch => 1037-fix-secure-profile-with-proxy-online-mode.patch} (100%)
 rename patches/server/{1039-Expand-LingeringPotion-API.patch => 1038-Expand-LingeringPotion-API.patch} (100%)
 rename patches/server/{1040-Add-MaterialTagsTest.patch => 1039-Add-MaterialTagsTest.patch} (100%)
 rename patches/server/{1041-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 1040-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (100%)
 rename patches/server/{1042-Add-hand-to-fish-event-for-all-player-interactions.patch => 1041-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/server/{1043-Fix-several-issues-with-EntityBreedEvent.patch => 1042-Fix-several-issues-with-EntityBreedEvent.patch} (100%)
 rename patches/server/{1044-Add-UUID-attribute-modifier-API.patch => 1043-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/server/{1045-Fix-missing-event-call-for-entity-teleport-API.patch => 1044-Fix-missing-event-call-for-entity-teleport-API.patch} (100%)
 rename patches/server/{1046-Lazily-create-LootContext-for-criterions.patch => 1045-Lazily-create-LootContext-for-criterions.patch} (100%)
 rename patches/server/{1047-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch => 1046-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch} (100%)
 rename patches/server/{1048-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 1047-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (100%)
 rename patches/server/{1049-Restore-vanilla-entity-drops-behavior.patch => 1048-Restore-vanilla-entity-drops-behavior.patch} (100%)
 rename patches/server/{1050-Add-Structure-check-API.patch => 1049-Add-Structure-check-API.patch} (100%)
 rename patches/server/{1051-Dont-resend-blocks-on-interactions.patch => 1050-Dont-resend-blocks-on-interactions.patch} (100%)
 rename patches/server/{1052-Temp-adventure-update.patch => 1051-Temp-adventure-update.patch} (100%)
 rename patches/server/{1053-Keep-previous-behavior-for-setResourcePack.patch => 1052-Keep-previous-behavior-for-setResourcePack.patch} (100%)

diff --git a/patches/server/0748-Kick-on-main-for-illegal-chat.patch b/patches/removed/1.20.3/0748-Kick-on-main-for-illegal-chat.patch
similarity index 97%
rename from patches/server/0748-Kick-on-main-for-illegal-chat.patch
rename to patches/removed/1.20.3/0748-Kick-on-main-for-illegal-chat.patch
index 5c4398d2ee..6c8e0a4cba 100644
--- a/patches/server/0748-Kick-on-main-for-illegal-chat.patch
+++ b/patches/removed/1.20.3/0748-Kick-on-main-for-illegal-chat.patch
@@ -7,6 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 TODO: Check all the missing schedule on mains? (1.20.3)
+    - not needed anymore, there is a check inside disconnect if off main
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index b650e7b53bea147be0b5d88449d41f03a971ca97..09465bee578a440c0da6961dde66083cd097f5e5 100644
diff --git a/patches/server/0749-Multi-Block-Change-API-Implementation.patch b/patches/server/0748-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0749-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0748-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0750-Fix-NotePlayEvent.patch b/patches/server/0749-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0750-Fix-NotePlayEvent.patch
rename to patches/server/0749-Fix-NotePlayEvent.patch
diff --git a/patches/server/0751-Freeze-Tick-Lock-API.patch b/patches/server/0750-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0751-Freeze-Tick-Lock-API.patch
rename to patches/server/0750-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0752-Dolphin-API.patch b/patches/server/0751-Dolphin-API.patch
similarity index 100%
rename from patches/server/0752-Dolphin-API.patch
rename to patches/server/0751-Dolphin-API.patch
diff --git a/patches/server/0753-More-PotionEffectType-API.patch b/patches/server/0752-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0753-More-PotionEffectType-API.patch
rename to patches/server/0752-More-PotionEffectType-API.patch
diff --git a/patches/server/0754-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0753-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0754-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0753-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0755-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0754-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0755-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0754-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0756-Add-missing-structure-set-seed-configs.patch b/patches/server/0755-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0756-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0755-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0757-Implement-regenerateChunk.patch b/patches/server/0756-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0757-Implement-regenerateChunk.patch
rename to patches/server/0756-Implement-regenerateChunk.patch
diff --git a/patches/server/0758-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0757-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0758-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0757-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0759-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0758-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0759-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0758-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0760-Add-GameEvent-tags.patch b/patches/server/0759-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0760-Add-GameEvent-tags.patch
rename to patches/server/0759-Add-GameEvent-tags.patch
diff --git a/patches/server/0761-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0760-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0761-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0760-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0762-Furnace-RecipesUsed-API.patch b/patches/server/0761-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0762-Furnace-RecipesUsed-API.patch
rename to patches/server/0761-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0763-Configurable-sculk-sensor-listener-range.patch b/patches/server/0762-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0763-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0762-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0764-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0763-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0764-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0763-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0765-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0764-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0765-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0764-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0766-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0765-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0766-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0765-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0767-Fix-Entity-Position-Desync.patch b/patches/server/0766-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0767-Fix-Entity-Position-Desync.patch
rename to patches/server/0766-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0768-Custom-Potion-Mixes.patch b/patches/server/0767-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0768-Custom-Potion-Mixes.patch
rename to patches/server/0767-Custom-Potion-Mixes.patch
diff --git a/patches/server/0769-Force-close-world-loading-screen.patch b/patches/server/0768-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0769-Force-close-world-loading-screen.patch
rename to patches/server/0768-Force-close-world-loading-screen.patch
diff --git a/patches/server/0770-Fix-falling-block-spawn-methods.patch b/patches/server/0769-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0770-Fix-falling-block-spawn-methods.patch
rename to patches/server/0769-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0771-Expose-furnace-minecart-push-values.patch b/patches/server/0770-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0771-Expose-furnace-minecart-push-values.patch
rename to patches/server/0770-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0772-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0771-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0772-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0771-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0773-More-Projectile-API.patch b/patches/server/0772-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0773-More-Projectile-API.patch
rename to patches/server/0772-More-Projectile-API.patch
diff --git a/patches/server/0774-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0773-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0774-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0773-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0775-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0774-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0775-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0774-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 66719c4daf..d7d0be4a7a 100644
--- a/patches/server/0775-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0774-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 09465bee578a440c0da6961dde66083cd097f5e5..6dbc5dd5728f4b478626efff9cb71205ab1b621b 100644
+index b650e7b53bea147be0b5d88449d41f03a971ca97..f65ded0df4814896f34755764ce5ead9550d0b77 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -466,6 +466,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0776-Implement-getComputedBiome-API.patch b/patches/server/0775-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0776-Implement-getComputedBiome-API.patch
rename to patches/server/0775-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0777-Make-some-itemstacks-nonnull.patch b/patches/server/0776-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0777-Make-some-itemstacks-nonnull.patch
rename to patches/server/0776-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0778-Implement-enchantWithLevels-API.patch b/patches/server/0777-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0778-Implement-enchantWithLevels-API.patch
rename to patches/server/0777-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0779-Fix-saving-in-unloadWorld.patch b/patches/server/0778-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0779-Fix-saving-in-unloadWorld.patch
rename to patches/server/0778-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0780-Buffer-OOB-setBlock-calls.patch b/patches/server/0779-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0780-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0779-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0781-Add-TameableDeathMessageEvent.patch b/patches/server/0780-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0781-Add-TameableDeathMessageEvent.patch
rename to patches/server/0780-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0782-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0781-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0782-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0781-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0783-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0782-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0783-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0782-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0784-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0783-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0784-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0783-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0785-Guard-against-invalid-entity-positions.patch b/patches/server/0784-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0785-Guard-against-invalid-entity-positions.patch
rename to patches/server/0784-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0786-cache-resource-keys.patch b/patches/server/0785-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0786-cache-resource-keys.patch
rename to patches/server/0785-cache-resource-keys.patch
diff --git a/patches/server/0787-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0786-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0787-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0786-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0788-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0787-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0788-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0787-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0789-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0788-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0789-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0788-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0790-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0789-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 89%
rename from patches/server/0790-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0789-Prevent-tile-entity-copies-loading-chunks.patch
index b405fb047f..90c5002136 100644
--- a/patches/server/0790-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0789-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6dbc5dd5728f4b478626efff9cb71205ab1b621b..f33524a8231a2f57f53f5a4130ee49c183d4d1d9 100644
+index f65ded0df4814896f34755764ce5ead9550d0b77..46feb009f0db6147573c972eeb2e9d1146a438d8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3196,7 +3196,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3190,7 +3190,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
  
                  if (this.player.level().isLoaded(blockposition)) {
diff --git a/patches/server/0791-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0790-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0791-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0790-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0792-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0791-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0792-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0791-Pass-ServerLevel-for-gamerule-callbacks.patch
index 793b611409..e2977791f3 100644
--- a/patches/server/0792-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0791-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,10 +18,10 @@ index a305557e97d8719f5f82e70794d15242364ce136..5264235c1547c78b8123e2efb07dcb77
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f33524a8231a2f57f53f5a4130ee49c183d4d1d9..50c3fcfedf63b1e8d370ab2059186bb3ddd7868e 100644
+index 46feb009f0db6147573c972eeb2e9d1146a438d8..889395f2c03c47bcd1d35cad67a99d7e503a8881 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2760,7 +2760,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2754,7 +2754,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      this.player = this.server.getPlayerList().respawn(this.player, false, RespawnReason.DEATH);
                      if (this.server.isHardcore()) {
                          this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper
diff --git a/patches/server/0793-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0792-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0793-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0792-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0794-WorldCreator-keepSpawnLoaded.patch b/patches/server/0793-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0794-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0793-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0795-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0794-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0795-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0794-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0796-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0795-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0796-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0795-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0797-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0796-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0797-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0796-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0798-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0797-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0798-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0797-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0799-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0798-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0799-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0798-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0800-Add-PlayerStopUsingItemEvent.patch b/patches/server/0799-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0800-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0799-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0801-Don-t-tick-markers.patch b/patches/server/0800-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0801-Don-t-tick-markers.patch
rename to patches/server/0800-Don-t-tick-markers.patch
diff --git a/patches/server/0802-Expand-FallingBlock-API.patch b/patches/server/0801-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0802-Expand-FallingBlock-API.patch
rename to patches/server/0801-Expand-FallingBlock-API.patch
diff --git a/patches/server/0803-Do-not-accept-invalid-client-settings.patch b/patches/server/0802-Do-not-accept-invalid-client-settings.patch
similarity index 90%
rename from patches/server/0803-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0802-Do-not-accept-invalid-client-settings.patch
index befbe44d15..08cd6b79ba 100644
--- a/patches/server/0803-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0802-Do-not-accept-invalid-client-settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 50c3fcfedf63b1e8d370ab2059186bb3ddd7868e..62e233e2b674dcd38a3b24c57f1f7f8a8513379c 100644
+index 889395f2c03c47bcd1d35cad67a99d7e503a8881..aaad61fa4d063092a5bc9262eaf50dc1b83f5cd5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3320,6 +3320,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3314,6 +3314,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleClientInformation(ServerboundClientInformationPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
diff --git a/patches/server/0804-Add-support-for-Proxy-Protocol.patch b/patches/server/0803-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0804-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0803-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0805-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0804-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0805-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0804-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0806-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0805-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0806-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0805-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0807-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0806-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0807-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0806-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0808-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0807-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0808-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0807-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0809-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0808-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0809-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0808-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0810-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0809-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0810-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0809-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0811-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0810-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0811-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0810-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0812-Dont-resent-entity-on-art-update.patch b/patches/server/0811-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0812-Dont-resent-entity-on-art-update.patch
rename to patches/server/0811-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0813-Add-WardenAngerChangeEvent.patch b/patches/server/0812-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0813-Add-WardenAngerChangeEvent.patch
rename to patches/server/0812-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0814-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0813-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0814-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0813-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0815-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0814-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0815-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0814-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0816-Nameable-Banner-API.patch b/patches/server/0815-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0816-Nameable-Banner-API.patch
rename to patches/server/0815-Nameable-Banner-API.patch
diff --git a/patches/server/0817-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0816-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0817-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0816-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0817-Prevent-empty-items-from-being-added-to-world.patch
similarity index 93%
rename from patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0817-Prevent-empty-items-from-being-added-to-world.patch
index d16a977205..6ac2045202 100644
--- a/patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0817-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a30bc2fd80439f65d3dcfcdcfa3d3b71b737afaf..d2b3c1e9d5c24e6f09cf0a0f9aa4c83130e54e71 100644
+index 4cf7e66dfee34a29894f53d17e7e13c46fb4b85e..62b2efd9cf00ec79fb937099dd9cbfe9fc58d198 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1583,6 +1583,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0819-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0818-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0819-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0818-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0820-Add-Player-getFishHook.patch b/patches/server/0819-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0820-Add-Player-getFishHook.patch
rename to patches/server/0819-Add-Player-getFishHook.patch
diff --git a/patches/server/0821-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0820-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0821-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0820-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0822-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0821-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0822-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0821-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0823-Fix-Bee-flower-NPE.patch b/patches/server/0822-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0823-Fix-Bee-flower-NPE.patch
rename to patches/server/0822-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0824-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 87%
rename from patches/server/0824-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index ebe092ab7e..cb918a65e3 100644
--- a/patches/server/0824-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,10 +5,10 @@ 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 62e233e2b674dcd38a3b24c57f1f7f8a8513379c..67c766ffce3a27a9bf8af10fa946e1e453542f03 100644
+index aaad61fa4d063092a5bc9262eaf50dc1b83f5cd5..3ed2bba9ab7ae5d25aebd82765b18c1a1fd1fd7f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2377,7 +2377,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2371,7 +2371,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          // Spigot end
          // this.chatSpamTickCount += 20;
diff --git a/patches/server/0825-More-Teleport-API.patch b/patches/server/0824-More-Teleport-API.patch
similarity index 99%
rename from patches/server/0825-More-Teleport-API.patch
rename to patches/server/0824-More-Teleport-API.patch
index 1b9778d3dd..0e6eb3a4b5 100644
--- a/patches/server/0825-More-Teleport-API.patch
+++ b/patches/server/0824-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 67c766ffce3a27a9bf8af10fa946e1e453542f03..ec25b22e315aa25bcc8625492bc0faf8b275d34b 100644
+index 3ed2bba9ab7ae5d25aebd82765b18c1a1fd1fd7f..48eda556c333c4808c44ec7e6fd27c56fed68fe6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1633,11 +1633,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0826-Add-EntityPortalReadyEvent.patch b/patches/server/0825-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0826-Add-EntityPortalReadyEvent.patch
rename to patches/server/0825-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0827-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0826-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0827-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0826-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0828-Send-block-entities-after-destroy-prediction.patch b/patches/server/0827-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0828-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0827-Send-block-entities-after-destroy-prediction.patch
index d58ecfd0a3..759925c47e 100644
--- a/patches/server/0828-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0827-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index bf9b185e3defb496022c20ec60a84a4f6f99d5be..4e1ed252bf400ec991f95b02984f01a9
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ec25b22e315aa25bcc8625492bc0faf8b275d34b..d8f21804945a5c3212316e37350df1d1fc6903a4 100644
+index 48eda556c333c4808c44ec7e6fd27c56fed68fe6..63d9bfd162ccc1f57a8a00824388b04b5ea3c108 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1779,8 +1779,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0829-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0828-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0829-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0828-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0830-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0829-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0830-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0829-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0831-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0830-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0831-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0830-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0832-Collision-API.patch b/patches/server/0831-Collision-API.patch
similarity index 100%
rename from patches/server/0832-Collision-API.patch
rename to patches/server/0831-Collision-API.patch
diff --git a/patches/server/0833-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0832-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0833-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0832-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0834-Block-Ticking-API.patch b/patches/server/0833-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0834-Block-Ticking-API.patch
rename to patches/server/0833-Block-Ticking-API.patch
diff --git a/patches/server/0835-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0834-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0835-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0834-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0836-Add-NamespacedKey-biome-methods.patch b/patches/server/0835-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0836-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0835-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0837-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0836-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0837-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0836-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0838-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0837-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0838-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0837-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0839-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0839-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0840-Missing-eating-regain-reason.patch b/patches/server/0839-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0840-Missing-eating-regain-reason.patch
rename to patches/server/0839-Missing-eating-regain-reason.patch
diff --git a/patches/server/0841-Missing-effect-cause.patch b/patches/server/0840-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0841-Missing-effect-cause.patch
rename to patches/server/0840-Missing-effect-cause.patch
diff --git a/patches/server/0842-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0841-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0842-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0841-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0843-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0842-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0843-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0842-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0844-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0843-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0844-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0843-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0845-Configurable-chat-thread-limit.patch b/patches/server/0844-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0845-Configurable-chat-thread-limit.patch
rename to patches/server/0844-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0846-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0845-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0846-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0845-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0847-fix-Jigsaw-block-kicking-user.patch b/patches/server/0846-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0847-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0846-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0848-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0847-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0848-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0847-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0849-Add-getDrops-to-BlockState.patch b/patches/server/0848-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0849-Add-getDrops-to-BlockState.patch
rename to patches/server/0848-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 99%
rename from patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch
index b17314abd7..507aa830ad 100644
--- a/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch
@@ -127,7 +127,7 @@ index b71be5e7e18f884cf35cc3a940c87e744e00f811..81d3d664d4397e528a02e50469622c4f
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d2b3c1e9d5c24e6f09cf0a0f9aa4c83130e54e71..ac9f42e8d88ca8cdb2882bd8d7676a793024599c 100644
+index 62b2efd9cf00ec79fb937099dd9cbfe9fc58d198..66eecf5155f8f526480511d2b3af1b6f87280474 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1028,7 +1028,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0851-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0850-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0851-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0850-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0852-Fix-custom-piglin-loved-items.patch b/patches/server/0851-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0852-Fix-custom-piglin-loved-items.patch
rename to patches/server/0851-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0853-EntityPickupItemEvent-fixes.patch b/patches/server/0852-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0853-EntityPickupItemEvent-fixes.patch
rename to patches/server/0852-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0854-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0853-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0854-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0853-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0855-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0855-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0856-Elder-Guardian-appearance-API.patch b/patches/server/0855-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0856-Elder-Guardian-appearance-API.patch
rename to patches/server/0855-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0857-Allow-changing-bed-s-occupied-property.patch b/patches/server/0856-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0857-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0856-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0858-Add-entity-knockback-API.patch b/patches/server/0857-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0858-Add-entity-knockback-API.patch
rename to patches/server/0857-Add-entity-knockback-API.patch
diff --git a/patches/server/0859-Detect-headless-JREs.patch b/patches/server/0858-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0859-Detect-headless-JREs.patch
rename to patches/server/0858-Detect-headless-JREs.patch
diff --git a/patches/server/0860-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0859-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0860-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0859-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0861-optimized-dirt-and-snow-spreading.patch b/patches/server/0860-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0861-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0860-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0862-Added-EntityToggleSitEvent.patch b/patches/server/0861-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0862-Added-EntityToggleSitEvent.patch
rename to patches/server/0861-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0863-Add-fire-tick-delay-option.patch b/patches/server/0862-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0863-Add-fire-tick-delay-option.patch
rename to patches/server/0862-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0864-Add-Moving-Piston-API.patch b/patches/server/0863-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0864-Add-Moving-Piston-API.patch
rename to patches/server/0863-Add-Moving-Piston-API.patch
diff --git a/patches/server/0865-Ignore-impossible-spawn-tick.patch b/patches/server/0864-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0865-Ignore-impossible-spawn-tick.patch
rename to patches/server/0864-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0866-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0865-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0866-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0865-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0867-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0866-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0867-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0866-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0869-Prevent-compass-from-loading-chunks.patch b/patches/server/0868-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0869-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0868-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0870-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0869-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0870-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0869-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0871-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0870-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0871-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0870-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0872-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0871-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0872-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0871-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0873-Add-Player-Warden-Warning-API.patch b/patches/server/0872-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0873-Add-Player-Warden-Warning-API.patch
rename to patches/server/0872-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0874-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0873-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0874-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0873-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0875-Add-paper-dumplisteners-command.patch b/patches/server/0874-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0875-Add-paper-dumplisteners-command.patch
rename to patches/server/0874-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0876-check-global-player-list-where-appropriate.patch b/patches/server/0875-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0876-check-global-player-list-where-appropriate.patch
rename to patches/server/0875-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0877-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0876-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0877-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0876-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0878-ItemStack-damage-API.patch b/patches/server/0877-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0878-ItemStack-damage-API.patch
rename to patches/server/0877-ItemStack-damage-API.patch
diff --git a/patches/server/0879-Friction-API.patch b/patches/server/0878-Friction-API.patch
similarity index 100%
rename from patches/server/0879-Friction-API.patch
rename to patches/server/0878-Friction-API.patch
diff --git a/patches/server/0880-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0879-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0880-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0879-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0881-Fix-player-kick-on-shutdown.patch b/patches/server/0880-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0881-Fix-player-kick-on-shutdown.patch
rename to patches/server/0880-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0882-Sync-offhand-slot-in-menus.patch b/patches/server/0881-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0882-Sync-offhand-slot-in-menus.patch
rename to patches/server/0881-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0883-Player-Entity-Tracking-Events.patch b/patches/server/0882-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0883-Player-Entity-Tracking-Events.patch
rename to patches/server/0882-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0884-Limit-pet-look-distance.patch b/patches/server/0883-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0884-Limit-pet-look-distance.patch
rename to patches/server/0883-Limit-pet-look-distance.patch
diff --git a/patches/server/0885-Properly-resend-entities.patch b/patches/server/0884-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0885-Properly-resend-entities.patch
rename to patches/server/0884-Properly-resend-entities.patch
index d599fa0de4..30cd4d1675 100644
--- a/patches/server/0885-Properly-resend-entities.patch
+++ b/patches/server/0884-Properly-resend-entities.patch
@@ -85,10 +85,10 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..ccb7d92b6c36b6225a2e640f8cea6c0d
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d8f21804945a5c3212316e37350df1d1fc6903a4..6b0ce578ec3aee339bc77c348ebd90cd36f61e38 100644
+index 63d9bfd162ccc1f57a8a00824388b04b5ea3c108..8797f0d1caed0f73f0c19852789c9509f3112075 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2657,7 +2657,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2651,7 +2651,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                              // Entity in bucket - SPIGOT-4048 and SPIGOT-6859a
                              if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
diff --git a/patches/server/0886-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0886-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0887-fix-Instruments.patch b/patches/server/0886-fix-Instruments.patch
similarity index 100%
rename from patches/server/0887-fix-Instruments.patch
rename to patches/server/0886-fix-Instruments.patch
diff --git a/patches/server/0888-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0888-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0889-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0888-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0889-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0888-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0890-Add-BlockLockCheckEvent.patch b/patches/server/0889-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0890-Add-BlockLockCheckEvent.patch
rename to patches/server/0889-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0891-Add-Sneaking-API-for-Entities.patch b/patches/server/0890-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0891-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0890-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0892-Improve-logging-and-errors.patch b/patches/server/0891-Improve-logging-and-errors.patch
similarity index 97%
rename from patches/server/0892-Improve-logging-and-errors.patch
rename to patches/server/0891-Improve-logging-and-errors.patch
index 40f1b99843..6e6e93f787 100644
--- a/patches/server/0892-Improve-logging-and-errors.patch
+++ b/patches/server/0891-Improve-logging-and-errors.patch
@@ -40,10 +40,10 @@ index 536f0c496ce36ca3248fc6eeac9bbd77214a36f9..5e24c1e712eb16d0d5343760a65310bd
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6b0ce578ec3aee339bc77c348ebd90cd36f61e38..158ad5fadb12d230f1a435ebc9e0f5cb9d4d1788 100644
+index 8797f0d1caed0f73f0c19852789c9509f3112075..8b71e52d84575e2fea3c7be9f90ec9d558d2628a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3394,7 +3394,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3388,7 +3388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                      this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
                  } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
diff --git a/patches/server/0893-Improve-PortalEvents.patch b/patches/server/0892-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0893-Improve-PortalEvents.patch
rename to patches/server/0892-Improve-PortalEvents.patch
diff --git a/patches/server/0894-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0893-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0894-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0893-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0895-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 88%
rename from patches/server/0895-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch
index 27e69f321d..b9b1cb630f 100644
--- a/patches/server/0895-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 158ad5fadb12d230f1a435ebc9e0f5cb9d4d1788..4e1f5ae65e3727a6a0495a18d543134beb2a052d 100644
+index 8b71e52d84575e2fea3c7be9f90ec9d558d2628a..e83b6a1c01f56e22aa3e148abe3e0699d838bc3b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2139,7 +2139,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2135,7 +2135,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private void performChatCommand(ServerboundChatCommandPacket packet, LastSeenMessages lastSeenMessages) {
          // CraftBukkit start
          String command = "/" + packet.command();
diff --git a/patches/server/0896-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0896-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0897-Flying-Fall-Damage.patch b/patches/server/0896-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0897-Flying-Fall-Damage.patch
rename to patches/server/0896-Flying-Fall-Damage.patch
diff --git a/patches/server/0898-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0897-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0898-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0897-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0900-config-for-disabling-entity-tag-tags.patch b/patches/server/0899-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0900-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0899-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0901-Use-single-player-info-update-packet-on-join.patch b/patches/server/0900-Use-single-player-info-update-packet-on-join.patch
similarity index 95%
rename from patches/server/0901-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0900-Use-single-player-info-update-packet-on-join.patch
index d95352bba9..54b0240637 100644
--- a/patches/server/0901-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0900-Use-single-player-info-update-packet-on-join.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4e1f5ae65e3727a6a0495a18d543134beb2a052d..a45d258bbf29f0e3e6082eda802a5fda609f6931 100644
+index e83b6a1c01f56e22aa3e148abe3e0699d838bc3b..7e6f530eb007e82c3115cb654165fa2c60a185ed 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3424,7 +3424,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3418,7 +3418,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.signedMessageDecoder = session.createMessageDecoder(this.player.getUUID());
          this.chatMessageChain.append(() -> {
              this.player.setChatSession(session);
diff --git a/patches/server/0902-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0901-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0902-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0901-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0903-Win-Screen-API.patch b/patches/server/0902-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0903-Win-Screen-API.patch
rename to patches/server/0902-Win-Screen-API.patch
diff --git a/patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0903-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0903-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0905-Fix-force-opening-enchantment-tables.patch b/patches/server/0904-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0905-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0904-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0906-Add-Entity-Body-Yaw-API.patch b/patches/server/0905-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0906-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0905-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0907-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0907-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0908-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0907-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0908-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0907-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0909-Add-EntityFertilizeEggEvent.patch b/patches/server/0908-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0909-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0908-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0910-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0909-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0910-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0909-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0911-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0911-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0912-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0911-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0912-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0911-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0913-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0912-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0913-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0912-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0914-Fix-text-display-error-on-spawn.patch b/patches/server/0913-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0914-Fix-text-display-error-on-spawn.patch
rename to patches/server/0913-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0915-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0914-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0915-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0914-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0916-Add-Shearable-API.patch b/patches/server/0915-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0916-Add-Shearable-API.patch
rename to patches/server/0915-Add-Shearable-API.patch
diff --git a/patches/server/0917-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0916-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0917-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0916-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0918-Optimize-Hoppers.patch b/patches/server/0917-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0918-Optimize-Hoppers.patch
rename to patches/server/0917-Optimize-Hoppers.patch
diff --git a/patches/server/0919-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0918-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0919-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0918-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0920-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0919-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0920-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0919-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0921-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0920-Treat-sequence-violations-like-they-should-be.patch
similarity index 91%
rename from patches/server/0921-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0920-Treat-sequence-violations-like-they-should-be.patch
index 2b150df27c..b519609990 100644
--- a/patches/server/0921-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0920-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a45d258bbf29f0e3e6082eda802a5fda609f6931..d7312956b1d8620ac3c86684061010ca195f5a02 100644
+index 7e6f530eb007e82c3115cb654165fa2c60a185ed..869440f9413610bed007bbfc0983113b2555d5f6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2039,6 +2039,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0922-remove-duplicate-animate-packet-for-records.patch b/patches/server/0921-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0922-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0921-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0922-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 95%
rename from patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0922-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 1158689732..82e3390352 100644
--- a/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0922-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 0e54e8faa48751a651b953bec72543a94edf74bc..aa1c6de4d6cb7bbca33d25895c54707d
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d7312956b1d8620ac3c86684061010ca195f5a02..4da0e937c18b0113d4f798233395dd7ea04d077c 100644
+index 869440f9413610bed007bbfc0983113b2555d5f6..df6aa82e8a556c65e8581ac3efd95d5dd8868331 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -287,6 +287,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -49,7 +49,7 @@ index d7312956b1d8620ac3c86684061010ca195f5a02..4da0e937c18b0113d4f798233395dd7e
      }
  
      public void resetPosition() {
-@@ -3422,6 +3430,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3416,6 +3424,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      private void resetPlayerChatState(RemoteChatSession session) {
          this.chatSession = session;
diff --git a/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0923-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 90%
rename from patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0923-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 7a3a204017..fcb9da83f3 100644
--- a/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0923-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b3ffc58db60cbe0591086c3768ae6009ca7017c7..c04950851cdcfa707814e3cfc57cad48cf88a6dc 100644
+index c04ba20ba3f07e96fba1697f17e36c47aae5fabf..2ca2b6c45fa05fde11c36d31a4c1cdeae9c08786 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1720,6 +1720,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0925-Use-array-for-gamerule-storage.patch b/patches/server/0924-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0925-Use-array-for-gamerule-storage.patch
rename to patches/server/0924-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0926-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0925-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0926-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0925-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0927-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0926-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0927-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0926-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0928-Add-Mob-Experience-reward-API.patch b/patches/server/0927-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0928-Add-Mob-Experience-reward-API.patch
rename to patches/server/0927-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0929-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0928-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0929-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0928-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0930-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0929-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0930-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0929-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0931-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0930-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0931-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0930-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0932-More-accurate-isInOpenWater-impl.patch b/patches/server/0931-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0932-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0931-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0933-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0932-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0933-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0932-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0934-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0933-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0934-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0933-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0935-Expand-PlayerItemMendEvent.patch b/patches/server/0934-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0935-Expand-PlayerItemMendEvent.patch
rename to patches/server/0934-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0936-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0935-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0936-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0935-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0937-Add-transient-modifier-API.patch b/patches/server/0936-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0937-Add-transient-modifier-API.patch
rename to patches/server/0936-Add-transient-modifier-API.patch
diff --git a/patches/server/0938-Fix-block-place-logic.patch b/patches/server/0937-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0938-Fix-block-place-logic.patch
rename to patches/server/0937-Fix-block-place-logic.patch
diff --git a/patches/server/0939-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0938-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0939-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0938-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0940-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0939-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0940-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0939-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0940-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0940-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0941-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0941-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0943-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0942-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0943-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0942-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0944-Fix-sniffer-removeExploredLocation.patch b/patches/server/0943-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0944-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0943-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0945-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0944-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0945-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0944-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0946-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0945-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0946-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0945-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0946-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0946-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0948-Properly-Cancel-Usable-Items.patch b/patches/server/0947-Properly-Cancel-Usable-Items.patch
similarity index 97%
rename from patches/server/0948-Properly-Cancel-Usable-Items.patch
rename to patches/server/0947-Properly-Cancel-Usable-Items.patch
index d5f3ba77a1..bc96a5a2f8 100644
--- a/patches/server/0948-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0947-Properly-Cancel-Usable-Items.patch
@@ -34,7 +34,7 @@ index f58386e952d29a16d160b628a23efbe102791277..82f26186156a487f29ad3abff3f68852
          return enuminteractionresult;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4da0e937c18b0113d4f798233395dd7ea04d077c..fda3ac61206744d6366f0c5530815e3231581c52 100644
+index df6aa82e8a556c65e8581ac3efd95d5dd8868331..68d9b62ff075f899877b8b9a6857408933ab8b36 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1951,6 +1951,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0949-Add-event-for-player-editing-sign.patch b/patches/server/0948-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0949-Add-event-for-player-editing-sign.patch
rename to patches/server/0948-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0950-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0949-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0950-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0949-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0951-Improve-command-function-perm-level-checks.patch b/patches/server/0950-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0951-Improve-command-function-perm-level-checks.patch
rename to patches/server/0950-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0952-Add-option-to-disable-block-updates.patch b/patches/server/0951-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0952-Add-option-to-disable-block-updates.patch
rename to patches/server/0951-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0953-Call-missing-BlockDispenseEvent.patch b/patches/server/0952-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0953-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0952-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0954-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0953-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0954-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0953-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0955-Optimize-player-lookups-for-beacons.patch b/patches/server/0954-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0955-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0954-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0956-Add-Sign-getInteractableSideFor.patch b/patches/server/0955-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0956-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0955-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0957-Array-backed-synched-entity-data.patch b/patches/server/0956-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0957-Array-backed-synched-entity-data.patch
rename to patches/server/0956-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0958-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0957-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0958-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0957-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0959-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0958-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0959-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0958-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0960-Fix-BanList-API.patch b/patches/server/0959-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0960-Fix-BanList-API.patch
rename to patches/server/0959-Fix-BanList-API.patch
diff --git a/patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0960-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0960-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0962-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0961-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0962-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0961-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0963-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0962-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0963-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0962-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0964-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0963-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0964-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0963-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0965-Don-t-tick-signs.patch b/patches/server/0964-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0965-Don-t-tick-signs.patch
rename to patches/server/0964-Don-t-tick-signs.patch
diff --git a/patches/server/0966-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0965-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0966-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0965-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0967-Add-whitelist-events.patch b/patches/server/0966-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0967-Add-whitelist-events.patch
rename to patches/server/0966-Add-whitelist-events.patch
diff --git a/patches/server/0968-Implement-PlayerFailMoveEvent.patch b/patches/server/0967-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0968-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0967-Implement-PlayerFailMoveEvent.patch
index bcacae0883..24a3ac3fd0 100644
--- a/patches/server/0968-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0967-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fda3ac61206744d6366f0c5530815e3231581c52..cdef19c69ffd663f8ed7dba950bd38a9c9b5ffe6 100644
+index 68d9b62ff075f899877b8b9a6857408933ab8b36..a28001634f1582efa2a0580f528fd7a5ae7d2624 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1317,8 +1317,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0969-Folia-scheduler-and-owned-region-API.patch b/patches/server/0968-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0969-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0968-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0970-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0969-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0970-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0969-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0971-API-for-updating-recipes-on-clients.patch b/patches/server/0970-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0971-API-for-updating-recipes-on-clients.patch
rename to patches/server/0970-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0972-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0971-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0972-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0971-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0973-Only-capture-actual-tree-growth.patch b/patches/server/0972-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0973-Only-capture-actual-tree-growth.patch
rename to patches/server/0972-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0974-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0973-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0974-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0973-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0975-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0974-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0975-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0974-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0976-Use-correct-seed-on-api-world-load.patch b/patches/server/0975-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0976-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0975-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0977-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0976-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0977-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0976-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0978-Cache-map-ids-on-item-frames.patch b/patches/server/0977-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0978-Cache-map-ids-on-item-frames.patch
rename to patches/server/0977-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0979-Fix-custom-statistic-criteria-creation.patch b/patches/server/0978-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0979-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0978-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0980-Bandaid-fix-for-Effect.patch b/patches/server/0979-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0980-Bandaid-fix-for-Effect.patch
rename to patches/server/0979-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0981-SculkCatalyst-bloom-API.patch b/patches/server/0980-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0981-SculkCatalyst-bloom-API.patch
rename to patches/server/0980-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0982-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0981-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0982-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0981-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0984-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0983-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0984-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0983-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 95%
rename from patches/server/0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index e6ff934f74..3d3a9e0cf2 100644
--- a/patches/server/0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cdef19c69ffd663f8ed7dba950bd38a9c9b5ffe6..158e1b3e7d2a242f3206b35bf1aa2b35b9de2dc1 100644
+index a28001634f1582efa2a0580f528fd7a5ae7d2624..60c7fecfdea20086431a1d2de6b932866651366b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -809,6 +809,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0986-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0985-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0986-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0985-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0987-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0986-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0987-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0986-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0988-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0987-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0988-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0987-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0989-Add-Listing-API-for-Player.patch b/patches/server/0988-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0989-Add-Listing-API-for-Player.patch
rename to patches/server/0988-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0990-Configurable-Region-Compression-Format.patch b/patches/server/0989-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0990-Configurable-Region-Compression-Format.patch
rename to patches/server/0989-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0991-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0990-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0991-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/0990-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/0992-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0991-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0992-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0991-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0993-Expand-Pose-API.patch b/patches/server/0992-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/0993-Expand-Pose-API.patch
rename to patches/server/0992-Expand-Pose-API.patch
diff --git a/patches/server/0994-More-DragonBattle-API.patch b/patches/server/0993-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0994-More-DragonBattle-API.patch
rename to patches/server/0993-More-DragonBattle-API.patch
diff --git a/patches/server/0995-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0994-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0995-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0994-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0996-Add-PlayerPickItemEvent.patch b/patches/server/0995-Add-PlayerPickItemEvent.patch
similarity index 96%
rename from patches/server/0996-Add-PlayerPickItemEvent.patch
rename to patches/server/0995-Add-PlayerPickItemEvent.patch
index 0ca56857f7..6e43a703f0 100644
--- a/patches/server/0996-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0995-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 158e1b3e7d2a242f3206b35bf1aa2b35b9de2dc1..f5f9af9bd3189c3455bce76d56a12503a8d87c35 100644
+index 60c7fecfdea20086431a1d2de6b932866651366b..cabdd17112b130564fb3876c5db711721f13cfba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -946,7 +946,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0997-Improve-performance-of-mass-crafts.patch b/patches/server/0996-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/0997-Improve-performance-of-mass-crafts.patch
rename to patches/server/0996-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0998-Allow-trident-custom-damage.patch b/patches/server/0997-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0998-Allow-trident-custom-damage.patch
rename to patches/server/0997-Allow-trident-custom-damage.patch
diff --git a/patches/server/0999-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/0998-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0999-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/0998-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1000-Optimize-nearest-structure-border-iteration.patch b/patches/server/0999-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/1000-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0999-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1001-Implement-OfflinePlayer-isConnected.patch b/patches/server/1000-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/1001-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/1000-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/1002-Fix-inventory-desync.patch b/patches/server/1001-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/1002-Fix-inventory-desync.patch
rename to patches/server/1001-Fix-inventory-desync.patch
diff --git a/patches/server/1003-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1002-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/1003-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/1002-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1004-Configure-sniffer-egg-hatch-time.patch b/patches/server/1003-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/1004-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/1003-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1005-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1004-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/1005-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/1004-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1006-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1005-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/1006-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/1005-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1007-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1006-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 94%
rename from patches/server/1007-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/1006-Add-slot-sanity-checks-in-container-clicks.patch
index 86f35acb18..5a19297c23 100644
--- a/patches/server/1007-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/1006-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f5f9af9bd3189c3455bce76d56a12503a8d87c35..9a94249834f8b0b8d3f6aeaf0c859ba875079250 100644
+index cabdd17112b130564fb3876c5db711721f13cfba..9073db9ad3627633f46314ae936d584fa400a9ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2989,6 +2989,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2983,6 +2983,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              break;
                          case SWAP:
                              if ((packet.getButtonNum() >= 0 && packet.getButtonNum() < 9) || packet.getButtonNum() == 40) {
diff --git a/patches/server/1008-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1007-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/1008-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/1007-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1008-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/1008-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1010-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1009-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/1010-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/1009-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1011-Fix-spigot-s-Forced-Stats.patch b/patches/server/1010-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/1011-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/1010-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1012-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1011-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/1012-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/1011-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1013-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/1013-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1014-Actually-optimise-explosions.patch b/patches/server/1013-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1014-Actually-optimise-explosions.patch
rename to patches/server/1013-Actually-optimise-explosions.patch
diff --git a/patches/server/1015-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1014-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/1015-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/1014-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1016-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1015-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/1016-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/1015-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1017-Fix-SuspiciousStewMeta.patch b/patches/server/1016-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/1017-Fix-SuspiciousStewMeta.patch
rename to patches/server/1016-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1018-Optimise-chunk-tick-iteration.patch b/patches/server/1017-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/1018-Optimise-chunk-tick-iteration.patch
rename to patches/server/1017-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1019-Lag-compensation-ticks.patch b/patches/server/1018-Lag-compensation-ticks.patch
similarity index 98%
rename from patches/server/1019-Lag-compensation-ticks.patch
rename to patches/server/1018-Lag-compensation-ticks.patch
index 88e88d9f90..70f9907730 100644
--- a/patches/server/1019-Lag-compensation-ticks.patch
+++ b/patches/server/1018-Lag-compensation-ticks.patch
@@ -30,7 +30,7 @@ index a8f9f4e23575cb58045f9d8efe011a60a51dbd7a..34f19ac897a30c0c4e3ab406013fcca1
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c04950851cdcfa707814e3cfc57cad48cf88a6dc..48eb92446a5e3ce21197cad71f1c454cce4762ff 100644
+index 2ca2b6c45fa05fde11c36d31a4c1cdeae9c08786..dac0771836a1c26aa10a2609bb77d7fc68bb9423 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -566,6 +566,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1020-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1019-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/1020-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/1019-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1021-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1020-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/1021-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/1020-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1022-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1021-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/1022-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/1021-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1023-Optimise-nearby-player-retrieval.patch b/patches/server/1022-Optimise-nearby-player-retrieval.patch
similarity index 98%
rename from patches/server/1023-Optimise-nearby-player-retrieval.patch
rename to patches/server/1022-Optimise-nearby-player-retrieval.patch
index dd9f8c12c9..728c9ea672 100644
--- a/patches/server/1023-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1022-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 48eb92446a5e3ce21197cad71f1c454cce4762ff..82e5a780c993991c00264f7874ccc7f333f3f590 100644
+index dac0771836a1c26aa10a2609bb77d7fc68bb9423..8f85aafb181cadd2983b0f3735782729858226c6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -577,6 +577,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1024-Remove-streams-for-villager-AI.patch b/patches/server/1023-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/1024-Remove-streams-for-villager-AI.patch
rename to patches/server/1023-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1025-Fix-missing-map-initialize-event-call.patch b/patches/server/1024-Fix-missing-map-initialize-event-call.patch
similarity index 100%
rename from patches/server/1025-Fix-missing-map-initialize-event-call.patch
rename to patches/server/1024-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/1026-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1025-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/1026-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/1025-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1027-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1026-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/1027-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/1026-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1028-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1027-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/1028-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/1027-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1029-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1028-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/1029-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/1028-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1030-Add-player-idle-duration-API.patch b/patches/server/1029-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/server/1030-Add-player-idle-duration-API.patch
rename to patches/server/1029-Add-player-idle-duration-API.patch
diff --git a/patches/server/1031-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1030-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/1031-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/1030-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1032-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1031-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/1032-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/1031-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1033-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1032-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 100%
rename from patches/server/1033-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/1032-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/1034-Optimize-VarInts.patch b/patches/server/1033-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/1034-Optimize-VarInts.patch
rename to patches/server/1033-Optimize-VarInts.patch
diff --git a/patches/server/1035-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1034-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/1035-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/1034-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/1036-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1035-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/server/1036-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/1035-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/1037-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1036-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 100%
rename from patches/server/1037-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/1036-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/1038-fix-secure-profile-with-proxy-online-mode.patch b/patches/server/1037-fix-secure-profile-with-proxy-online-mode.patch
similarity index 100%
rename from patches/server/1038-fix-secure-profile-with-proxy-online-mode.patch
rename to patches/server/1037-fix-secure-profile-with-proxy-online-mode.patch
diff --git a/patches/server/1039-Expand-LingeringPotion-API.patch b/patches/server/1038-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/1039-Expand-LingeringPotion-API.patch
rename to patches/server/1038-Expand-LingeringPotion-API.patch
diff --git a/patches/server/1040-Add-MaterialTagsTest.patch b/patches/server/1039-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/1040-Add-MaterialTagsTest.patch
rename to patches/server/1039-Add-MaterialTagsTest.patch
diff --git a/patches/server/1041-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1040-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/1041-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/1040-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/1042-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1041-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/1042-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/1041-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1043-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1042-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/1043-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/1042-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/1044-Add-UUID-attribute-modifier-API.patch b/patches/server/1043-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/1044-Add-UUID-attribute-modifier-API.patch
rename to patches/server/1043-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1045-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1044-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/1045-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/1044-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/1046-Lazily-create-LootContext-for-criterions.patch b/patches/server/1045-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/1046-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/1045-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1047-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch b/patches/server/1046-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
similarity index 100%
rename from patches/server/1047-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
rename to patches/server/1046-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
diff --git a/patches/server/1048-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1047-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/1048-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/1047-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/1049-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1048-Restore-vanilla-entity-drops-behavior.patch
similarity index 100%
rename from patches/server/1049-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/1048-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/1050-Add-Structure-check-API.patch b/patches/server/1049-Add-Structure-check-API.patch
similarity index 100%
rename from patches/server/1050-Add-Structure-check-API.patch
rename to patches/server/1049-Add-Structure-check-API.patch
diff --git a/patches/server/1051-Dont-resend-blocks-on-interactions.patch b/patches/server/1050-Dont-resend-blocks-on-interactions.patch
similarity index 100%
rename from patches/server/1051-Dont-resend-blocks-on-interactions.patch
rename to patches/server/1050-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/1052-Temp-adventure-update.patch b/patches/server/1051-Temp-adventure-update.patch
similarity index 100%
rename from patches/server/1052-Temp-adventure-update.patch
rename to patches/server/1051-Temp-adventure-update.patch
diff --git a/patches/server/1053-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1052-Keep-previous-behavior-for-setResourcePack.patch
similarity index 100%
rename from patches/server/1053-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/1052-Keep-previous-behavior-for-setResourcePack.patch