From 1034873dfac58b990d1c9fa480b307f136c60419 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Tue, 16 Mar 2021 17:37:33 +0100
Subject: [PATCH] Apply fixups

---
 Spigot-Server-Patches/0001-POM-Changes.patch  |  9 +++++---
 .../0438-Improved-Watchdog-Support.patch      |  8 +++----
 ...d-chunks-asynchronously-for-players.patch} |  2 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  2 +-
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...llbacks-to-schedule-for-Callback-Ex.patch} |  2 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  2 +-
 ...0461-Implement-Brigadier-Mojang-API.patch} |  0
 ...patch => 0462-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  2 +-
 ...n.patch => 0464-Expose-game-version.patch} |  2 +-
 ...> 0465-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  2 +-
 ...atch => 0467-Implement-Mob-Goal-API.patch} |  2 +-
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...isOutsideRange-to-use-distance-maps.patch} |  8 +++----
 ...e-operations-for-updating-light-dat.patch} |  0
 ...o-Tick-view-distance-implementation.patch} |  4 ++--
 ...=> 0472-Add-villager-reputation-API.patch} |  0
 ...and.patch => 0473-Fix-Light-Command.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...API.patch => 0476-Potential-bed-API.patch} |  0
 ...ait-for-Async-Tasks-during-shutdown.patch} |  0
 ...er-respects-game-and-entity-rules-f.patch} |  0
 ...nd-End-Portal-Frames-from-being-des.patch} |  0
 ...e-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  0
 ...> 0483-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |  0
 ...und-for-Client-Lag-Spikes-MC-162253.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} | 10 ++++----
 ...packets-to-nearby-locations-sounds-.patch} |  2 +-
 ...prove-Chunk-Status-Transition-Speed.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0491-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...patch => 0494-Optimize-Light-Engine.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  0
 ...uping.patch => 0500-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  2 +-
 ...ch => 0502-Fix-enderdragon-exp-dupe.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0504-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  2 +-
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...it-lightning-strike-effect-distance.patch} |  0
 ...8-Add-permission-for-command-blocks.patch} |  0
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  2 +-
 ...orldBorder-collision-checks-and-air.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  0
 ...atch => 0512-Paper-dumpitem-command.patch} |  0
 ...13-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  2 +-
 ...515-Support-old-UUID-format-for-NBT.patch} |  0
 ...p-duplicated-GameProfile-Properties.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...0520-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0522-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  2 +-
 ...wn-player-in-correct-world-on-login.patch} |  2 +-
 ...atch => 0525-Add-PrepareResultEvent.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  2 +-
 ...-5989.patch => 0534-Fix-SPIGOT-5989.patch} |  2 +-
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...h => 0541-Incremental-player-saving.patch} |  4 ++--
 ...tch => 0542-Import-fastutil-classes.patch} |  0
 ...ll-chunk-sections-for-block-updates.patch} |  0
 ...ve-armour-stand-double-add-to-world.patch} |  0
 ...Fix-MC-187716-Use-configured-height.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0548-Brand-support.patch} |  0
 ...er-Boss-Bar-doesn-t-update-until-in.patch} |  0
 ...-197271.patch => 0550-Fix-MC-197271.patch} |  0
 ...0551-MC-197883-Bandaid-decode-issue.patch} |  0
 ...patch => 0552-Add-setMaxPlayers-API.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0554-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0556-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0558-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0560-Buffer-joins-to-world.patch} |  2 +-
 ...=> 0561-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  2 +-
 ...ch => 0564-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0565-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0568-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  2 +-
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0576-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...g-a-passenger-in-CreatureSpawnEvent.patch} |  2 +-
 ...ems-that-are-extra-from-a-crafting-.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0583-Optimise-getType-calls.patch} |  0
 ....patch => 0584-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0589-Player-elytra-boost-API.patch} |  0
 ...90-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0593-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  2 +-
 ...> 0596-Item-no-age-no-player-pickup.patch} |  0
 ...597-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0598-Add-API-for-quit-reason.patch} |  8 +++----
 ...h => 0599-Seed-based-feature-search.patch} |  0
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...ch => 0602-Expose-world-spawn-angle.patch} |  0
 ...patch => 0603-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...05-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0606-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0607-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  0
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0610-Add-PlayerShearBlockEvent.patch} |  0
 ...-for-servers-not-running-on-Java-11.patch} |  0
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  0
 ...-villager-makes-equipment-disappear.patch} |  0
 ....patch => 0615-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0617-MC-4-Fix-item-position-desync.patch} |  0
 ...618-Player-Chunk-Load-Unload-Events.patch} |  6 ++---
 ...9-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...-invalid-ingredient-lists-in-Villag.patch} |  0
 ...atch => 0623-added-PlayerTradeEvent.patch} |  0
 ...ch => 0624-Implement-TargetHitEvent.patch} |  0
 ...625-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0626-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ... => 0628-Optimized-tick-ready-check.patch} |  0
 ....patch => 0629-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  0
 ...h => 0633-Zombie-API-breaking-doors.patch} |  0
 ...634-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0635-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0636-Guardian-beam-workaround.patch} |  0
 ...0637-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...mplemented-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...tch => 0642-Fire-event-on-GS4-query.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  0
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...I-to-expose-exact-interaction-point.patch} |  0
 ...OIs.patch => 0647-Remove-stale-POIs.patch} |  0
 ...h => 0648-Fix-villager-boat-exploit.patch} |  2 +-
 ...49-Entity-load-save-limit-per-chunk.patch} |  0
 ...I.patch => 0650-Add-sendOpLevel-API.patch} |  0
 ...ch => 0651-Add-StructureLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  0
 ...Make-ProjectileHitEvent-Cancellable.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...655-Make-schedule-command-per-world.patch} |  0
 ...656-Configurable-max-leash-distance.patch} |  0
 ...657-Implement-BlockPreDispenseEvent.patch} |  0
 ...h => 0658-Added-Vanilla-Entity-Tags.patch} |  0
 ...-API.patch => 0659-added-Wither-API.patch} |  0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...-spam-when-removing-chests-in-water.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  0
 ...e-map-update-when-spawning-disabled.patch} |  2 +-
 ...shield-blocking-on-dimension-change.patch} |  4 ++--
 ...atch => 0667-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0668-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0670-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...ix-dead-slime-setSize-invincibility.patch} |  0
 ...pes-should-return-an-immutable-list.patch} |  0
 ....patch => 0676-misc-debugging-dumps.patch} |  0
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...fo.patch => 0678-Clear-SyncLoadInfo.patch} |  0
 ...atch => 0679-Expose-Tracked-Players.patch} |  0
 ...0-Remove-streams-from-SensorNearest.patch} |  0
 ...nnecessary-copies-of-passenger-list.patch} |  0
 ...ix-Wither-hostility-towards-players.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  0
 ...GUI.patch => 0684-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...686-fix-converting-txt-to-json-file.patch} |  0
 ...atch => 0687-Add-worldborder-events.patch} |  0
 ...=> 0688-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0690-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0691-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ...ch => 0693-Implement-Keyed-on-World.patch} |  0
 ...lternative-constructor-for-Vector3f.patch} |  0
 ...y-API.patch => 0695-Item-Rarity-API.patch} |  0
 ...0696-fixup-Improved-Watchdog-Support.patch | 23 -------------------
 .../0697-fixup-POM-Changes.patch              | 19 ---------------
 246 files changed, 57 insertions(+), 96 deletions(-)
 rename Spigot-Server-Patches/{0695-fixup-Load-chunks-asynchronously-for-players.patch => 0454-fixup-Load-chunks-asynchronously-for-players.patch} (90%)
 rename Spigot-Server-Patches/{0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0455-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (93%)
 rename Spigot-Server-Patches/{0455-Add-PlayerAttackEntityCooldownResetEvent.patch => 0456-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-Server-Patches/{0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (96%)
 rename Spigot-Server-Patches/{0457-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0458-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename Spigot-Server-Patches/{0458-Add-phantom-creative-and-insomniac-controls.patch => 0459-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename Spigot-Server-Patches/{0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (98%)
 rename Spigot-Server-Patches/{0460-Implement-Brigadier-Mojang-API.patch => 0461-Implement-Brigadier-Mojang-API.patch} (100%)
 rename Spigot-Server-Patches/{0461-Villager-Restocks-API.patch => 0462-Villager-Restocks-API.patch} (100%)
 rename Spigot-Server-Patches/{0462-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0463-Validate-PickItem-Packet-and-kick-for-invalid.patch} (94%)
 rename Spigot-Server-Patches/{0463-Expose-game-version.patch => 0464-Expose-game-version.patch} (89%)
 rename Spigot-Server-Patches/{0464-Optimize-Voxel-Shape-Merging.patch => 0465-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename Spigot-Server-Patches/{0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (93%)
 rename Spigot-Server-Patches/{0466-Implement-Mob-Goal-API.patch => 0467-Implement-Mob-Goal-API.patch} (99%)
 rename Spigot-Server-Patches/{0467-Use-distance-map-to-optimise-entity-tracker.patch => 0468-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0468-Optimize-isOutsideRange-to-use-distance-maps.patch => 0469-Optimize-isOutsideRange-to-use-distance-maps.patch} (98%)
 rename Spigot-Server-Patches/{0469-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0470-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename Spigot-Server-Patches/{0470-No-Tick-view-distance-implementation.patch => 0471-No-Tick-view-distance-implementation.patch} (99%)
 rename Spigot-Server-Patches/{0471-Add-villager-reputation-API.patch => 0472-Add-villager-reputation-API.patch} (100%)
 rename Spigot-Server-Patches/{0472-Fix-Light-Command.patch => 0473-Fix-Light-Command.patch} (100%)
 rename Spigot-Server-Patches/{0473-Fix-PotionEffect-ignores-icon-flag.patch => 0474-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename Spigot-Server-Patches/{0474-Optimize-brigadier-child-sorting-performance.patch => 0475-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename Spigot-Server-Patches/{0475-Potential-bed-API.patch => 0476-Potential-bed-API.patch} (100%)
 rename Spigot-Server-Patches/{0476-Wait-for-Async-Tasks-during-shutdown.patch => 0477-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename Spigot-Server-Patches/{0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename Spigot-Server-Patches/{0479-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0480-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename Spigot-Server-Patches/{0480-Reduce-MutableInt-allocations-from-light-engine.patch => 0481-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename Spigot-Server-Patches/{0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0482-Ensure-safe-gateway-teleport.patch => 0483-Ensure-safe-gateway-teleport.patch} (100%)
 rename Spigot-Server-Patches/{0483-Add-option-for-console-having-all-permissions.patch => 0484-Add-option-for-console-having-all-permissions.patch} (100%)
 rename Spigot-Server-Patches/{0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0485-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename Spigot-Server-Patches/{0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch => 0486-Workaround-for-Client-Lag-Spikes-MC-162253.patch} (100%)
 rename Spigot-Server-Patches/{0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (97%)
 rename Spigot-Server-Patches/{0488-Improve-Chunk-Status-Transition-Speed.patch => 0489-Improve-Chunk-Status-Transition-Speed.patch} (100%)
 rename Spigot-Server-Patches/{0489-Fix-villager-trading-demand-MC-163962.patch => 0490-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename Spigot-Server-Patches/{0490-Maps-shouldn-t-load-chunks.patch => 0491-Maps-shouldn-t-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename Spigot-Server-Patches/{0492-Optimize-Bit-Operations-by-inlining.patch => 0493-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0493-Optimize-Light-Engine.patch => 0494-Optimize-Light-Engine.patch} (100%)
 rename Spigot-Server-Patches/{0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename Spigot-Server-Patches/{0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename Spigot-Server-Patches/{0496-Fix-missing-chunks-due-to-integer-overflow.patch => 0497-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename Spigot-Server-Patches/{0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename Spigot-Server-Patches/{0498-Fix-piston-physics-inconsistency-MC-188840.patch => 0499-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename Spigot-Server-Patches/{0499-Fix-sand-duping.patch => 0500-Fix-sand-duping.patch} (100%)
 rename Spigot-Server-Patches/{0500-Prevent-position-desync-in-playerconnection-causing-.patch => 0501-Prevent-position-desync-in-playerconnection-causing-.patch} (94%)
 rename Spigot-Server-Patches/{0501-Fix-enderdragon-exp-dupe.patch => 0502-Fix-enderdragon-exp-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0502-Inventory-getHolder-method-without-block-snapshot.patch => 0503-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0503-Expose-Arrow-getItemStack.patch => 0504-Expose-Arrow-getItemStack.patch} (100%)
 rename Spigot-Server-Patches/{0504-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0505-Add-and-implement-PlayerRecipeBookClickEvent.patch} (95%)
 rename Spigot-Server-Patches/{0505-Hide-sync-chunk-writes-behind-flag.patch => 0506-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename Spigot-Server-Patches/{0506-Limit-lightning-strike-effect-distance.patch => 0507-Limit-lightning-strike-effect-distance.patch} (100%)
 rename Spigot-Server-Patches/{0507-Add-permission-for-command-blocks.patch => 0508-Add-permission-for-command-blocks.patch} (100%)
 rename Spigot-Server-Patches/{0508-Ensure-Entity-AABB-s-are-never-invalid.patch => 0509-Ensure-Entity-AABB-s-are-never-invalid.patch} (96%)
 rename Spigot-Server-Patches/{0509-Optimize-WorldBorder-collision-checks-and-air.patch => 0510-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename Spigot-Server-Patches/{0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)
 rename Spigot-Server-Patches/{0511-Paper-dumpitem-command.patch => 0512-Paper-dumpitem-command.patch} (100%)
 rename Spigot-Server-Patches/{0512-Don-t-allow-null-UUID-s-for-chat.patch => 0513-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename Spigot-Server-Patches/{0513-Improve-Legacy-Component-serialization-size.patch => 0514-Improve-Legacy-Component-serialization-size.patch} (97%)
 rename Spigot-Server-Patches/{0514-Support-old-UUID-format-for-NBT.patch => 0515-Support-old-UUID-format-for-NBT.patch} (100%)
 rename Spigot-Server-Patches/{0515-Clean-up-duplicated-GameProfile-Properties.patch => 0516-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename Spigot-Server-Patches/{0516-Convert-legacy-attributes-in-Item-Meta.patch => 0517-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0517-Remove-some-streams-from-structures.patch => 0518-Remove-some-streams-from-structures.patch} (100%)
 rename Spigot-Server-Patches/{0518-Remove-streams-from-classes-related-villager-gossip.patch => 0519-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename Spigot-Server-Patches/{0519-Support-components-in-ItemMeta.patch => 0520-Support-components-in-ItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename Spigot-Server-Patches/{0521-Add-entity-liquid-API.patch => 0522-Add-entity-liquid-API.patch} (100%)
 rename Spigot-Server-Patches/{0522-Update-itemstack-legacy-name-and-lore.patch => 0523-Update-itemstack-legacy-name-and-lore.patch} (97%)
 rename Spigot-Server-Patches/{0523-Spawn-player-in-correct-world-on-login.patch => 0524-Spawn-player-in-correct-world-on-login.patch} (94%)
 rename Spigot-Server-Patches/{0524-Add-PrepareResultEvent.patch => 0525-Add-PrepareResultEvent.patch} (100%)
 rename Spigot-Server-Patches/{0525-Allow-delegation-to-vanilla-chunk-gen.patch => 0526-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename Spigot-Server-Patches/{0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename Spigot-Server-Patches/{0527-Optimize-NetworkManager-Exception-Handling.patch => 0528-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename Spigot-Server-Patches/{0528-Fix-Concurrency-issue-in-WeightedList.patch => 0529-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename Spigot-Server-Patches/{0529-Optimize-the-advancement-data-player-iteration-to-be.patch => 0530-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename Spigot-Server-Patches/{0530-Fix-arrows-never-despawning-MC-125757.patch => 0531-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename Spigot-Server-Patches/{0531-Thread-Safe-Vanilla-Command-permission-checking.patch => 0532-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename Spigot-Server-Patches/{0532-Move-range-check-for-block-placing-up.patch => 0533-Move-range-check-for-block-placing-up.patch} (96%)
 rename Spigot-Server-Patches/{0533-Fix-SPIGOT-5989.patch => 0534-Fix-SPIGOT-5989.patch} (99%)
 rename Spigot-Server-Patches/{0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename Spigot-Server-Patches/{0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename Spigot-Server-Patches/{0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename Spigot-Server-Patches/{0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename Spigot-Server-Patches/{0538-Fix-some-rails-connecting-improperly.patch => 0539-Fix-some-rails-connecting-improperly.patch} (100%)
 rename Spigot-Server-Patches/{0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename Spigot-Server-Patches/{0540-Incremental-player-saving.patch => 0541-Incremental-player-saving.patch} (97%)
 rename Spigot-Server-Patches/{0541-Import-fastutil-classes.patch => 0542-Import-fastutil-classes.patch} (100%)
 rename Spigot-Server-Patches/{0542-Don-t-mark-null-chunk-sections-for-block-updates.patch => 0543-Don-t-mark-null-chunk-sections-for-block-updates.patch} (100%)
 rename Spigot-Server-Patches/{0543-Remove-armour-stand-double-add-to-world.patch => 0544-Remove-armour-stand-double-add-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0544-Fix-MC-187716-Use-configured-height.patch => 0545-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename Spigot-Server-Patches/{0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename Spigot-Server-Patches/{0546-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0547-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename Spigot-Server-Patches/{0547-Brand-support.patch => 0548-Brand-support.patch} (100%)
 rename Spigot-Server-Patches/{0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch => 0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch} (100%)
 rename Spigot-Server-Patches/{0549-Fix-MC-197271.patch => 0550-Fix-MC-197271.patch} (100%)
 rename Spigot-Server-Patches/{0550-MC-197883-Bandaid-decode-issue.patch => 0551-MC-197883-Bandaid-decode-issue.patch} (100%)
 rename Spigot-Server-Patches/{0551-Add-setMaxPlayers-API.patch => 0552-Add-setMaxPlayers-API.patch} (94%)
 rename Spigot-Server-Patches/{0552-Add-playPickupItemAnimation-to-LivingEntity.patch => 0553-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0553-Don-t-require-FACING-data.patch => 0554-Don-t-require-FACING-data.patch} (100%)
 rename Spigot-Server-Patches/{0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename Spigot-Server-Patches/{0555-Add-moon-phase-API.patch => 0556-Add-moon-phase-API.patch} (100%)
 rename Spigot-Server-Patches/{0556-Prevent-headless-pistons-from-being-created.patch => 0557-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename Spigot-Server-Patches/{0557-Add-BellRingEvent.patch => 0558-Add-BellRingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0558-Add-zombie-targets-turtle-egg-config.patch => 0559-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename Spigot-Server-Patches/{0559-Buffer-joins-to-world.patch => 0560-Buffer-joins-to-world.patch} (97%)
 rename Spigot-Server-Patches/{0560-Optimize-redstone-algorithm.patch => 0561-Optimize-redstone-algorithm.patch} (100%)
 rename Spigot-Server-Patches/{0561-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0562-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename Spigot-Server-Patches/{0562-PortalCreateEvent-needs-to-know-its-entity.patch => 0563-PortalCreateEvent-needs-to-know-its-entity.patch} (98%)
 rename Spigot-Server-Patches/{0563-Fix-CraftTeam-null-check.patch => 0564-Fix-CraftTeam-null-check.patch} (100%)
 rename Spigot-Server-Patches/{0564-Add-more-Evoker-API.patch => 0565-Add-more-Evoker-API.patch} (100%)
 rename Spigot-Server-Patches/{0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename Spigot-Server-Patches/{0566-Create-HoverEvent-from-ItemStack-Entity.patch => 0567-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename Spigot-Server-Patches/{0567-Cache-block-data-strings.patch => 0568-Cache-block-data-strings.patch} (100%)
 rename Spigot-Server-Patches/{0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename Spigot-Server-Patches/{0569-Add-additional-open-container-api-to-HumanEntity.patch => 0570-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename Spigot-Server-Patches/{0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename Spigot-Server-Patches/{0571-Extend-block-drop-capture-to-capture-all-items-added.patch => 0572-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename Spigot-Server-Patches/{0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename Spigot-Server-Patches/{0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (94%)
 rename Spigot-Server-Patches/{0574-Lazily-track-plugin-scoreboards-by-default.patch => 0575-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename Spigot-Server-Patches/{0575-Entity-isTicking.patch => 0576-Entity-isTicking.patch} (100%)
 rename Spigot-Server-Patches/{0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename Spigot-Server-Patches/{0577-Fix-Not-a-string-Map-Conversion-spam.patch => 0578-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename Spigot-Server-Patches/{0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (90%)
 rename Spigot-Server-Patches/{0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch => 0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch} (100%)
 rename Spigot-Server-Patches/{0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename Spigot-Server-Patches/{0581-Fix-for-large-move-vectors-crashing-server.patch => 0582-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0582-Optimise-getType-calls.patch => 0583-Optimise-getType-calls.patch} (100%)
 rename Spigot-Server-Patches/{0583-Villager-resetOffers.patch => 0584-Villager-resetOffers.patch} (100%)
 rename Spigot-Server-Patches/{0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename Spigot-Server-Patches/{0585-Retain-block-place-order-when-capturing-blockstates.patch => 0586-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename Spigot-Server-Patches/{0586-Reduce-blockpos-allocation-from-pathfinding.patch => 0587-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0587-Fix-item-locations-dropped-from-campfires.patch => 0588-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename Spigot-Server-Patches/{0588-Player-elytra-boost-API.patch => 0589-Player-elytra-boost-API.patch} (100%)
 rename Spigot-Server-Patches/{0589-Fixed-TileEntityBell-memory-leak.patch => 0590-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename Spigot-Server-Patches/{0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename Spigot-Server-Patches/{0591-Add-getOfflinePlayerIfCached-String.patch => 0592-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename Spigot-Server-Patches/{0592-Add-ignore-discounts-API.patch => 0593-Add-ignore-discounts-API.patch} (100%)
 rename Spigot-Server-Patches/{0593-Toggle-for-removing-existing-dragon.patch => 0594-Toggle-for-removing-existing-dragon.patch} (100%)
 rename Spigot-Server-Patches/{0594-Fix-client-lag-on-advancement-loading.patch => 0595-Fix-client-lag-on-advancement-loading.patch} (96%)
 rename Spigot-Server-Patches/{0595-Item-no-age-no-player-pickup.patch => 0596-Item-no-age-no-player-pickup.patch} (100%)
 rename Spigot-Server-Patches/{0596-Beacon-API-custom-effect-ranges.patch => 0597-Beacon-API-custom-effect-ranges.patch} (100%)
 rename Spigot-Server-Patches/{0597-Add-API-for-quit-reason.patch => 0598-Add-API-for-quit-reason.patch} (93%)
 rename Spigot-Server-Patches/{0598-Seed-based-feature-search.patch => 0599-Seed-based-feature-search.patch} (100%)
 rename Spigot-Server-Patches/{0599-Add-Wandering-Trader-spawn-rate-config-options.patch => 0600-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename Spigot-Server-Patches/{0600-Significantly-improve-performance-of-the-end-generat.patch => 0601-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename Spigot-Server-Patches/{0601-Expose-world-spawn-angle.patch => 0602-Expose-world-spawn-angle.patch} (100%)
 rename Spigot-Server-Patches/{0602-Add-Destroy-Speed-API.patch => 0603-Add-Destroy-Speed-API.patch} (100%)
 rename Spigot-Server-Patches/{0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0604-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename Spigot-Server-Patches/{0604-Add-LivingEntity-clearActiveItem.patch => 0605-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename Spigot-Server-Patches/{0605-Add-PlayerItemCooldownEvent.patch => 0606-Add-PlayerItemCooldownEvent.patch} (100%)
 rename Spigot-Server-Patches/{0606-More-lightning-API.patch => 0607-More-lightning-API.patch} (100%)
 rename Spigot-Server-Patches/{0607-Climbing-should-not-bypass-cramming-gamerule.patch => 0608-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename Spigot-Server-Patches/{0608-Added-missing-default-perms-for-commands.patch => 0609-Added-missing-default-perms-for-commands.patch} (100%)
 rename Spigot-Server-Patches/{0609-Add-PlayerShearBlockEvent.patch => 0610-Add-PlayerShearBlockEvent.patch} (100%)
 rename Spigot-Server-Patches/{0610-Add-warning-for-servers-not-running-on-Java-11.patch => 0611-Add-warning-for-servers-not-running-on-Java-11.patch} (100%)
 rename Spigot-Server-Patches/{0611-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0612-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename Spigot-Server-Patches/{0612-Fix-curing-zombie-villager-discount-exploit.patch => 0613-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename Spigot-Server-Patches/{0613-Fix-curing-villager-makes-equipment-disappear.patch => 0614-Fix-curing-villager-makes-equipment-disappear.patch} (100%)
 rename Spigot-Server-Patches/{0614-Limit-recipe-packets.patch => 0615-Limit-recipe-packets.patch} (100%)
 rename Spigot-Server-Patches/{0615-Fix-CraftSound-backwards-compatibility.patch => 0616-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename Spigot-Server-Patches/{0616-MC-4-Fix-item-position-desync.patch => 0617-MC-4-Fix-item-position-desync.patch} (100%)
 rename Spigot-Server-Patches/{0617-Player-Chunk-Load-Unload-Events.patch => 0618-Player-Chunk-Load-Unload-Events.patch} (89%)
 rename Spigot-Server-Patches/{0618-Optimize-Dynamic-get-Missing-Keys.patch => 0619-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename Spigot-Server-Patches/{0619-Expose-LivingEntity-hurt-direction.patch => 0620-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename Spigot-Server-Patches/{0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename Spigot-Server-Patches/{0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename Spigot-Server-Patches/{0622-added-PlayerTradeEvent.patch => 0623-added-PlayerTradeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0623-Implement-TargetHitEvent.patch => 0624-Implement-TargetHitEvent.patch} (100%)
 rename Spigot-Server-Patches/{0624-Additional-Block-Material-API-s.patch => 0625-Additional-Block-Material-API-s.patch} (100%)
 rename Spigot-Server-Patches/{0625-Fix-harming-potion-dupe.patch => 0626-Fix-harming-potion-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename Spigot-Server-Patches/{0627-Optimized-tick-ready-check.patch => 0628-Optimized-tick-ready-check.patch} (100%)
 rename Spigot-Server-Patches/{0628-Cache-burn-durations.patch => 0629-Cache-burn-durations.patch} (100%)
 rename Spigot-Server-Patches/{0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename Spigot-Server-Patches/{0630-Implement-PlayerFlowerPotManipulateEvent.patch => 0631-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename Spigot-Server-Patches/{0631-Fix-interact-event-not-being-called-in-adventure.patch => 0632-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename Spigot-Server-Patches/{0632-Zombie-API-breaking-doors.patch => 0633-Zombie-API-breaking-doors.patch} (100%)
 rename Spigot-Server-Patches/{0633-Fix-nerfed-slime-when-splitting.patch => 0634-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename Spigot-Server-Patches/{0634-Add-EntityLoadCrossbowEvent.patch => 0635-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0635-Guardian-beam-workaround.patch => 0636-Guardian-beam-workaround.patch} (100%)
 rename Spigot-Server-Patches/{0636-Added-WorldGameRuleChangeEvent.patch => 0637-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0637-Added-ServerResourcesReloadedEvent.patch => 0638-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename Spigot-Server-Patches/{0638-Added-world-settings-for-mobs-picking-up-loot.patch => 0639-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename Spigot-Server-Patches/{0639-Implemented-BlockFailedDispenseEvent.patch => 0640-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0640-Added-PlayerLecternPageChangeEvent.patch => 0641-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0641-Fire-event-on-GS4-query.patch => 0642-Fire-event-on-GS4-query.patch} (100%)
 rename Spigot-Server-Patches/{0642-Added-PlayerLoomPatternSelectEvent.patch => 0643-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0643-Configurable-door-breaking-difficulty.patch => 0644-Configurable-door-breaking-difficulty.patch} (100%)
 rename Spigot-Server-Patches/{0644-Empty-commands-shall-not-be-dispatched.patch => 0645-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename Spigot-Server-Patches/{0645-Implement-API-to-expose-exact-interaction-point.patch => 0646-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename Spigot-Server-Patches/{0646-Remove-stale-POIs.patch => 0647-Remove-stale-POIs.patch} (100%)
 rename Spigot-Server-Patches/{0647-Fix-villager-boat-exploit.patch => 0648-Fix-villager-boat-exploit.patch} (94%)
 rename Spigot-Server-Patches/{0648-Entity-load-save-limit-per-chunk.patch => 0649-Entity-load-save-limit-per-chunk.patch} (100%)
 rename Spigot-Server-Patches/{0649-Add-sendOpLevel-API.patch => 0650-Add-sendOpLevel-API.patch} (100%)
 rename Spigot-Server-Patches/{0650-Add-StructureLocateEvent.patch => 0651-Add-StructureLocateEvent.patch} (100%)
 rename Spigot-Server-Patches/{0651-Collision-option-for-requiring-a-player-participant.patch => 0652-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename Spigot-Server-Patches/{0652-Make-ProjectileHitEvent-Cancellable.patch => 0653-Make-ProjectileHitEvent-Cancellable.patch} (100%)
 rename Spigot-Server-Patches/{0653-Return-chat-component-with-empty-text-instead-of-thr.patch => 0654-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename Spigot-Server-Patches/{0654-Make-schedule-command-per-world.patch => 0655-Make-schedule-command-per-world.patch} (100%)
 rename Spigot-Server-Patches/{0655-Configurable-max-leash-distance.patch => 0656-Configurable-max-leash-distance.patch} (100%)
 rename Spigot-Server-Patches/{0656-Implement-BlockPreDispenseEvent.patch => 0657-Implement-BlockPreDispenseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0657-Added-Vanilla-Entity-Tags.patch => 0658-Added-Vanilla-Entity-Tags.patch} (100%)
 rename Spigot-Server-Patches/{0658-added-Wither-API.patch => 0659-added-Wither-API.patch} (100%)
 rename Spigot-Server-Patches/{0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0660-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0660-Fix-console-spam-when-removing-chests-in-water.patch => 0661-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename Spigot-Server-Patches/{0661-Add-toggle-for-always-placing-the-dragon-egg.patch => 0662-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename Spigot-Server-Patches/{0662-Added-PlayerStonecutterRecipeSelectEvent.patch => 0663-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0663-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0664-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename Spigot-Server-Patches/{0664-Skip-distance-map-update-when-spawning-disabled.patch => 0665-Skip-distance-map-update-when-spawning-disabled.patch} (92%)
 rename Spigot-Server-Patches/{0665-Reset-shield-blocking-on-dimension-change.patch => 0666-Reset-shield-blocking-on-dimension-change.patch} (83%)
 rename Spigot-Server-Patches/{0666-add-DragonEggFormEvent.patch => 0667-add-DragonEggFormEvent.patch} (100%)
 rename Spigot-Server-Patches/{0667-EntityMoveEvent.patch => 0668-EntityMoveEvent.patch} (100%)
 rename Spigot-Server-Patches/{0668-added-option-to-disable-pathfinding-updates-on-block.patch => 0669-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename Spigot-Server-Patches/{0669-Inline-shift-direction-fields.patch => 0670-Inline-shift-direction-fields.patch} (100%)
 rename Spigot-Server-Patches/{0670-Allow-adding-items-to-BlockDropItemEvent.patch => 0671-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename Spigot-Server-Patches/{0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0672-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename Spigot-Server-Patches/{0672-living-entity-allow-attribute-registration.patch => 0673-living-entity-allow-attribute-registration.patch} (100%)
 rename Spigot-Server-Patches/{0673-fix-dead-slime-setSize-invincibility.patch => 0674-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename Spigot-Server-Patches/{0674-Merchant-getRecipes-should-return-an-immutable-list.patch => 0675-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename Spigot-Server-Patches/{0675-misc-debugging-dumps.patch => 0676-misc-debugging-dumps.patch} (100%)
 rename Spigot-Server-Patches/{0676-Add-support-for-hex-color-codes-in-console.patch => 0677-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename Spigot-Server-Patches/{0677-Clear-SyncLoadInfo.patch => 0678-Clear-SyncLoadInfo.patch} (100%)
 rename Spigot-Server-Patches/{0678-Expose-Tracked-Players.patch => 0679-Expose-Tracked-Players.patch} (100%)
 rename Spigot-Server-Patches/{0679-Remove-streams-from-SensorNearest.patch => 0680-Remove-streams-from-SensorNearest.patch} (100%)
 rename Spigot-Server-Patches/{0680-do-not-create-unnecessary-copies-of-passenger-list.patch => 0681-do-not-create-unnecessary-copies-of-passenger-list.patch} (100%)
 rename Spigot-Server-Patches/{0681-MC-29274-Fix-Wither-hostility-towards-players.patch => 0682-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename Spigot-Server-Patches/{0682-Throw-proper-exception-on-empty-JsonList-file.patch => 0683-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename Spigot-Server-Patches/{0683-Improve-ServerGUI.patch => 0684-Improve-ServerGUI.patch} (100%)
 rename Spigot-Server-Patches/{0684-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0685-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename Spigot-Server-Patches/{0685-fix-converting-txt-to-json-file.patch => 0686-fix-converting-txt-to-json-file.patch} (100%)
 rename Spigot-Server-Patches/{0686-Add-worldborder-events.patch => 0687-Add-worldborder-events.patch} (100%)
 rename Spigot-Server-Patches/{0687-added-PlayerNameEntityEvent.patch => 0688-added-PlayerNameEntityEvent.patch} (100%)
 rename Spigot-Server-Patches/{0688-Prevent-grindstones-from-overstacking-items.patch => 0689-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename Spigot-Server-Patches/{0689-Add-recipe-to-cook-events.patch => 0690-Add-recipe-to-cook-events.patch} (100%)
 rename Spigot-Server-Patches/{0690-Add-Block-isValidTool.patch => 0691-Add-Block-isValidTool.patch} (100%)
 rename Spigot-Server-Patches/{0691-Allow-using-signs-inside-spawn-protection.patch => 0692-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename Spigot-Server-Patches/{0692-Implement-Keyed-on-World.patch => 0693-Implement-Keyed-on-World.patch} (100%)
 rename Spigot-Server-Patches/{0693-Add-fast-alternative-constructor-for-Vector3f.patch => 0694-Add-fast-alternative-constructor-for-Vector3f.patch} (100%)
 rename Spigot-Server-Patches/{0694-Item-Rarity-API.patch => 0695-Item-Rarity-API.patch} (100%)
 delete mode 100644 Spigot-Server-Patches/0696-fixup-Improved-Watchdog-Support.patch
 delete mode 100644 Spigot-Server-Patches/0697-fixup-POM-Changes.patch

diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index bc114ceb5f..c5c38f1e03 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982ac53ee67 100644
+index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783ca123564 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -28,7 +28,7 @@ index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <api.version>unknown</api.version>
          <bt.name>git</bt.name>
-@@ -20,21 +19,27 @@
+@@ -20,23 +19,29 @@
      </properties>
  
      <parent>
@@ -59,8 +59,11 @@ index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982
 +        <dependency>
 +            <groupId>io.papermc</groupId>
              <artifactId>minecraft-server</artifactId>
-             <version>${minecraft.version}-SNAPSHOT</version>
+-            <version>${minecraft.version}-SNAPSHOT</version>
++            <version>${minecraft.version}-R0.2-SNAPSHOT</version>
              <scope>compile</scope>
+         </dependency>
+         <dependency>
 @@ -64,6 +69,17 @@
              <version>9.0</version>
              <scope>compile</scope>
diff --git a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch
index 3ddd0d36c4..59daff3156 100644
--- a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch
@@ -358,7 +358,7 @@ index 4828d356ca01cba5964c6397584d56643dbc0dae..55890ff463eb122934e8ba1fc550cf0c
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..8265879466333f4941c63c64b95d94f6ac0b5558 100644
+index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..9cd50aa48c5cd67631c8c99543ed8e162603b423 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -150,6 +150,37 @@ public class Main {
@@ -442,9 +442,9 @@ index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..8265879466333f4941c63c64b95d94f6
 +            tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent");
 +            tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent");
 +            // Minecraft, seen during saving
-+            tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener$Void");
-+            tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener");
-+            tryPreloadClass("net.minecraft.server.ExceptionSuppressor");
++            tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener$Void");
++            tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener");
++            tryPreloadClass("net.minecraft.util.ExceptionSuppressor");
 +            // Paper end
 +        }
 +    }
diff --git a/Spigot-Server-Patches/0695-fixup-Load-chunks-asynchronously-for-players.patch b/Spigot-Server-Patches/0454-fixup-Load-chunks-asynchronously-for-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0695-fixup-Load-chunks-asynchronously-for-players.patch
rename to Spigot-Server-Patches/0454-fixup-Load-chunks-asynchronously-for-players.patch
index d98f255fcd..4316280439 100644
--- a/Spigot-Server-Patches/0695-fixup-Load-chunks-asynchronously-for-players.patch
+++ b/Spigot-Server-Patches/0454-fixup-Load-chunks-asynchronously-for-players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fixup! Load chunks asynchronously for players.
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 1212084923780ab4fa0fb67afb4fe326159890e8..37c9b5fd712e30a9a0faccc840f738f4b2cfc723 100644
+index 2ca9335129465ffb67617b42534db530c1d78923..36b4792687a5c6316bf95995e761bf4aa49779f6 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -31,6 +31,7 @@ import net.minecraft.core.NonNullList;
diff --git a/Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0455-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 93%
rename from Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0455-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 0bb982be8d..49c31930c6 100644
--- a/Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/Spigot-Server-Patches/0455-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c7786e8d100cb872b10664b9c16de332ada3e3fe..167c9eb09a2fc9ac6db19b90723feacee52ec39e 100644
+index 8ca7012264528f17ac2e4f15ced96c774fa566d7..675d0cb32efc99f66c4d2b000bf49cf1c065a5e2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1808,9 +1808,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0456-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0456-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 96%
rename from Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
index efd92293d7..561eeffb91 100644
--- a/Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
+++ b/Spigot-Server-Patches/0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
@@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue
 We make sure to also implement a pattern that is recursion safe too.
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 94860c06717e8dcf969277562e88687e9a99aaa4..1b309682b58a2ef52b973181aefb0136f1aa3e80 100644
+index e5d94dedc88e8bbcf8d9517dfb5c6ec6f62de5aa..042a6beb8cada116d54bed18181de291bf5ed1bb 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -162,24 +162,32 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0458-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0458-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0459-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0459-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 98%
rename from Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 31ffc97867..e1b14be900 100644
--- a/Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/Spigot-Server-Patches/0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 167c9eb09a2fc9ac6db19b90723feacee52ec39e..b57888b2b53a8cf6d1e8af0f6e779bbcf748cd61 100644
+index 675d0cb32efc99f66c4d2b000bf49cf1c065a5e2..cb5c93dca3b947462b89f79c60c7562085684b87 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1969,11 +1969,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0461-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0461-Implement-Brigadier-Mojang-API.patch
diff --git a/Spigot-Server-Patches/0461-Villager-Restocks-API.patch b/Spigot-Server-Patches/0462-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0461-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0462-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0463-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 94%
rename from Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0463-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 140cc1f60e..078445f5a4 100644
--- a/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/Spigot-Server-Patches/0463-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index de0d37044911b50a91f82d4064520e2ba97ff4fd..5cd8ee9a9099cd435735c3d9a2194f86232db45f 100644
+index 839eb6a294a696c5abd0d5e005b70d9bdbf25f9b..41d4c3533119cc80cb4c93771db344531c8dd106 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -881,7 +881,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0463-Expose-game-version.patch b/Spigot-Server-Patches/0464-Expose-game-version.patch
similarity index 89%
rename from Spigot-Server-Patches/0463-Expose-game-version.patch
rename to Spigot-Server-Patches/0464-Expose-game-version.patch
index 7b239b5c79..5d5f8c7da1 100644
--- a/Spigot-Server-Patches/0463-Expose-game-version.patch
+++ b/Spigot-Server-Patches/0464-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7630a7fc347f6add6e628093c1f149ee01d05264..d0091fb05a0122e099d4d496f3e04a91b778cff2 100644
+index 55890ff463eb122934e8ba1fc550cf0cccaf8451..96652862531301c08aefa0baa79b1258b5b307ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -518,6 +518,13 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0465-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0465-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 5a7fc66550..292b07146d 100644
--- a/Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/Spigot-Server-Patches/0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 8265879466333f4941c63c64b95d94f6ac0b5558..22bde395939f97086e411cef190bb2b1e7ede79a 100644
+index 9cd50aa48c5cd67631c8c99543ed8e162603b423..8a1ff1000f82a590b293e8892a34484df068093c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch
index 78f694df3f..6f6e3373f2 100644
--- a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/pom.xml b/pom.xml
-index 42dd78821c061b0384b5b8feaea7b9590ae39bd4..806832714739d3ae264ba7c3d2ca64a5e73f8b7f 100644
+index d6e313021d268c5d865394859b3d748edf1b061c..70c0fb4621b16c33d7cdf7d920c17bfe1ff8d831 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -142,6 +142,13 @@
diff --git a/Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0468-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0468-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 98%
rename from Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch
index 472f84ab69..56df30f845 100644
--- a/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -77,7 +77,7 @@ index 60fcea78bf617559114b1ca1c0bf2d4cd9075a8c..335666db1854e8aa4b2ba71d5bdc2658
  
      public String c() {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index bc642671292a753484e47f87bef4eee724353f07..b24a96dddf50029e4b40a47d49e3278cacaf42ce 100644
+index ecf4cd6dfea777ab9daea0b40724d247df7ddb53..42bb00364375e5cf324b43557385345868b37ffe 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -753,6 +753,37 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -148,10 +148,10 @@ index bc642671292a753484e47f87bef4eee724353f07..b24a96dddf50029e4b40a47d49e3278c
                              }
  
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 2ca9335129465ffb67617b42534db530c1d78923..996e86d44c4d2a4451d9cb7cbc2fa699e229b6ca 100644
+index 36b4792687a5c6316bf95995e761bf4aa49779f6..d50b53ae3b8f463eb1caa93b1c21f5c6a5a6484c 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -248,6 +248,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -249,6 +249,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> cachedSingleHashSet; // Paper
  
@@ -192,7 +192,7 @@ index 445dba8ed210407664904b707c36c78a76f25510..25484cac9c62e49de39fbbf506fcb3ed
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 3e5c3d33a2d031915305abd37d1ba6e1ebfd089e..ad6cfce582e319314134eff4571519aa7325d783 100644
+index c30ec3ad68fc10d01d0b3dd1feea32f08c19ab1c..3c49ca30959204840a656c1a44de50a60ea1c7df 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -210,6 +210,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0471-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0471-No-Tick-view-distance-implementation.patch
index deb8894e5a..7a1fa8a404 100644
--- a/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0471-No-Tick-view-distance-implementation.patch
@@ -73,10 +73,10 @@ index 335666db1854e8aa4b2ba71d5bdc2658305cb70a..2bbdcedf4856080ea9232effdf3bdae9
                  if (flag1) {
                      ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 996e86d44c4d2a4451d9cb7cbc2fa699e229b6ca..2def7680367e4a20d7402b27bff7242afdc250e2 100644
+index d50b53ae3b8f463eb1caa93b1c21f5c6a5a6484c..d4f0cb8d18a185e58892a42fb7151cf1065fc362 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -250,6 +250,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -251,6 +251,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
  
diff --git a/Spigot-Server-Patches/0471-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0472-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0471-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0472-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0472-Fix-Light-Command.patch b/Spigot-Server-Patches/0473-Fix-Light-Command.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0473-Fix-Light-Command.patch
diff --git a/Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0474-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0474-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0475-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0475-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0475-Potential-bed-API.patch b/Spigot-Server-Patches/0476-Potential-bed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0475-Potential-bed-API.patch
rename to Spigot-Server-Patches/0476-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0477-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0477-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0480-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0480-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0481-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0481-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0483-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0483-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch
diff --git a/Spigot-Server-Patches/0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0485-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0485-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0486-Workaround-for-Client-Lag-Spikes-MC-162253.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch
rename to Spigot-Server-Patches/0486-Workaround-for-Client-Lag-Spikes-MC-162253.patch
diff --git a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index bc5af6afc7..11f1942378 100644
--- a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/Spigot-Server-Patches/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -569,10 +569,10 @@ index 42bb00364375e5cf324b43557385345868b37ffe..19e02d12bb0c5a73066f7c57da402779
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 2def7680367e4a20d7402b27bff7242afdc250e2..5d6865fd7b67c2031440a8bd862099244d2ea407 100644
+index d4f0cb8d18a185e58892a42fb7151cf1065fc362..bb4c6b3790192c0e9f21859b6b3fd62a847787b7 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -72,6 +72,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
+@@ -73,6 +73,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
  import net.minecraft.resources.MinecraftKey;
  import net.minecraft.resources.ResourceKey;
  import net.minecraft.server.AdvancementDataPlayer;
@@ -580,7 +580,7 @@ index 2def7680367e4a20d7402b27bff7242afdc250e2..5d6865fd7b67c2031440a8bd86209924
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.network.ITextFilter;
  import net.minecraft.server.network.PlayerConnection;
-@@ -186,6 +187,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -187,6 +188,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      private int lastArmorScored = Integer.MIN_VALUE;
      private int lastExpLevelScored = Integer.MIN_VALUE;
      private int lastExpTotalScored = Integer.MIN_VALUE;
@@ -593,7 +593,7 @@ index 2def7680367e4a20d7402b27bff7242afdc250e2..5d6865fd7b67c2031440a8bd86209924
      private float lastHealthSent = -1.0E8F;
      private int lastFoodSent = -99999999;
      private boolean lastSentSaturationZero = true;
-@@ -273,6 +280,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -274,6 +281,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
      }
@@ -615,7 +615,7 @@ index 2def7680367e4a20d7402b27bff7242afdc250e2..5d6865fd7b67c2031440a8bd86209924
  
      // Yes, this doesn't match Vanilla, but it's the best we can do for now.
      // If this is an issue, PRs are welcome
-@@ -620,6 +642,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -621,6 +643,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              if (valid && !this.isSpectator() || this.world.isLoaded(this.getChunkCoordinates())) { // Paper - don't tick dead players that are not in the world currently (pending respawn)
                  super.tick();
              }
diff --git a/Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 97%
rename from Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch
index 35e5870d65..3a4024e267 100644
--- a/Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch
+++ b/Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch
@@ -11,7 +11,7 @@ This will drastically cut down on packet sending cost for worlds with
 lots of players in them.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 86e50a90e524bd8e77efd9e5641fa4e59560df11..abfe8b929ddc9dd397fa342f77186aebb982adb4 100644
+index 65e01b98c74d2fa9ff6d6db18f9f8c684b7bdac4..fa9fae3979caaaef16a21d7407bb05e796963d7c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1153,16 +1153,40 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0489-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0489-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0490-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0490-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0491-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0491-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0493-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0493-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0493-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0494-Optimize-Light-Engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0494-Optimize-Light-Engine.patch
diff --git a/Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0497-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0497-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/Spigot-Server-Patches/0499-Fix-sand-duping.patch b/Spigot-Server-Patches/0500-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0500-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch
index a40e7d641a..55b59f368a 100644
--- a/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index c42b981038fcca80de0ac293bef6a78697d3818f..8c8fca94487eb315def1afab43d3c709bfd2c55b 100644
+index d8be5ff9620da8d96a0d157fb99145d3b43299df..caabb6c831ba280ef6b74ba8aee94c9c3375f38b 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1324,6 +1324,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0502-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0502-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0503-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0503-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0504-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0504-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 25bf672274..950092d449 100644
--- a/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 8c8fca94487eb315def1afab43d3c709bfd2c55b..3839a82328bd8d6f8e395b833c9bac6cc8564016 100644
+index caabb6c831ba280ef6b74ba8aee94c9c3375f38b..2f61d5fcaff10d2e5514f60a8a6430aa3949a077 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -2758,9 +2758,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0506-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0506-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0507-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0507-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch
similarity index 100%
rename from Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch
diff --git a/Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 96%
rename from Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch
index 53647d4796..df29f83aa1 100644
--- a/Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8a1a7a465f007109f8e3b5359cac8ea9d9673049..6b9c73265a987be4da9b1657ff594cde1f3e6304 100644
+index da2b5bfd3966ded2d5dde0d65646583576a088c5..c50b89ee8f16821923933025bf19243771dd1604 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -66,6 +66,7 @@ import net.minecraft.world.INamableTileEntity;
diff --git a/Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0510-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0510-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/Spigot-Server-Patches/0511-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0512-Paper-dumpitem-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Paper-dumpitem-command.patch
rename to Spigot-Server-Patches/0512-Paper-dumpitem-command.patch
diff --git a/Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0513-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch
rename to Spigot-Server-Patches/0513-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch
similarity index 97%
rename from Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
rename to Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch
index 46233858c4..f63ad3aa32 100644
--- a/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
+++ b/Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch
@@ -7,7 +7,7 @@ Don't constantly send format: false for all formatting options when parent alrea
 has it false
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index 1582a799e456402453c43c2e0c6b8a194951a9dd..ede1cffb5de4f958ecf57b6c62a0d63896274746 100644
+index 666af6cc91bd12ba5d5a846d663a5aabf861fbc4..189a416bd033c9ff390d359aa19cec515d0461e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 @@ -46,6 +46,7 @@ public final class CraftChatMessage {
diff --git a/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0515-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch
rename to Spigot-Server-Patches/0515-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0516-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch
rename to Spigot-Server-Patches/0516-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0517-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch
rename to Spigot-Server-Patches/0517-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0518-Remove-some-streams-from-structures.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch
rename to Spigot-Server-Patches/0518-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0519-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch
rename to Spigot-Server-Patches/0519-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0520-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch
rename to Spigot-Server-Patches/0520-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to Spigot-Server-Patches/0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0521-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0522-Add-entity-liquid-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0521-Add-entity-liquid-API.patch
rename to Spigot-Server-Patches/0522-Add-entity-liquid-API.patch
diff --git a/Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch
similarity index 97%
rename from Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch
rename to Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch
index d173b27a54..0c77743434 100644
--- a/Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch
+++ b/Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 3d5a4d662ae4880fa27bd681127ddf7d1f70b51c..9f0aad908cf662aa7ba1e62c0639abf06d30568c 100644
+index 0468f80b7f52ee45fc9364470b23f80f7cd0cb57..158c7a30af8326fa419af391167c07d75b8611ac 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -27,6 +27,7 @@ import net.minecraft.core.IRegistry;
diff --git a/Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch
rename to Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch
index 2b1e7d5972..d3f4b9b844 100644
--- a/Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch
+++ b/Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index abfe8b929ddc9dd397fa342f77186aebb982adb4..b24e3a1a323feba8c82d0933f06bb8565112e6b6 100644
+index fa9fae3979caaaef16a21d7407bb05e796963d7c..b33e610fee244e4791f6a88e8699c999913cb2d3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -196,7 +196,18 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0525-Add-PrepareResultEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch
rename to Spigot-Server-Patches/0525-Add-PrepareResultEvent.patch
diff --git a/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0526-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-Server-Patches/0526-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to Spigot-Server-Patches/0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0528-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch
rename to Spigot-Server-Patches/0528-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0529-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch
rename to Spigot-Server-Patches/0529-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0530-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to Spigot-Server-Patches/0530-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0531-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch
rename to Spigot-Server-Patches/0531-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0532-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to Spigot-Server-Patches/0532-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch
similarity index 96%
rename from Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch
rename to Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch
index 35476db9fd..999f89b394 100644
--- a/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch
+++ b/Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 95f4d39f3c21933f440f8ee3e29fd8a533dfb4c1..e38e3b6f0efac9d7723706c2a03a1ce3e67a445f 100644
+index 316cb57870a6a3f568bb3d353540283b9d785976..bd6f3e9d321abcf039875dd5c9f7ccc59afd2dd2 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1660,15 +1660,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch
similarity index 99%
rename from Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch
rename to Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch
index 7a71a252e1..aa6470c90b 100644
--- a/Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch
+++ b/Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b24e3a1a323feba8c82d0933f06bb8565112e6b6..503ad38073fd8334d6692df97ea3fb68ded694d5 100644
+index b33e610fee244e4791f6a88e8699c999913cb2d3..1b78f53d09cc26fe881933df8aa1a7e77337acf1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -83,6 +83,7 @@ import net.minecraft.world.level.EnumGamemode;
diff --git a/Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to Spigot-Server-Patches/0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to Spigot-Server-Patches/0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0539-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch
rename to Spigot-Server-Patches/0539-Fix-some-rails-connecting-improperly.patch
diff --git a/Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to Spigot-Server-Patches/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/Spigot-Server-Patches/0540-Incremental-player-saving.patch b/Spigot-Server-Patches/0541-Incremental-player-saving.patch
similarity index 97%
rename from Spigot-Server-Patches/0540-Incremental-player-saving.patch
rename to Spigot-Server-Patches/0541-Incremental-player-saving.patch
index 4f08d55d98..1b623ff48d 100644
--- a/Spigot-Server-Patches/0540-Incremental-player-saving.patch
+++ b/Spigot-Server-Patches/0541-Incremental-player-saving.patch
@@ -47,10 +47,10 @@ index 3867e1d9a3d3648aaea46816643c0d8f070baf5d..ca284cd0419f5d99efa7e73c19fa1591
              // Paper start
              for (WorldServer world : getWorlds()) {
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 5d6865fd7b67c2031440a8bd862099244d2ea407..81fd2efd25d9f5ffdabd40fb29f356db053ceef9 100644
+index bb4c6b3790192c0e9f21859b6b3fd62a847787b7..c4f2c164927db4917f85a8bd65fdbf00e9b062a3 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -174,6 +174,7 @@ import org.bukkit.inventory.MainHand;
+@@ -175,6 +175,7 @@ import org.bukkit.inventory.MainHand;
  public class EntityPlayer extends EntityHuman implements ICrafting {
  
      private static final Logger LOGGER = LogManager.getLogger();
diff --git a/Spigot-Server-Patches/0541-Import-fastutil-classes.patch b/Spigot-Server-Patches/0542-Import-fastutil-classes.patch
similarity index 100%
rename from Spigot-Server-Patches/0541-Import-fastutil-classes.patch
rename to Spigot-Server-Patches/0542-Import-fastutil-classes.patch
diff --git a/Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0543-Don-t-mark-null-chunk-sections-for-block-updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch
rename to Spigot-Server-Patches/0543-Don-t-mark-null-chunk-sections-for-block-updates.patch
diff --git a/Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0544-Remove-armour-stand-double-add-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch
rename to Spigot-Server-Patches/0544-Remove-armour-stand-double-add-to-world.patch
diff --git a/Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0545-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch
rename to Spigot-Server-Patches/0545-Fix-MC-187716-Use-configured-height.patch
diff --git a/Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/Spigot-Server-Patches/0547-Brand-support.patch b/Spigot-Server-Patches/0548-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0547-Brand-support.patch
rename to Spigot-Server-Patches/0548-Brand-support.patch
diff --git a/Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
rename to Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
diff --git a/Spigot-Server-Patches/0549-Fix-MC-197271.patch b/Spigot-Server-Patches/0550-Fix-MC-197271.patch
similarity index 100%
rename from Spigot-Server-Patches/0549-Fix-MC-197271.patch
rename to Spigot-Server-Patches/0550-Fix-MC-197271.patch
diff --git a/Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch
similarity index 100%
rename from Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch
rename to Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch
diff --git a/Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch
rename to Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch
index 235bebe743..3d97a9da0a 100644
--- a/Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch
+++ b/Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7127e5f2cd8eb72220c959cb83711ad9b9c240c2..231a1cf2a4bad62f9d317138c96f5922c14f1762 100644
+index 939e3721af52069f1abad79d28c0555be3ac2d59..272a899c4d599a97201f1c11d829abe40101377d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -145,7 +145,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch
rename to Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch
diff --git a/Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/Spigot-Server-Patches/0555-Add-moon-phase-API.patch b/Spigot-Server-Patches/0556-Add-moon-phase-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0555-Add-moon-phase-API.patch
rename to Spigot-Server-Patches/0556-Add-moon-phase-API.patch
diff --git a/Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch
rename to Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch
diff --git a/Spigot-Server-Patches/0557-Add-BellRingEvent.patch b/Spigot-Server-Patches/0558-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0557-Add-BellRingEvent.patch
rename to Spigot-Server-Patches/0558-Add-BellRingEvent.patch
diff --git a/Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch
rename to Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch
diff --git a/Spigot-Server-Patches/0559-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0560-Buffer-joins-to-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0559-Buffer-joins-to-world.patch
rename to Spigot-Server-Patches/0560-Buffer-joins-to-world.patch
index eab3a0db62..c45f7273b3 100644
--- a/Spigot-Server-Patches/0559-Buffer-joins-to-world.patch
+++ b/Spigot-Server-Patches/0560-Buffer-joins-to-world.patch
@@ -22,7 +22,7 @@ index faa1b775e45563b93ac1d5b904938b1f5ad8d80c..545948f20efd6c8dd42140b565af94cd
 +    }
  }
 diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
-index 8e591f75b2c80fdb7e012574e9d7c348f1ffc90d..421a1556ef40f98320775b1793487680205d8c64 100644
+index ab70eeaeca222de7de7cab1b3db14b2c4761c3c3..878f879f8d410c428ad8a4c49e0c86c559bc47a9 100644
 --- a/src/main/java/net/minecraft/network/NetworkManager.java
 +++ b/src/main/java/net/minecraft/network/NetworkManager.java
 @@ -33,6 +33,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutTabComplete;
diff --git a/Spigot-Server-Patches/0560-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0560-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 98%
rename from Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch
rename to Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch
index 19dafc69d3..f390de071d 100644
--- a/Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 9f0aad908cf662aa7ba1e62c0639abf06d30568c..bcaef8702fb0fbcf4f737abb5a094bf74a56d3a3 100644
+index 158c7a30af8326fa419af391167c07d75b8611ac..fee862951f2767d4a3c5268dff157c185378a939 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -368,7 +368,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0563-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0564-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0563-Fix-CraftTeam-null-check.patch
rename to Spigot-Server-Patches/0564-Fix-CraftTeam-null-check.patch
diff --git a/Spigot-Server-Patches/0564-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0565-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0564-Add-more-Evoker-API.patch
rename to Spigot-Server-Patches/0565-Add-more-Evoker-API.patch
diff --git a/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-Server-Patches/0566-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0567-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0566-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-Server-Patches/0567-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/Spigot-Server-Patches/0567-Cache-block-data-strings.patch b/Spigot-Server-Patches/0568-Cache-block-data-strings.patch
similarity index 100%
rename from Spigot-Server-Patches/0567-Cache-block-data-strings.patch
rename to Spigot-Server-Patches/0568-Cache-block-data-strings.patch
diff --git a/Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/Spigot-Server-Patches/0569-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0570-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0569-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-Server-Patches/0570-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from Spigot-Server-Patches/0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to Spigot-Server-Patches/0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 94%
rename from Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 5431711460..e591ed4d6a 100644
--- a/Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0a853ffc658d8e82c21af7853bdaa9112a4e1e20..1b3371b087efa8c184f3c07fe560a709f76db4f7 100644
+index 344862c3f479ae7b6d4f929c9ef7882aba983ffb..e2301dbeb3d76684b2a0ab4262bb76cab3557789 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3473,4 +3473,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch
rename to Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/Spigot-Server-Patches/0575-Entity-isTicking.patch b/Spigot-Server-Patches/0576-Entity-isTicking.patch
similarity index 100%
rename from Spigot-Server-Patches/0575-Entity-isTicking.patch
rename to Spigot-Server-Patches/0576-Entity-isTicking.patch
diff --git a/Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/Spigot-Server-Patches/0577-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0578-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from Spigot-Server-Patches/0577-Fix-Not-a-string-Map-Conversion-spam.patch
rename to Spigot-Server-Patches/0578-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
index e67968426a..48e233764b 100644
--- a/Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CME on adding a passenger in CreatureSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 80f3e124ad6230789e27e8ddf20be08befb0a86f..04c2b1ed98efc47b0f5a46668f4aef1c6531e73e 100644
+index f1fa11217ab09133f4f19f5c73dfdab2f2b434e2..2a3025793db52a18e58f832c9da78c6c3b39d33c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3177,7 +3177,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/Spigot-Server-Patches/0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
similarity index 100%
rename from Spigot-Server-Patches/0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
rename to Spigot-Server-Patches/0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
diff --git a/Spigot-Server-Patches/0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to Spigot-Server-Patches/0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch
rename to Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/Spigot-Server-Patches/0582-Optimise-getType-calls.patch b/Spigot-Server-Patches/0583-Optimise-getType-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0582-Optimise-getType-calls.patch
rename to Spigot-Server-Patches/0583-Optimise-getType-calls.patch
diff --git a/Spigot-Server-Patches/0583-Villager-resetOffers.patch b/Spigot-Server-Patches/0584-Villager-resetOffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0583-Villager-resetOffers.patch
rename to Spigot-Server-Patches/0584-Villager-resetOffers.patch
diff --git a/Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch
rename to Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch
rename to Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch b/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch
rename to Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch
diff --git a/Spigot-Server-Patches/0588-Player-elytra-boost-API.patch b/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0588-Player-elytra-boost-API.patch
rename to Spigot-Server-Patches/0589-Player-elytra-boost-API.patch
diff --git a/Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch b/Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch
rename to Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch
diff --git a/Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch
rename to Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
diff --git a/Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch b/Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch
rename to Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch
diff --git a/Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch b/Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch
rename to Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch
diff --git a/Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch b/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch
similarity index 96%
rename from Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch
rename to Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch
index 8fe188d060..2cea3e0c94 100644
--- a/Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch
+++ b/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index cc89bc1880a8c095942ba4e34c1bf4202e8dbedc..10da42010d8f3a6a7863d3b594ece33a5b130aa7 100644
+index 8e760445885f6ab92f60db0ee2a02d098b5e5f03..7a8a1960882e291c46301d07da3e1c5415516893 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -97,6 +97,7 @@ public class AdvancementDataPlayer {
diff --git a/Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch b/Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch
rename to Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch
diff --git a/Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch b/Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch
rename to Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch
diff --git a/Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch b/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
similarity index 93%
rename from Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch
rename to Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
index 003a78ab42..44e79aa894 100644
--- a/Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch
+++ b/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
-index 421a1556ef40f98320775b1793487680205d8c64..75390f648f416e9588d93d64afb69c9f369c6fd3 100644
+index 878f879f8d410c428ad8a4c49e0c86c559bc47a9..f86f430598026a3a7e27fb8d40cfc5fe7b9b845d 100644
 --- a/src/main/java/net/minecraft/network/NetworkManager.java
 +++ b/src/main/java/net/minecraft/network/NetworkManager.java
 @@ -137,12 +137,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -25,10 +25,10 @@ index 421a1556ef40f98320775b1793487680205d8c64..75390f648f416e9588d93d64afb69c9f
                          NetworkManager.LOGGER.debug("Failed to sent packet", throwable);
                          this.sendPacket(new PacketPlayOutKickDisconnect(chatmessage), (future) -> {
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 81fd2efd25d9f5ffdabd40fb29f356db053ceef9..a8873609744b617a55098a818a9d3b7e679edd4a 100644
+index c4f2c164927db4917f85a8bd65fdbf00e9b062a3..b420e93590d0f109ad13b8ddaa5cd093da9e067d 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -259,6 +259,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -260,6 +260,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
  
      boolean needsChunkCenterUpdate; // Paper - no-tick view distance
@@ -49,7 +49,7 @@ index d44f3d1dea2a52c8a82fc1551663e125594432ea..9ec4316c8d517f8af9f36f586e833b5a
              this.networkManager.close(ichatbasecomponent);
          });
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 231a1cf2a4bad62f9d317138c96f5922c14f1762..c146e91c323504a96b800769d412c59d98e5ccf4 100644
+index 272a899c4d599a97201f1c11d829abe40101377d..61513e3c27cf95090e61f7085bb2f0435c774df9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -590,7 +590,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0598-Seed-based-feature-search.patch b/Spigot-Server-Patches/0599-Seed-based-feature-search.patch
similarity index 100%
rename from Spigot-Server-Patches/0598-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0599-Seed-based-feature-search.patch
diff --git a/Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch b/Spigot-Server-Patches/0600-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to Spigot-Server-Patches/0600-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/Spigot-Server-Patches/0600-Significantly-improve-performance-of-the-end-generat.patch b/Spigot-Server-Patches/0601-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from Spigot-Server-Patches/0600-Significantly-improve-performance-of-the-end-generat.patch
rename to Spigot-Server-Patches/0601-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch b/Spigot-Server-Patches/0602-Expose-world-spawn-angle.patch
similarity index 100%
rename from Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch
rename to Spigot-Server-Patches/0602-Expose-world-spawn-angle.patch
diff --git a/Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch b/Spigot-Server-Patches/0603-Add-Destroy-Speed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch
rename to Spigot-Server-Patches/0603-Add-Destroy-Speed-API.patch
diff --git a/Spigot-Server-Patches/0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/Spigot-Server-Patches/0604-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from Spigot-Server-Patches/0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to Spigot-Server-Patches/0604-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/Spigot-Server-Patches/0604-Add-LivingEntity-clearActiveItem.patch b/Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from Spigot-Server-Patches/0604-Add-LivingEntity-clearActiveItem.patch
rename to Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch
diff --git a/Spigot-Server-Patches/0605-Add-PlayerItemCooldownEvent.patch b/Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0605-Add-PlayerItemCooldownEvent.patch
rename to Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch
diff --git a/Spigot-Server-Patches/0606-More-lightning-API.patch b/Spigot-Server-Patches/0607-More-lightning-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0606-More-lightning-API.patch
rename to Spigot-Server-Patches/0607-More-lightning-API.patch
diff --git a/Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch b/Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch
rename to Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/Spigot-Server-Patches/0608-Added-missing-default-perms-for-commands.patch b/Spigot-Server-Patches/0609-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0608-Added-missing-default-perms-for-commands.patch
rename to Spigot-Server-Patches/0609-Added-missing-default-perms-for-commands.patch
diff --git a/Spigot-Server-Patches/0609-Add-PlayerShearBlockEvent.patch b/Spigot-Server-Patches/0610-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0609-Add-PlayerShearBlockEvent.patch
rename to Spigot-Server-Patches/0610-Add-PlayerShearBlockEvent.patch
diff --git a/Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch b/Spigot-Server-Patches/0611-Add-warning-for-servers-not-running-on-Java-11.patch
similarity index 100%
rename from Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch
rename to Spigot-Server-Patches/0611-Add-warning-for-servers-not-running-on-Java-11.patch
diff --git a/Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch b/Spigot-Server-Patches/0612-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to Spigot-Server-Patches/0612-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/Spigot-Server-Patches/0612-Fix-curing-zombie-villager-discount-exploit.patch b/Spigot-Server-Patches/0613-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0612-Fix-curing-zombie-villager-discount-exploit.patch
rename to Spigot-Server-Patches/0613-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch b/Spigot-Server-Patches/0614-Fix-curing-villager-makes-equipment-disappear.patch
similarity index 100%
rename from Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch
rename to Spigot-Server-Patches/0614-Fix-curing-villager-makes-equipment-disappear.patch
diff --git a/Spigot-Server-Patches/0614-Limit-recipe-packets.patch b/Spigot-Server-Patches/0615-Limit-recipe-packets.patch
similarity index 100%
rename from Spigot-Server-Patches/0614-Limit-recipe-packets.patch
rename to Spigot-Server-Patches/0615-Limit-recipe-packets.patch
diff --git a/Spigot-Server-Patches/0615-Fix-CraftSound-backwards-compatibility.patch b/Spigot-Server-Patches/0616-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from Spigot-Server-Patches/0615-Fix-CraftSound-backwards-compatibility.patch
rename to Spigot-Server-Patches/0616-Fix-CraftSound-backwards-compatibility.patch
diff --git a/Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch b/Spigot-Server-Patches/0617-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch
rename to Spigot-Server-Patches/0617-MC-4-Fix-item-position-desync.patch
diff --git a/Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch b/Spigot-Server-Patches/0618-Player-Chunk-Load-Unload-Events.patch
similarity index 89%
rename from Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch
rename to Spigot-Server-Patches/0618-Player-Chunk-Load-Unload-Events.patch
index 815a12afe7..c42cdab753 100644
--- a/Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch
+++ b/Spigot-Server-Patches/0618-Player-Chunk-Load-Unload-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index a8873609744b617a55098a818a9d3b7e679edd4a..ae78a491da09945b8e51dc5a0e70eadea66f6873 100644
+index b420e93590d0f109ad13b8ddaa5cd093da9e067d..9522a4a2060fc8b1bda53f72414810ac09915275 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -138,6 +138,8 @@ import net.minecraft.world.scores.ScoreboardScore;
+@@ -139,6 +139,8 @@ import net.minecraft.world.scores.ScoreboardScore;
  import net.minecraft.world.scores.ScoreboardTeam;
  import net.minecraft.world.scores.ScoreboardTeamBase;
  import net.minecraft.world.scores.criteria.IScoreboardCriteria;
@@ -17,7 +17,7 @@ index a8873609744b617a55098a818a9d3b7e679edd4a..ae78a491da09945b8e51dc5a0e70eade
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
-@@ -2087,11 +2089,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2088,11 +2090,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void a(ChunkCoordIntPair chunkcoordintpair, Packet<?> packet, Packet<?> packet1) {
          this.playerConnection.sendPacket(packet1);
          this.playerConnection.sendPacket(packet);
diff --git a/Spigot-Server-Patches/0618-Optimize-Dynamic-get-Missing-Keys.patch b/Spigot-Server-Patches/0619-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from Spigot-Server-Patches/0618-Optimize-Dynamic-get-Missing-Keys.patch
rename to Spigot-Server-Patches/0619-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch b/Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch
rename to Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch
diff --git a/Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/Spigot-Server-Patches/0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to Spigot-Server-Patches/0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/Spigot-Server-Patches/0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/Spigot-Server-Patches/0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from Spigot-Server-Patches/0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to Spigot-Server-Patches/0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch b/Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch
rename to Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch
diff --git a/Spigot-Server-Patches/0623-Implement-TargetHitEvent.patch b/Spigot-Server-Patches/0624-Implement-TargetHitEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0623-Implement-TargetHitEvent.patch
rename to Spigot-Server-Patches/0624-Implement-TargetHitEvent.patch
diff --git a/Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch b/Spigot-Server-Patches/0625-Additional-Block-Material-API-s.patch
similarity index 100%
rename from Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch
rename to Spigot-Server-Patches/0625-Additional-Block-Material-API-s.patch
diff --git a/Spigot-Server-Patches/0625-Fix-harming-potion-dupe.patch b/Spigot-Server-Patches/0626-Fix-harming-potion-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0625-Fix-harming-potion-dupe.patch
rename to Spigot-Server-Patches/0626-Fix-harming-potion-dupe.patch
diff --git a/Spigot-Server-Patches/0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/Spigot-Server-Patches/0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from Spigot-Server-Patches/0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to Spigot-Server-Patches/0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/Spigot-Server-Patches/0627-Optimized-tick-ready-check.patch b/Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0627-Optimized-tick-ready-check.patch
rename to Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch
diff --git a/Spigot-Server-Patches/0628-Cache-burn-durations.patch b/Spigot-Server-Patches/0629-Cache-burn-durations.patch
similarity index 100%
rename from Spigot-Server-Patches/0628-Cache-burn-durations.patch
rename to Spigot-Server-Patches/0629-Cache-burn-durations.patch
diff --git a/Spigot-Server-Patches/0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/Spigot-Server-Patches/0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from Spigot-Server-Patches/0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to Spigot-Server-Patches/0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch b/Spigot-Server-Patches/0631-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch
rename to Spigot-Server-Patches/0631-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch b/Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch
rename to Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch b/Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch
similarity index 100%
rename from Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch
rename to Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch
diff --git a/Spigot-Server-Patches/0633-Fix-nerfed-slime-when-splitting.patch b/Spigot-Server-Patches/0634-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from Spigot-Server-Patches/0633-Fix-nerfed-slime-when-splitting.patch
rename to Spigot-Server-Patches/0634-Fix-nerfed-slime-when-splitting.patch
diff --git a/Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch b/Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch
rename to Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch
diff --git a/Spigot-Server-Patches/0635-Guardian-beam-workaround.patch b/Spigot-Server-Patches/0636-Guardian-beam-workaround.patch
similarity index 100%
rename from Spigot-Server-Patches/0635-Guardian-beam-workaround.patch
rename to Spigot-Server-Patches/0636-Guardian-beam-workaround.patch
diff --git a/Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch b/Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch
rename to Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch
diff --git a/Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch b/Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch
rename to Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch
diff --git a/Spigot-Server-Patches/0638-Added-world-settings-for-mobs-picking-up-loot.patch b/Spigot-Server-Patches/0639-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from Spigot-Server-Patches/0638-Added-world-settings-for-mobs-picking-up-loot.patch
rename to Spigot-Server-Patches/0639-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/0640-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch
rename to Spigot-Server-Patches/0640-Implemented-BlockFailedDispenseEvent.patch
diff --git a/Spigot-Server-Patches/0640-Added-PlayerLecternPageChangeEvent.patch b/Spigot-Server-Patches/0641-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0640-Added-PlayerLecternPageChangeEvent.patch
rename to Spigot-Server-Patches/0641-Added-PlayerLecternPageChangeEvent.patch
diff --git a/Spigot-Server-Patches/0641-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0642-Fire-event-on-GS4-query.patch
similarity index 100%
rename from Spigot-Server-Patches/0641-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0642-Fire-event-on-GS4-query.patch
diff --git a/Spigot-Server-Patches/0642-Added-PlayerLoomPatternSelectEvent.patch b/Spigot-Server-Patches/0643-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0642-Added-PlayerLoomPatternSelectEvent.patch
rename to Spigot-Server-Patches/0643-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch
rename to Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch
diff --git a/Spigot-Server-Patches/0644-Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/0645-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from Spigot-Server-Patches/0644-Empty-commands-shall-not-be-dispatched.patch
rename to Spigot-Server-Patches/0645-Empty-commands-shall-not-be-dispatched.patch
diff --git a/Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch b/Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch
rename to Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/Spigot-Server-Patches/0646-Remove-stale-POIs.patch b/Spigot-Server-Patches/0647-Remove-stale-POIs.patch
similarity index 100%
rename from Spigot-Server-Patches/0646-Remove-stale-POIs.patch
rename to Spigot-Server-Patches/0647-Remove-stale-POIs.patch
diff --git a/Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch b/Spigot-Server-Patches/0648-Fix-villager-boat-exploit.patch
similarity index 94%
rename from Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch
rename to Spigot-Server-Patches/0648-Fix-villager-boat-exploit.patch
index 03d1ccda95..33fa1b3d4e 100644
--- a/Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch
+++ b/Spigot-Server-Patches/0648-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e4eeacd86824463944966199017e98c877858a75..0cd0b268af5ef7903ce46387540e289f62077e7c 100644
+index a7ca1dbebf30262d7c526f96b7a45482b1f898f4..0757cfcb96778258ba2593756e4ca9cbb16e2f87 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -77,6 +77,7 @@ import net.minecraft.util.MathHelper;
diff --git a/Spigot-Server-Patches/0648-Entity-load-save-limit-per-chunk.patch b/Spigot-Server-Patches/0649-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from Spigot-Server-Patches/0648-Entity-load-save-limit-per-chunk.patch
rename to Spigot-Server-Patches/0649-Entity-load-save-limit-per-chunk.patch
diff --git a/Spigot-Server-Patches/0649-Add-sendOpLevel-API.patch b/Spigot-Server-Patches/0650-Add-sendOpLevel-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0649-Add-sendOpLevel-API.patch
rename to Spigot-Server-Patches/0650-Add-sendOpLevel-API.patch
diff --git a/Spigot-Server-Patches/0650-Add-StructureLocateEvent.patch b/Spigot-Server-Patches/0651-Add-StructureLocateEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0650-Add-StructureLocateEvent.patch
rename to Spigot-Server-Patches/0651-Add-StructureLocateEvent.patch
diff --git a/Spigot-Server-Patches/0651-Collision-option-for-requiring-a-player-participant.patch b/Spigot-Server-Patches/0652-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from Spigot-Server-Patches/0651-Collision-option-for-requiring-a-player-participant.patch
rename to Spigot-Server-Patches/0652-Collision-option-for-requiring-a-player-participant.patch
diff --git a/Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch b/Spigot-Server-Patches/0653-Make-ProjectileHitEvent-Cancellable.patch
similarity index 100%
rename from Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch
rename to Spigot-Server-Patches/0653-Make-ProjectileHitEvent-Cancellable.patch
diff --git a/Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch b/Spigot-Server-Patches/0654-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to Spigot-Server-Patches/0654-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/Spigot-Server-Patches/0654-Make-schedule-command-per-world.patch b/Spigot-Server-Patches/0655-Make-schedule-command-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0654-Make-schedule-command-per-world.patch
rename to Spigot-Server-Patches/0655-Make-schedule-command-per-world.patch
diff --git a/Spigot-Server-Patches/0655-Configurable-max-leash-distance.patch b/Spigot-Server-Patches/0656-Configurable-max-leash-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0655-Configurable-max-leash-distance.patch
rename to Spigot-Server-Patches/0656-Configurable-max-leash-distance.patch
diff --git a/Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch b/Spigot-Server-Patches/0657-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch
rename to Spigot-Server-Patches/0657-Implement-BlockPreDispenseEvent.patch
diff --git a/Spigot-Server-Patches/0657-Added-Vanilla-Entity-Tags.patch b/Spigot-Server-Patches/0658-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from Spigot-Server-Patches/0657-Added-Vanilla-Entity-Tags.patch
rename to Spigot-Server-Patches/0658-Added-Vanilla-Entity-Tags.patch
diff --git a/Spigot-Server-Patches/0658-added-Wither-API.patch b/Spigot-Server-Patches/0659-added-Wither-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0658-added-Wither-API.patch
rename to Spigot-Server-Patches/0659-added-Wither-API.patch
diff --git a/Spigot-Server-Patches/0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/Spigot-Server-Patches/0660-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to Spigot-Server-Patches/0660-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/Spigot-Server-Patches/0660-Fix-console-spam-when-removing-chests-in-water.patch b/Spigot-Server-Patches/0661-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from Spigot-Server-Patches/0660-Fix-console-spam-when-removing-chests-in-water.patch
rename to Spigot-Server-Patches/0661-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/Spigot-Server-Patches/0661-Add-toggle-for-always-placing-the-dragon-egg.patch b/Spigot-Server-Patches/0662-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from Spigot-Server-Patches/0661-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to Spigot-Server-Patches/0662-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/Spigot-Server-Patches/0662-Added-PlayerStonecutterRecipeSelectEvent.patch b/Spigot-Server-Patches/0663-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0662-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to Spigot-Server-Patches/0663-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/Spigot-Server-Patches/0663-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/Spigot-Server-Patches/0664-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0663-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to Spigot-Server-Patches/0664-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch b/Spigot-Server-Patches/0665-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 92%
rename from Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch
rename to Spigot-Server-Patches/0665-Skip-distance-map-update-when-spawning-disabled.patch
index 7a7430bb0a..c14b0de977 100644
--- a/Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/Spigot-Server-Patches/0665-Skip-distance-map-update-when-spawning-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Skip distance map update when spawning disabled.
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index f7e684e550ac531a978113c6f5861fd912d3cfd1..15add2a57891b3e0d18392198f5b0ba139e53f4c 100644
+index f46f3ca87badefd668e70d792de5b3d3c0172a68..e542fe5fb63064e67c7fde8fad614826d6f3344c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -825,7 +825,7 @@ public class ChunkProviderServer extends IChunkProvider {
diff --git a/Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch b/Spigot-Server-Patches/0666-Reset-shield-blocking-on-dimension-change.patch
similarity index 83%
rename from Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch
rename to Spigot-Server-Patches/0666-Reset-shield-blocking-on-dimension-change.patch
index ae2ac213e0..5e114383e6 100644
--- a/Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch
+++ b/Spigot-Server-Patches/0666-Reset-shield-blocking-on-dimension-change.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index ae78a491da09945b8e51dc5a0e70eadea66f6873..1212084923780ab4fa0fb67afb4fe326159890e8 100644
+index 9522a4a2060fc8b1bda53f72414810ac09915275..37c9b5fd712e30a9a0faccc840f738f4b2cfc723 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1116,6 +1116,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1117,6 +1117,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  this.world.getServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
              }
diff --git a/Spigot-Server-Patches/0666-add-DragonEggFormEvent.patch b/Spigot-Server-Patches/0667-add-DragonEggFormEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0666-add-DragonEggFormEvent.patch
rename to Spigot-Server-Patches/0667-add-DragonEggFormEvent.patch
diff --git a/Spigot-Server-Patches/0667-EntityMoveEvent.patch b/Spigot-Server-Patches/0668-EntityMoveEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0667-EntityMoveEvent.patch
rename to Spigot-Server-Patches/0668-EntityMoveEvent.patch
diff --git a/Spigot-Server-Patches/0668-added-option-to-disable-pathfinding-updates-on-block.patch b/Spigot-Server-Patches/0669-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from Spigot-Server-Patches/0668-added-option-to-disable-pathfinding-updates-on-block.patch
rename to Spigot-Server-Patches/0669-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/Spigot-Server-Patches/0669-Inline-shift-direction-fields.patch b/Spigot-Server-Patches/0670-Inline-shift-direction-fields.patch
similarity index 100%
rename from Spigot-Server-Patches/0669-Inline-shift-direction-fields.patch
rename to Spigot-Server-Patches/0670-Inline-shift-direction-fields.patch
diff --git a/Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch b/Spigot-Server-Patches/0671-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch
rename to Spigot-Server-Patches/0671-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/Spigot-Server-Patches/0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/Spigot-Server-Patches/0672-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from Spigot-Server-Patches/0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to Spigot-Server-Patches/0672-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/Spigot-Server-Patches/0672-living-entity-allow-attribute-registration.patch b/Spigot-Server-Patches/0673-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from Spigot-Server-Patches/0672-living-entity-allow-attribute-registration.patch
rename to Spigot-Server-Patches/0673-living-entity-allow-attribute-registration.patch
diff --git a/Spigot-Server-Patches/0673-fix-dead-slime-setSize-invincibility.patch b/Spigot-Server-Patches/0674-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from Spigot-Server-Patches/0673-fix-dead-slime-setSize-invincibility.patch
rename to Spigot-Server-Patches/0674-fix-dead-slime-setSize-invincibility.patch
diff --git a/Spigot-Server-Patches/0674-Merchant-getRecipes-should-return-an-immutable-list.patch b/Spigot-Server-Patches/0675-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from Spigot-Server-Patches/0674-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to Spigot-Server-Patches/0675-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/Spigot-Server-Patches/0675-misc-debugging-dumps.patch b/Spigot-Server-Patches/0676-misc-debugging-dumps.patch
similarity index 100%
rename from Spigot-Server-Patches/0675-misc-debugging-dumps.patch
rename to Spigot-Server-Patches/0676-misc-debugging-dumps.patch
diff --git a/Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch b/Spigot-Server-Patches/0677-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch
rename to Spigot-Server-Patches/0677-Add-support-for-hex-color-codes-in-console.patch
diff --git a/Spigot-Server-Patches/0677-Clear-SyncLoadInfo.patch b/Spigot-Server-Patches/0678-Clear-SyncLoadInfo.patch
similarity index 100%
rename from Spigot-Server-Patches/0677-Clear-SyncLoadInfo.patch
rename to Spigot-Server-Patches/0678-Clear-SyncLoadInfo.patch
diff --git a/Spigot-Server-Patches/0678-Expose-Tracked-Players.patch b/Spigot-Server-Patches/0679-Expose-Tracked-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0678-Expose-Tracked-Players.patch
rename to Spigot-Server-Patches/0679-Expose-Tracked-Players.patch
diff --git a/Spigot-Server-Patches/0679-Remove-streams-from-SensorNearest.patch b/Spigot-Server-Patches/0680-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from Spigot-Server-Patches/0679-Remove-streams-from-SensorNearest.patch
rename to Spigot-Server-Patches/0680-Remove-streams-from-SensorNearest.patch
diff --git a/Spigot-Server-Patches/0680-do-not-create-unnecessary-copies-of-passenger-list.patch b/Spigot-Server-Patches/0681-do-not-create-unnecessary-copies-of-passenger-list.patch
similarity index 100%
rename from Spigot-Server-Patches/0680-do-not-create-unnecessary-copies-of-passenger-list.patch
rename to Spigot-Server-Patches/0681-do-not-create-unnecessary-copies-of-passenger-list.patch
diff --git a/Spigot-Server-Patches/0681-MC-29274-Fix-Wither-hostility-towards-players.patch b/Spigot-Server-Patches/0682-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0681-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to Spigot-Server-Patches/0682-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/Spigot-Server-Patches/0682-Throw-proper-exception-on-empty-JsonList-file.patch b/Spigot-Server-Patches/0683-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from Spigot-Server-Patches/0682-Throw-proper-exception-on-empty-JsonList-file.patch
rename to Spigot-Server-Patches/0683-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/Spigot-Server-Patches/0683-Improve-ServerGUI.patch b/Spigot-Server-Patches/0684-Improve-ServerGUI.patch
similarity index 100%
rename from Spigot-Server-Patches/0683-Improve-ServerGUI.patch
rename to Spigot-Server-Patches/0684-Improve-ServerGUI.patch
diff --git a/Spigot-Server-Patches/0684-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/Spigot-Server-Patches/0685-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0684-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to Spigot-Server-Patches/0685-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/Spigot-Server-Patches/0685-fix-converting-txt-to-json-file.patch b/Spigot-Server-Patches/0686-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from Spigot-Server-Patches/0685-fix-converting-txt-to-json-file.patch
rename to Spigot-Server-Patches/0686-fix-converting-txt-to-json-file.patch
diff --git a/Spigot-Server-Patches/0686-Add-worldborder-events.patch b/Spigot-Server-Patches/0687-Add-worldborder-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0686-Add-worldborder-events.patch
rename to Spigot-Server-Patches/0687-Add-worldborder-events.patch
diff --git a/Spigot-Server-Patches/0687-added-PlayerNameEntityEvent.patch b/Spigot-Server-Patches/0688-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0687-added-PlayerNameEntityEvent.patch
rename to Spigot-Server-Patches/0688-added-PlayerNameEntityEvent.patch
diff --git a/Spigot-Server-Patches/0688-Prevent-grindstones-from-overstacking-items.patch b/Spigot-Server-Patches/0689-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0688-Prevent-grindstones-from-overstacking-items.patch
rename to Spigot-Server-Patches/0689-Prevent-grindstones-from-overstacking-items.patch
diff --git a/Spigot-Server-Patches/0689-Add-recipe-to-cook-events.patch b/Spigot-Server-Patches/0690-Add-recipe-to-cook-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0689-Add-recipe-to-cook-events.patch
rename to Spigot-Server-Patches/0690-Add-recipe-to-cook-events.patch
diff --git a/Spigot-Server-Patches/0690-Add-Block-isValidTool.patch b/Spigot-Server-Patches/0691-Add-Block-isValidTool.patch
similarity index 100%
rename from Spigot-Server-Patches/0690-Add-Block-isValidTool.patch
rename to Spigot-Server-Patches/0691-Add-Block-isValidTool.patch
diff --git a/Spigot-Server-Patches/0691-Allow-using-signs-inside-spawn-protection.patch b/Spigot-Server-Patches/0692-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from Spigot-Server-Patches/0691-Allow-using-signs-inside-spawn-protection.patch
rename to Spigot-Server-Patches/0692-Allow-using-signs-inside-spawn-protection.patch
diff --git a/Spigot-Server-Patches/0692-Implement-Keyed-on-World.patch b/Spigot-Server-Patches/0693-Implement-Keyed-on-World.patch
similarity index 100%
rename from Spigot-Server-Patches/0692-Implement-Keyed-on-World.patch
rename to Spigot-Server-Patches/0693-Implement-Keyed-on-World.patch
diff --git a/Spigot-Server-Patches/0693-Add-fast-alternative-constructor-for-Vector3f.patch b/Spigot-Server-Patches/0694-Add-fast-alternative-constructor-for-Vector3f.patch
similarity index 100%
rename from Spigot-Server-Patches/0693-Add-fast-alternative-constructor-for-Vector3f.patch
rename to Spigot-Server-Patches/0694-Add-fast-alternative-constructor-for-Vector3f.patch
diff --git a/Spigot-Server-Patches/0694-Item-Rarity-API.patch b/Spigot-Server-Patches/0695-Item-Rarity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0694-Item-Rarity-API.patch
rename to Spigot-Server-Patches/0695-Item-Rarity-API.patch
diff --git a/Spigot-Server-Patches/0696-fixup-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0696-fixup-Improved-Watchdog-Support.patch
deleted file mode 100644
index 627cef7104..0000000000
--- a/Spigot-Server-Patches/0696-fixup-Improved-Watchdog-Support.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Tue, 16 Mar 2021 16:56:35 +0100
-Subject: [PATCH] fixup! Improved Watchdog Support
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 22bde395939f97086e411cef190bb2b1e7ede79a..8a1ff1000f82a590b293e8892a34484df068093c 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -316,9 +316,9 @@ public class Main {
-             tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent");
-             tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent");
-             // Minecraft, seen during saving
--            tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener$Void");
--            tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener");
--            tryPreloadClass("net.minecraft.server.ExceptionSuppressor");
-+            tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener$Void");
-+            tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener");
-+            tryPreloadClass("net.minecraft.util.ExceptionSuppressor");
-             // Paper end
-         }
-     }
diff --git a/Spigot-Server-Patches/0697-fixup-POM-Changes.patch b/Spigot-Server-Patches/0697-fixup-POM-Changes.patch
deleted file mode 100644
index 8e4dae2b55..0000000000
--- a/Spigot-Server-Patches/0697-fixup-POM-Changes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Tue, 16 Mar 2021 17:06:29 +0100
-Subject: [PATCH] fixup! POM Changes
-
-
-diff --git a/pom.xml b/pom.xml
-index 806832714739d3ae264ba7c3d2ca64a5e73f8b7f..70c0fb4621b16c33d7cdf7d920c17bfe1ff8d831 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -41,7 +41,7 @@
-         <dependency>
-             <groupId>io.papermc</groupId>
-             <artifactId>minecraft-server</artifactId>
--            <version>${minecraft.version}-SNAPSHOT</version>
-+            <version>${minecraft.version}-R0.2-SNAPSHOT</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>