From 74f507f4e3b1b1b7c580d0e92532073283c7f1ef Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Wed, 14 Oct 2020 16:00:43 +0200
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
e461dcfe #555: Item - add getters/setters for owner/thrower

CraftBukkit Changes:
055870c4 #758: Item - add getters/setters for owner/thrower
---
 .../0051-Item-canEntityPickup.patch           |  8 +--
 ...=> 0159-Add-spectator-target-events.patch} |  0
 ...s-and-setters-for-EntityItem-owner-a.patch | 59 -------------------
 ...PI.patch => 0160-Add-more-Witch-API.patch} |  0
 ...ult-permission-message-configurable.patch} |  0
 ...ion-supression-of-EntityDismount-Ve.patch} |  0
 ...I.patch => 0163-Add-more-Zombie-API.patch} |  0
 ...served-channel-check-to-be-sensible.patch} |  0
 ...0165-Add-PlayerConnectionCloseEvent.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 ...ent.patch => 0167-BlockDestroyEvent.patch} |  0
 ...ItemStack-Recipe-API-helper-methods.patch} |  0
 ...ch => 0169-Add-WhitelistToggleEvent.patch} |  0
 ...tch => 0170-Annotation-Test-changes.patch} |  0
 ...=> 0171-Entity-getEntitySpawnReason.patch} |  0
 ...t.patch => 0172-Add-GS4-Query-event.patch} |  0
 ... => 0173-Add-PlayerPostRespawnEvent.patch} |  0
 ...ivate-methods-for-nullability-annot.patch} |  0
 ...ip-some-Spigot-API-null-annotations.patch} |  0
 ...ts.patch => 0176-Server-Tick-Events.patch} |  0
 ...177-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...API.patch => 0178-Add-Heightmap-API.patch} |  0
 ...> 0179-Mob-Spawner-API-Enhancements.patch} |  0
 ... 0180-Add-BlockSoundGroup-interface.patch} |  0
 ...actAtEntityEvent-javadoc-for-ArmorS.patch} |  0
 ...tch => 0182-Make-PlayerEvent-public.patch} |  0
 ...custom-payload-channel-message-size.patch} |  0
 ...84-Expose-the-internal-current-tick.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...tch => 0187-Add-ThrownEggHatchEvent.patch} |  0
 ...p-API.patch => 0188-Entity-Jump-API.patch} |  0
 ...89-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...PI.patch => 0190-Add-tick-times-API.patch} |  0
 ...91-Expose-MinecraftServer-isRunning.patch} |  0
 ...ts-firing-Async-errors-during-shutd.patch} |  0
 ...3-Make-JavaPluginLoader-thread-safe.patch} |  0
 ... 0194-Add-Player-Client-Options-API.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...Stack-swapping-the-extended-and-upg.patch} |  0
 ...patch => 0197-Villager-Restocks-API.patch} |  0
 ...n.patch => 0198-Expose-game-version.patch} |  0
 ...9-Add-item-slot-convenience-methods.patch} |  0
 ...-API.patch => 0200-Add-Mob-Goal-API.patch} |  0
 ...tch => 0201-World-view-distance-api.patch} |  0
 ...=> 0202-Add-villager-reputation-API.patch} |  0
 ...-API.patch => 0203-Spawn-Reason-API.patch} |  0
 ...API.patch => 0204-Potential-bed-API.patch} |  0
 ...ioritise-own-classes-where-possible.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...a-useful-PluginClassLoader-toString.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0209-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...0211-Support-components-in-ItemMeta.patch} |  0
 ...TargetReasons-for-1.16-mob-behavior.patch} |  0
 ...patch => 0213-Add-entity-liquid-API.patch} |  0
 ...eResultEvent-PrepareGrindstoneEvent.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...Support-hex-colors-in-getLastColors.patch} |  0
 ...patch => 0217-Add-setMaxPlayers-API.patch} |  0
 ...PI.patch => 0218-Add-moon-phase-API.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...ent.patch => 0220-Add-BellRingEvent.patch} |  0
 ...support.patch => 0221-Brand-support.patch} |  0
 ...I.patch => 0222-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...king.patch => 0227-Entity-isTicking.patch} |  0
 ...ecessary-space-for-provided-plugins.patch} |  0
 ...ocs-for-Entity.getEntitySpawnReason.patch} |  0
 .../0148-Item-canEntityPickup.patch           |  8 +--
 ...s-and-setters-for-EntityItem-owner-a.patch | 52 ----------------
 ...ts.patch => 0342-Server-Tick-Events.patch} |  0
 ...343-PlayerDeathEvent-getItemsToKeep.patch} |  2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0345-Add-Heightmap-API.patch} |  0
 ...> 0346-Mob-Spawner-API-Enhancements.patch} |  0
 ...ayer-View-Distance-API-placeholders.patch} |  2 +-
 ...-to-changed-postToMainThread-method.patch} |  0
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...-entity-loss-due-to-unloaded-chunks.patch} |  0
 ... 0352-Duplicate-UUID-Resolve-Option.patch} |  0
 ...53-improve-CraftWorld-isChunkLoaded.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  0
 ...ityAreaEffectCloud-from-going-negat.patch} |  0
 ....patch => 0356-ChunkMapDistance-CME.patch} |  0
 ...0357-Implement-CraftBlockSoundGroup.patch} |  0
 ...d.patch => 0358-Chunk-debug-command.patch} |  0
 ...ptions-from-dispenser-entity-spawns.patch} |  0
 ...60-Fix-World-isChunkGenerated-calls.patch} |  0
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...aletteBlock-instead-of-ReentrantLoc.patch} |  0
 ...ch => 0363-incremental-chunk-saving.patch} |  0
 ...5-Anti-Xray.patch => 0364-Anti-Xray.patch} |  0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  0
 ...urable-projectile-relative-velocity.patch} |  0
 ...being-ticked-when-notifying-navigat.patch} |  0
 ...h => 0368-offset-item-frame-ticking.patch} |  0
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...0-Asynchronous-chunk-IO-and-loading.patch} |  2 +-
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...ads.patch => 0372-Reduce-sync-loads.patch} |  0
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...f-we-have-a-custom-Bukkit-generator.patch} |  0
 ...-158900.patch => 0375-Fix-MC-158900.patch} |  0
 ...ment-optional-per-player-mob-spawns.patch} |  2 +-
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ... => 0378-Fix-nether-portal-creation.patch} |  0
 ...gs.patch => 0379-Generator-Settings.patch} |  0
 ...-161754.patch => 0380-Fix-MC-161754.patch} |  0
 ...e-improvement-for-Chunk.getEntities.patch} |  0
 ...anging-entities-that-are-not-ItemFr.patch} |  0
 ...83-Expose-the-internal-current-tick.patch} |  0
 ...sneak-when-changing-worlds-MC-10657.patch} |  0
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...r-when-player-hand-set-to-empty-typ.patch} |  0
 ...=> 0387-PlayerLaunchProjectileEvent.patch} |  0
 ...tMagicNumbers.isSupportedApiVersion.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ...pers.patch => 0391-Optimize-Hoppers.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  2 +-
 ...ading-chunks-checking-hive-position.patch} |  0
 ...hunks-from-Hoppers-and-other-things.patch} |  0
 ...ializing-mismatching-chunk-coordina.patch} |  0
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  0
 ...397-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0398-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0402-Tracking-Range-Improvements.patch} |  0
 ...=> 0403-Entity-Activation-Range-2.0.patch} |  0
 ...-items-vanishing-through-end-portal.patch} |  0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  0
 ...w-overriding-the-java-version-check.patch} |  0
 ...tch => 0408-Add-ThrownEggHatchEvent.patch} |  0
 ... 0409-Optimise-random-block-ticking.patch} |  0
 ...p-API.patch => 0410-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0412-Make-the-GUI-graph-fancier.patch} |  0
 ...13-add-hand-to-BlockMultiPlaceEvent.patch} |  2 +-
 ...4-Prevent-teleporting-dead-entities.patch} |  0
 ...ipwire-hook-placement-before-update.patch} |  0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  0
 ...chance-of-villager-zombie-infection.patch} |  0
 ...tch => 0418-Optimise-Chunk-getFluid.patch} |  0
 ...mise-TickListServer-by-rewriting-it.patch} |  2 +-
 ...pawn-settings-and-per-player-option.patch} |  2 +-
 ...e-Entity-is-never-double-registered.patch} |  0
 ...ring-entities-from-unloading-chunks.patch} |  0
 ...nections-shouldn-t-hold-up-shutdown.patch} |  0
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} |  0
 ...timize-Collision-to-not-load-chunks.patch} |  0
 ...tch => 0427-Don-t-tick-dead-players.patch} |  2 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  0
 ...unkMap-memory-use-for-visibleChunks.patch} |  0
 ...h => 0430-Increase-Light-Queue-Size.patch} |  0
 ...sks-Speed-up-processing-of-chunk-lo.patch} |  2 +-
 ...ove-existing-players-to-world-spawn.patch} |  4 +-
 ...Add-tick-times-API-and-mspt-command.patch} |  2 +-
 ...34-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...6-Remove-streams-from-Mob-AI-System.patch} |  0
 ...ons-until-after-entity-ticking-is-d.patch} |  0
 ... => 0438-Async-command-map-building.patch} |  0
 ...h => 0439-Improved-Watchdog-Support.patch} |  0
 ....patch => 0440-Optimize-Pathfinding.patch} |  0
 ...1-Reduce-Either-Optional-allocation.patch} |  0
 ...442-Remove-streams-from-PairedQueue.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  2 +-
 ...45-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...viderServer-s-chunk-level-checking-.patch} |  0
 ...teleport-command-to-valid-locations.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  4 +-
 ...Chunk-Post-Processing-deadlock-risk.patch} |  0
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...2-Broadcast-join-message-to-console.patch} |  2 +-
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  4 +-
 ...oad-Chunks-for-Login-Asynchronously.patch} |  0
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...llbacks-to-schedule-for-Callback-Ex.patch} |  0
 ...-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} |  0
 ...n.patch => 0464-Expose-game-version.patch} |  0
 ...> 0465-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ...atch => 0467-Implement-Mob-Goal-API.patch} |  0
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...isOutsideRange-to-use-distance-maps.patch} |  2 +-
 ...e-operations-for-updating-light-dat.patch} |  0
 ...o-Tick-view-distance-implementation.patch} |  0
 ...=> 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
 ...ock-unless-actually-showing-the-mes.patch} |  0
 ...API.patch => 0477-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} |  2 +-
 ...e-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  0
 ...> 0484-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  2 +-
 ...und-for-Client-Lag-Spikes-MC-162253.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} |  0
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |  0
 ...packets-to-nearby-locations-sounds-.patch} |  0
 ...prove-Chunk-Status-Transition-Speed.patch} |  4 +-
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0492-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...patch => 0495-Optimize-Light-Engine.patch} |  2 +-
 ...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} |  2 +-
 ...uping.patch => 0501-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  0
 ...ch => 0503-Fix-enderdragon-exp-dupe.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0505-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...it-lightning-strike-effect-distance.patch} |  0
 ...9-Add-permission-for-command-blocks.patch} |  0
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...orldBorder-collision-checks-and-air.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  0
 ...atch => 0513-Paper-dumpitem-command.patch} |  0
 ...14-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...516-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
 ...0521-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0523-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  2 +-
 ...atch => 0526-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} |  0
 ...-5989.patch => 0535-Fix-SPIGOT-5989.patch} |  0
 ...-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 => 0542-Incremental-player-saving.patch} |  2 +-
 ...tch => 0543-Import-fastutil-classes.patch} |  0
 ...ll-chunk-sections-for-block-updates.patch} |  2 +-
 ...ve-armour-stand-double-add-to-world.patch} |  0
 ...Fix-MC-187716-Use-configured-height.patch} |  0
 ...urn-for-WorldServer-addAllEntitiesS.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0550-Brand-support.patch} |  2 +-
 ...er-Boss-Bar-doesn-t-update-until-in.patch} |  0
 ...-197271.patch => 0552-Fix-MC-197271.patch} |  0
 ...0553-MC-197883-Bandaid-decode-issue.patch} |  0
 ...patch => 0554-Add-setMaxPlayers-API.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0556-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0558-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  2 +-
 ...support.patch => 0560-Brand-support.patch} |  2 +-
 ...ent.patch => 0561-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0563-Buffer-joins-to-world.patch} |  2 +-
 ...=> 0564-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0567-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0568-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0571-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  0
 ...tureManager-to-prevent-worldgen-dea.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} |  2 +-
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  2 +-
 ...king.patch => 0580-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} |  0
 ...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 => 0587-Optimise-getType-calls.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 326 files changed, 47 insertions(+), 158 deletions(-)
 rename Spigot-API-Patches/{0160-Add-spectator-target-events.patch => 0159-Add-spectator-target-events.patch} (100%)
 delete mode 100644 Spigot-API-Patches/0159-Implement-getters-and-setters-for-EntityItem-owner-a.patch
 rename Spigot-API-Patches/{0161-Add-more-Witch-API.patch => 0160-Add-more-Witch-API.patch} (100%)
 rename Spigot-API-Patches/{0162-Make-the-default-permission-message-configurable.patch => 0161-Make-the-default-permission-message-configurable.patch} (100%)
 rename Spigot-API-Patches/{0163-Support-cancellation-supression-of-EntityDismount-Ve.patch => 0162-Support-cancellation-supression-of-EntityDismount-Ve.patch} (100%)
 rename Spigot-API-Patches/{0164-Add-more-Zombie-API.patch => 0163-Add-more-Zombie-API.patch} (100%)
 rename Spigot-API-Patches/{0165-Change-the-reserved-channel-check-to-be-sensible.patch => 0164-Change-the-reserved-channel-check-to-be-sensible.patch} (100%)
 rename Spigot-API-Patches/{0166-Add-PlayerConnectionCloseEvent.patch => 0165-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename Spigot-API-Patches/{0167-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename Spigot-API-Patches/{0168-BlockDestroyEvent.patch => 0167-BlockDestroyEvent.patch} (100%)
 rename Spigot-API-Patches/{0169-Add-ItemStack-Recipe-API-helper-methods.patch => 0168-Add-ItemStack-Recipe-API-helper-methods.patch} (100%)
 rename Spigot-API-Patches/{0170-Add-WhitelistToggleEvent.patch => 0169-Add-WhitelistToggleEvent.patch} (100%)
 rename Spigot-API-Patches/{0171-Annotation-Test-changes.patch => 0170-Annotation-Test-changes.patch} (100%)
 rename Spigot-API-Patches/{0172-Entity-getEntitySpawnReason.patch => 0171-Entity-getEntitySpawnReason.patch} (100%)
 rename Spigot-API-Patches/{0173-Add-GS4-Query-event.patch => 0172-Add-GS4-Query-event.patch} (100%)
 rename Spigot-API-Patches/{0174-Add-PlayerPostRespawnEvent.patch => 0173-Add-PlayerPostRespawnEvent.patch} (100%)
 rename Spigot-API-Patches/{0175-Ignore-package-private-methods-for-nullability-annot.patch => 0174-Ignore-package-private-methods-for-nullability-annot.patch} (100%)
 rename Spigot-API-Patches/{0176-Flip-some-Spigot-API-null-annotations.patch => 0175-Flip-some-Spigot-API-null-annotations.patch} (100%)
 rename Spigot-API-Patches/{0177-Server-Tick-Events.patch => 0176-Server-Tick-Events.patch} (100%)
 rename Spigot-API-Patches/{0178-PlayerDeathEvent-getItemsToKeep.patch => 0177-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename Spigot-API-Patches/{0179-Add-Heightmap-API.patch => 0178-Add-Heightmap-API.patch} (100%)
 rename Spigot-API-Patches/{0180-Mob-Spawner-API-Enhancements.patch => 0179-Mob-Spawner-API-Enhancements.patch} (100%)
 rename Spigot-API-Patches/{0181-Add-BlockSoundGroup-interface.patch => 0180-Add-BlockSoundGroup-interface.patch} (100%)
 rename Spigot-API-Patches/{0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch => 0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch} (100%)
 rename Spigot-API-Patches/{0183-Make-PlayerEvent-public.patch => 0182-Make-PlayerEvent-public.patch} (100%)
 rename Spigot-API-Patches/{0184-Increase-custom-payload-channel-message-size.patch => 0183-Increase-custom-payload-channel-message-size.patch} (100%)
 rename Spigot-API-Patches/{0185-Expose-the-internal-current-tick.patch => 0184-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-API-Patches/{0186-PlayerDeathEvent-shouldDropExperience.patch => 0185-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename Spigot-API-Patches/{0187-Add-effect-to-block-break-naturally.patch => 0186-Add-effect-to-block-break-naturally.patch} (100%)
 rename Spigot-API-Patches/{0188-Add-ThrownEggHatchEvent.patch => 0187-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-API-Patches/{0189-Entity-Jump-API.patch => 0188-Entity-Jump-API.patch} (100%)
 rename Spigot-API-Patches/{0190-add-hand-to-BlockMultiPlaceEvent.patch => 0189-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename Spigot-API-Patches/{0191-Add-tick-times-API.patch => 0190-Add-tick-times-API.patch} (100%)
 rename Spigot-API-Patches/{0192-Expose-MinecraftServer-isRunning.patch => 0191-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-API-Patches/{0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch => 0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch} (100%)
 rename Spigot-API-Patches/{0194-Make-JavaPluginLoader-thread-safe.patch => 0193-Make-JavaPluginLoader-thread-safe.patch} (100%)
 rename Spigot-API-Patches/{0195-Add-Player-Client-Options-API.patch => 0194-Add-Player-Client-Options-API.patch} (100%)
 rename Spigot-API-Patches/{0196-Add-PlayerAttackEntityCooldownResetEvent.patch => 0195-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-API-Patches/{0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch => 0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch} (100%)
 rename Spigot-API-Patches/{0198-Villager-Restocks-API.patch => 0197-Villager-Restocks-API.patch} (100%)
 rename Spigot-API-Patches/{0199-Expose-game-version.patch => 0198-Expose-game-version.patch} (100%)
 rename Spigot-API-Patches/{0200-Add-item-slot-convenience-methods.patch => 0199-Add-item-slot-convenience-methods.patch} (100%)
 rename Spigot-API-Patches/{0201-Add-Mob-Goal-API.patch => 0200-Add-Mob-Goal-API.patch} (100%)
 rename Spigot-API-Patches/{0202-World-view-distance-api.patch => 0201-World-view-distance-api.patch} (100%)
 rename Spigot-API-Patches/{0203-Add-villager-reputation-API.patch => 0202-Add-villager-reputation-API.patch} (100%)
 rename Spigot-API-Patches/{0204-Spawn-Reason-API.patch => 0203-Spawn-Reason-API.patch} (100%)
 rename Spigot-API-Patches/{0205-Potential-bed-API.patch => 0204-Potential-bed-API.patch} (100%)
 rename Spigot-API-Patches/{0206-Prioritise-own-classes-where-possible.patch => 0205-Prioritise-own-classes-where-possible.patch} (100%)
 rename Spigot-API-Patches/{0207-Add-Raw-Byte-ItemStack-Serialization.patch => 0206-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename Spigot-API-Patches/{0208-Provide-a-useful-PluginClassLoader-toString.patch => 0207-Provide-a-useful-PluginClassLoader-toString.patch} (100%)
 rename Spigot-API-Patches/{0209-Inventory-getHolder-method-without-block-snapshot.patch => 0208-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename Spigot-API-Patches/{0210-Expose-Arrow-getItemStack.patch => 0209-Expose-Arrow-getItemStack.patch} (100%)
 rename Spigot-API-Patches/{0211-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0210-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename Spigot-API-Patches/{0212-Support-components-in-ItemMeta.patch => 0211-Support-components-in-ItemMeta.patch} (100%)
 rename Spigot-API-Patches/{0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch => 0212-added-2-new-TargetReasons-for-1.16-mob-behavior.patch} (100%)
 rename Spigot-API-Patches/{0214-Add-entity-liquid-API.patch => 0213-Add-entity-liquid-API.patch} (100%)
 rename Spigot-API-Patches/{0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch => 0214-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch} (100%)
 rename Spigot-API-Patches/{0216-Allow-delegation-to-vanilla-chunk-gen.patch => 0215-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename Spigot-API-Patches/{0217-Support-hex-colors-in-getLastColors.patch => 0216-Support-hex-colors-in-getLastColors.patch} (100%)
 rename Spigot-API-Patches/{0218-Add-setMaxPlayers-API.patch => 0217-Add-setMaxPlayers-API.patch} (100%)
 rename Spigot-API-Patches/{0219-Add-moon-phase-API.patch => 0218-Add-moon-phase-API.patch} (100%)
 rename Spigot-API-Patches/{0220-Add-playPickupItemAnimation-to-LivingEntity.patch => 0219-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename Spigot-API-Patches/{0221-Add-BellRingEvent.patch => 0220-Add-BellRingEvent.patch} (100%)
 rename Spigot-API-Patches/{0222-Brand-support.patch => 0221-Brand-support.patch} (100%)
 rename Spigot-API-Patches/{0223-Add-more-Evoker-API.patch => 0222-Add-more-Evoker-API.patch} (100%)
 rename Spigot-API-Patches/{0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename Spigot-API-Patches/{0225-Create-HoverEvent-from-ItemStack-Entity.patch => 0224-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename Spigot-API-Patches/{0226-Add-additional-open-container-api-to-HumanEntity.patch => 0225-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename Spigot-API-Patches/{0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0226-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename Spigot-API-Patches/{0228-Entity-isTicking.patch => 0227-Entity-isTicking.patch} (100%)
 rename Spigot-API-Patches/{0229-Remove-unnecessary-space-for-provided-plugins.patch => 0228-Remove-unnecessary-space-for-provided-plugins.patch} (100%)
 rename Spigot-API-Patches/{0230-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch => 0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch} (100%)
 delete mode 100644 Spigot-Server-Patches/0342-Implement-getters-and-setters-for-EntityItem-owner-a.patch
 rename Spigot-Server-Patches/{0343-Server-Tick-Events.patch => 0342-Server-Tick-Events.patch} (100%)
 rename Spigot-Server-Patches/{0344-PlayerDeathEvent-getItemsToKeep.patch => 0343-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0345-Optimize-Captured-TileEntity-Lookup.patch => 0344-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename Spigot-Server-Patches/{0346-Add-Heightmap-API.patch => 0345-Add-Heightmap-API.patch} (100%)
 rename Spigot-Server-Patches/{0347-Mob-Spawner-API-Enhancements.patch => 0346-Mob-Spawner-API-Enhancements.patch} (100%)
 rename Spigot-Server-Patches/{0348-Per-Player-View-Distance-API-placeholders.patch => 0347-Per-Player-View-Distance-API-placeholders.patch} (97%)
 rename Spigot-Server-Patches/{0349-Fix-CB-call-to-changed-postToMainThread-method.patch => 0348-Fix-CB-call-to-changed-postToMainThread-method.patch} (100%)
 rename Spigot-Server-Patches/{0350-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0349-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename Spigot-Server-Patches/{0351-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0350-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename Spigot-Server-Patches/{0352-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0351-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0353-Duplicate-UUID-Resolve-Option.patch => 0352-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename Spigot-Server-Patches/{0354-improve-CraftWorld-isChunkLoaded.patch => 0353-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename Spigot-Server-Patches/{0355-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0354-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (100%)
 rename Spigot-Server-Patches/{0356-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0355-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (100%)
 rename Spigot-Server-Patches/{0357-ChunkMapDistance-CME.patch => 0356-ChunkMapDistance-CME.patch} (100%)
 rename Spigot-Server-Patches/{0358-Implement-CraftBlockSoundGroup.patch => 0357-Implement-CraftBlockSoundGroup.patch} (100%)
 rename Spigot-Server-Patches/{0359-Chunk-debug-command.patch => 0358-Chunk-debug-command.patch} (100%)
 rename Spigot-Server-Patches/{0360-Catch-exceptions-from-dispenser-entity-spawns.patch => 0359-Catch-exceptions-from-dispenser-entity-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0361-Fix-World-isChunkGenerated-calls.patch => 0360-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename Spigot-Server-Patches/{0362-Show-blockstate-location-if-we-failed-to-read-it.patch => 0361-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename Spigot-Server-Patches/{0363-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch => 0362-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch} (100%)
 rename Spigot-Server-Patches/{0364-incremental-chunk-saving.patch => 0363-incremental-chunk-saving.patch} (100%)
 rename Spigot-Server-Patches/{0365-Anti-Xray.patch => 0364-Anti-Xray.patch} (100%)
 rename Spigot-Server-Patches/{0366-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0365-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename Spigot-Server-Patches/{0367-Configurable-projectile-relative-velocity.patch => 0366-Configurable-projectile-relative-velocity.patch} (100%)
 rename Spigot-Server-Patches/{0368-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0367-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (100%)
 rename Spigot-Server-Patches/{0369-offset-item-frame-ticking.patch => 0368-offset-item-frame-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0370-Avoid-hopper-searches-if-there-are-no-items.patch => 0369-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename Spigot-Server-Patches/{0371-Asynchronous-chunk-IO-and-loading.patch => 0370-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename Spigot-Server-Patches/{0372-Use-getChunkIfLoadedImmediately-in-places.patch => 0371-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename Spigot-Server-Patches/{0373-Reduce-sync-loads.patch => 0372-Reduce-sync-loads.patch} (100%)
 rename Spigot-Server-Patches/{0374-Implement-alternative-item-despawn-rate.patch => 0373-Implement-alternative-item-despawn-rate.patch} (100%)
 rename Spigot-Server-Patches/{0375-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0374-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (100%)
 rename Spigot-Server-Patches/{0376-Fix-MC-158900.patch => 0375-Fix-MC-158900.patch} (100%)
 rename Spigot-Server-Patches/{0377-implement-optional-per-player-mob-spawns.patch => 0376-implement-optional-per-player-mob-spawns.patch} (99%)
 rename Spigot-Server-Patches/{0378-Prevent-consuming-the-wrong-itemstack.patch => 0377-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename Spigot-Server-Patches/{0379-Fix-nether-portal-creation.patch => 0378-Fix-nether-portal-creation.patch} (100%)
 rename Spigot-Server-Patches/{0380-Generator-Settings.patch => 0379-Generator-Settings.patch} (100%)
 rename Spigot-Server-Patches/{0381-Fix-MC-161754.patch => 0380-Fix-MC-161754.patch} (100%)
 rename Spigot-Server-Patches/{0382-Performance-improvement-for-Chunk.getEntities.patch => 0381-Performance-improvement-for-Chunk.getEntities.patch} (100%)
 rename Spigot-Server-Patches/{0383-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0382-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename Spigot-Server-Patches/{0384-Expose-the-internal-current-tick.patch => 0383-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-Server-Patches/{0385-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0384-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (100%)
 rename Spigot-Server-Patches/{0386-Add-option-to-disable-pillager-patrols.patch => 0385-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename Spigot-Server-Patches/{0387-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0386-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (100%)
 rename Spigot-Server-Patches/{0388-PlayerLaunchProjectileEvent.patch => 0387-PlayerLaunchProjectileEvent.patch} (100%)
 rename Spigot-Server-Patches/{0389-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0388-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename Spigot-Server-Patches/{0390-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0389-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename Spigot-Server-Patches/{0391-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0390-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename Spigot-Server-Patches/{0392-Optimize-Hoppers.patch => 0391-Optimize-Hoppers.patch} (100%)
 rename Spigot-Server-Patches/{0393-PlayerDeathEvent-shouldDropExperience.patch => 0392-PlayerDeathEvent-shouldDropExperience.patch} (90%)
 rename Spigot-Server-Patches/{0394-Prevent-bees-loading-chunks-checking-hive-position.patch => 0393-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename Spigot-Server-Patches/{0395-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0394-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename Spigot-Server-Patches/{0396-Guard-against-serializing-mismatching-chunk-coordina.patch => 0395-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename Spigot-Server-Patches/{0397-Optimise-IEntityAccess-getPlayerByUUID.patch => 0396-Optimise-IEntityAccess-getPlayerByUUID.patch} (100%)
 rename Spigot-Server-Patches/{0398-Fix-items-not-falling-correctly.patch => 0397-Fix-items-not-falling-correctly.patch} (100%)
 rename Spigot-Server-Patches/{0399-Lag-compensate-eating.patch => 0398-Lag-compensate-eating.patch} (100%)
 rename Spigot-Server-Patches/{0400-Optimize-call-to-getFluid-for-explosions.patch => 0399-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename Spigot-Server-Patches/{0401-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0400-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename Spigot-Server-Patches/{0402-Add-effect-to-block-break-naturally.patch => 0401-Add-effect-to-block-break-naturally.patch} (100%)
 rename Spigot-Server-Patches/{0403-Tracking-Range-Improvements.patch => 0402-Tracking-Range-Improvements.patch} (100%)
 rename Spigot-Server-Patches/{0404-Entity-Activation-Range-2.0.patch => 0403-Entity-Activation-Range-2.0.patch} (100%)
 rename Spigot-Server-Patches/{0405-Fix-items-vanishing-through-end-portal.patch => 0404-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename Spigot-Server-Patches/{0406-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0405-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename Spigot-Server-Patches/{0407-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0406-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0408-Allow-overriding-the-java-version-check.patch => 0407-Allow-overriding-the-java-version-check.patch} (100%)
 rename Spigot-Server-Patches/{0409-Add-ThrownEggHatchEvent.patch => 0408-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-Server-Patches/{0410-Optimise-random-block-ticking.patch => 0409-Optimise-random-block-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0411-Entity-Jump-API.patch => 0410-Entity-Jump-API.patch} (100%)
 rename Spigot-Server-Patches/{0412-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0411-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename Spigot-Server-Patches/{0413-Make-the-GUI-graph-fancier.patch => 0412-Make-the-GUI-graph-fancier.patch} (100%)
 rename Spigot-Server-Patches/{0414-add-hand-to-BlockMultiPlaceEvent.patch => 0413-add-hand-to-BlockMultiPlaceEvent.patch} (93%)
 rename Spigot-Server-Patches/{0415-Prevent-teleporting-dead-entities.patch => 0414-Prevent-teleporting-dead-entities.patch} (100%)
 rename Spigot-Server-Patches/{0416-Validate-tripwire-hook-placement-before-update.patch => 0415-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename Spigot-Server-Patches/{0417-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0416-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename Spigot-Server-Patches/{0418-Configurable-chance-of-villager-zombie-infection.patch => 0417-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename Spigot-Server-Patches/{0419-Optimise-Chunk-getFluid.patch => 0418-Optimise-Chunk-getFluid.patch} (100%)
 rename Spigot-Server-Patches/{0420-Optimise-TickListServer-by-rewriting-it.patch => 0419-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename Spigot-Server-Patches/{0421-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0420-Pillager-patrol-spawn-settings-and-per-player-option.patch} (98%)
 rename Spigot-Server-Patches/{0422-Ensure-Entity-is-never-double-registered.patch => 0421-Ensure-Entity-is-never-double-registered.patch} (100%)
 rename Spigot-Server-Patches/{0423-Fix-unregistering-entities-from-unloading-chunks.patch => 0422-Fix-unregistering-entities-from-unloading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0424-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0423-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0425-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0424-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename Spigot-Server-Patches/{0426-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0425-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0427-Optimize-Collision-to-not-load-chunks.patch => 0426-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0428-Don-t-tick-dead-players.patch => 0427-Don-t-tick-dead-players.patch} (91%)
 rename Spigot-Server-Patches/{0429-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0428-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename Spigot-Server-Patches/{0430-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0429-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (100%)
 rename Spigot-Server-Patches/{0431-Increase-Light-Queue-Size.patch => 0430-Increase-Light-Queue-Size.patch} (100%)
 rename Spigot-Server-Patches/{0432-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0431-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (99%)
 rename Spigot-Server-Patches/{0433-Don-t-move-existing-players-to-world-spawn.patch => 0432-Don-t-move-existing-players-to-world-spawn.patch} (93%)
 rename Spigot-Server-Patches/{0434-Add-tick-times-API-and-mspt-command.patch => 0433-Add-tick-times-API-and-mspt-command.patch} (98%)
 rename Spigot-Server-Patches/{0435-Expose-MinecraftServer-isRunning.patch => 0434-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-Server-Patches/{0436-Add-Raw-Byte-ItemStack-Serialization.patch => 0435-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename Spigot-Server-Patches/{0437-Remove-streams-from-Mob-AI-System.patch => 0436-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename Spigot-Server-Patches/{0438-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0437-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (100%)
 rename Spigot-Server-Patches/{0439-Async-command-map-building.patch => 0438-Async-command-map-building.patch} (100%)
 rename Spigot-Server-Patches/{0440-Improved-Watchdog-Support.patch => 0439-Improved-Watchdog-Support.patch} (100%)
 rename Spigot-Server-Patches/{0441-Optimize-Pathfinding.patch => 0440-Optimize-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0442-Reduce-Either-Optional-allocation.patch => 0441-Reduce-Either-Optional-allocation.patch} (100%)
 rename Spigot-Server-Patches/{0443-Remove-streams-from-PairedQueue.patch => 0442-Remove-streams-from-PairedQueue.patch} (100%)
 rename Spigot-Server-Patches/{0444-Reduce-memory-footprint-of-NBTTagCompound.patch => 0443-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename Spigot-Server-Patches/{0445-Prevent-opening-inventories-when-frozen.patch => 0444-Prevent-opening-inventories-when-frozen.patch} (97%)
 rename Spigot-Server-Patches/{0446-Optimise-ArraySetSorted-removeIf.patch => 0445-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename Spigot-Server-Patches/{0447-Don-t-run-entity-collision-code-if-not-needed.patch => 0446-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0448-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0447-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (100%)
 rename Spigot-Server-Patches/{0449-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0448-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename Spigot-Server-Patches/{0450-Implement-Player-Client-Options-API.patch => 0449-Implement-Player-Client-Options-API.patch} (97%)
 rename Spigot-Server-Patches/{0451-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0450-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename Spigot-Server-Patches/{0452-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0451-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename Spigot-Server-Patches/{0453-Broadcast-join-message-to-console.patch => 0452-Broadcast-join-message-to-console.patch} (92%)
 rename Spigot-Server-Patches/{0454-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0453-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (96%)
 rename Spigot-Server-Patches/{0455-Load-Chunks-for-Login-Asynchronously.patch => 0454-Load-Chunks-for-Login-Asynchronously.patch} (100%)
 rename Spigot-Server-Patches/{0456-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0455-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename Spigot-Server-Patches/{0457-Add-PlayerAttackEntityCooldownResetEvent.patch => 0456-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-Server-Patches/{0458-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (100%)
 rename Spigot-Server-Patches/{0459-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0458-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename Spigot-Server-Patches/{0460-Add-phantom-creative-and-insomniac-controls.patch => 0459-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename Spigot-Server-Patches/{0461-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (98%)
 rename Spigot-Server-Patches/{0462-Implement-Brigadier-Mojang-API.patch => 0461-Implement-Brigadier-Mojang-API.patch} (100%)
 rename Spigot-Server-Patches/{0463-Villager-Restocks-API.patch => 0462-Villager-Restocks-API.patch} (100%)
 rename Spigot-Server-Patches/{0464-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0463-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0465-Expose-game-version.patch => 0464-Expose-game-version.patch} (100%)
 rename Spigot-Server-Patches/{0466-Optimize-Voxel-Shape-Merging.patch => 0465-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename Spigot-Server-Patches/{0467-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename Spigot-Server-Patches/{0468-Implement-Mob-Goal-API.patch => 0467-Implement-Mob-Goal-API.patch} (100%)
 rename Spigot-Server-Patches/{0469-Use-distance-map-to-optimise-entity-tracker.patch => 0468-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0470-Optimize-isOutsideRange-to-use-distance-maps.patch => 0469-Optimize-isOutsideRange-to-use-distance-maps.patch} (99%)
 rename Spigot-Server-Patches/{0471-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/{0472-No-Tick-view-distance-implementation.patch => 0471-No-Tick-view-distance-implementation.patch} (100%)
 rename Spigot-Server-Patches/{0473-Add-villager-reputation-API.patch => 0472-Add-villager-reputation-API.patch} (100%)
 rename Spigot-Server-Patches/{0474-Fix-Light-Command.patch => 0473-Fix-Light-Command.patch} (100%)
 rename Spigot-Server-Patches/{0475-Fix-PotionEffect-ignores-icon-flag.patch => 0474-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename Spigot-Server-Patches/{0476-Optimize-brigadier-child-sorting-performance.patch => 0475-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename Spigot-Server-Patches/{0477-Don-t-toString-block-unless-actually-showing-the-mes.patch => 0476-Don-t-toString-block-unless-actually-showing-the-mes.patch} (100%)
 rename Spigot-Server-Patches/{0478-Potential-bed-API.patch => 0477-Potential-bed-API.patch} (100%)
 rename Spigot-Server-Patches/{0479-Wait-for-Async-Tasks-during-shutdown.patch => 0478-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0480-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0479-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename Spigot-Server-Patches/{0481-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0480-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (99%)
 rename Spigot-Server-Patches/{0482-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0481-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename Spigot-Server-Patches/{0483-Reduce-MutableInt-allocations-from-light-engine.patch => 0482-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename Spigot-Server-Patches/{0484-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0483-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0485-Ensure-safe-gateway-teleport.patch => 0484-Ensure-safe-gateway-teleport.patch} (100%)
 rename Spigot-Server-Patches/{0486-Add-option-for-console-having-all-permissions.patch => 0485-Add-option-for-console-having-all-permissions.patch} (96%)
 rename Spigot-Server-Patches/{0487-Workaround-for-Client-Lag-Spikes-MC-162253.patch => 0486-Workaround-for-Client-Lag-Spikes-MC-162253.patch} (100%)
 rename Spigot-Server-Patches/{0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0489-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0488-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename Spigot-Server-Patches/{0490-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0489-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (100%)
 rename Spigot-Server-Patches/{0491-Improve-Chunk-Status-Transition-Speed.patch => 0490-Improve-Chunk-Status-Transition-Speed.patch} (97%)
 rename Spigot-Server-Patches/{0492-Fix-villager-trading-demand-MC-163962.patch => 0491-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename Spigot-Server-Patches/{0493-Maps-shouldn-t-load-chunks.patch => 0492-Maps-shouldn-t-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0494-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0493-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename Spigot-Server-Patches/{0495-Optimize-Bit-Operations-by-inlining.patch => 0494-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0496-Optimize-Light-Engine.patch => 0495-Optimize-Light-Engine.patch} (99%)
 rename Spigot-Server-Patches/{0497-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0496-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename Spigot-Server-Patches/{0498-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0497-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename Spigot-Server-Patches/{0499-Fix-missing-chunks-due-to-integer-overflow.patch => 0498-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename Spigot-Server-Patches/{0500-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0499-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename Spigot-Server-Patches/{0501-Fix-piston-physics-inconsistency-MC-188840.patch => 0500-Fix-piston-physics-inconsistency-MC-188840.patch} (98%)
 rename Spigot-Server-Patches/{0502-Fix-sand-duping.patch => 0501-Fix-sand-duping.patch} (100%)
 rename Spigot-Server-Patches/{0503-Prevent-position-desync-in-playerconnection-causing-.patch => 0502-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename Spigot-Server-Patches/{0504-Fix-enderdragon-exp-dupe.patch => 0503-Fix-enderdragon-exp-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0505-Inventory-getHolder-method-without-block-snapshot.patch => 0504-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0506-Expose-Arrow-getItemStack.patch => 0505-Expose-Arrow-getItemStack.patch} (100%)
 rename Spigot-Server-Patches/{0507-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0506-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename Spigot-Server-Patches/{0508-Hide-sync-chunk-writes-behind-flag.patch => 0507-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename Spigot-Server-Patches/{0509-Limit-lightning-strike-effect-distance.patch => 0508-Limit-lightning-strike-effect-distance.patch} (100%)
 rename Spigot-Server-Patches/{0510-Add-permission-for-command-blocks.patch => 0509-Add-permission-for-command-blocks.patch} (100%)
 rename Spigot-Server-Patches/{0511-Ensure-Entity-AABB-s-are-never-invalid.patch => 0510-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0512-Optimize-WorldBorder-collision-checks-and-air.patch => 0511-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename Spigot-Server-Patches/{0513-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0512-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)
 rename Spigot-Server-Patches/{0514-Paper-dumpitem-command.patch => 0513-Paper-dumpitem-command.patch} (100%)
 rename Spigot-Server-Patches/{0515-Don-t-allow-null-UUID-s-for-chat.patch => 0514-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename Spigot-Server-Patches/{0516-Improve-Legacy-Component-serialization-size.patch => 0515-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename Spigot-Server-Patches/{0517-Support-old-UUID-format-for-NBT.patch => 0516-Support-old-UUID-format-for-NBT.patch} (100%)
 rename Spigot-Server-Patches/{0518-Clean-up-duplicated-GameProfile-Properties.patch => 0517-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename Spigot-Server-Patches/{0519-Convert-legacy-attributes-in-Item-Meta.patch => 0518-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0520-Remove-some-streams-from-structures.patch => 0519-Remove-some-streams-from-structures.patch} (100%)
 rename Spigot-Server-Patches/{0521-Remove-streams-from-classes-related-villager-gossip.patch => 0520-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename Spigot-Server-Patches/{0522-Support-components-in-ItemMeta.patch => 0521-Support-components-in-ItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0523-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0522-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename Spigot-Server-Patches/{0524-Add-entity-liquid-API.patch => 0523-Add-entity-liquid-API.patch} (100%)
 rename Spigot-Server-Patches/{0525-Update-itemstack-legacy-name-and-lore.patch => 0524-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename Spigot-Server-Patches/{0526-Spawn-player-in-correct-world-on-login.patch => 0525-Spawn-player-in-correct-world-on-login.patch} (94%)
 rename Spigot-Server-Patches/{0527-Add-PrepareResultEvent.patch => 0526-Add-PrepareResultEvent.patch} (100%)
 rename Spigot-Server-Patches/{0528-Allow-delegation-to-vanilla-chunk-gen.patch => 0527-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename Spigot-Server-Patches/{0529-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0528-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename Spigot-Server-Patches/{0530-Optimize-NetworkManager-Exception-Handling.patch => 0529-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename Spigot-Server-Patches/{0531-Fix-Concurrency-issue-in-WeightedList.patch => 0530-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename Spigot-Server-Patches/{0532-Optimize-the-advancement-data-player-iteration-to-be.patch => 0531-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename Spigot-Server-Patches/{0533-Fix-arrows-never-despawning-MC-125757.patch => 0532-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename Spigot-Server-Patches/{0534-Thread-Safe-Vanilla-Command-permission-checking.patch => 0533-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename Spigot-Server-Patches/{0535-Move-range-check-for-block-placing-up.patch => 0534-Move-range-check-for-block-placing-up.patch} (100%)
 rename Spigot-Server-Patches/{0536-Fix-SPIGOT-5989.patch => 0535-Fix-SPIGOT-5989.patch} (100%)
 rename Spigot-Server-Patches/{0537-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0536-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename Spigot-Server-Patches/{0538-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0537-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename Spigot-Server-Patches/{0539-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0538-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename Spigot-Server-Patches/{0540-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0539-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename Spigot-Server-Patches/{0541-Fix-some-rails-connecting-improperly.patch => 0540-Fix-some-rails-connecting-improperly.patch} (100%)
 rename Spigot-Server-Patches/{0542-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0541-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename Spigot-Server-Patches/{0543-Incremental-player-saving.patch => 0542-Incremental-player-saving.patch} (98%)
 rename Spigot-Server-Patches/{0544-Import-fastutil-classes.patch => 0543-Import-fastutil-classes.patch} (100%)
 rename Spigot-Server-Patches/{0545-Don-t-mark-null-chunk-sections-for-block-updates.patch => 0544-Don-t-mark-null-chunk-sections-for-block-updates.patch} (92%)
 rename Spigot-Server-Patches/{0546-Remove-armour-stand-double-add-to-world.patch => 0545-Remove-armour-stand-double-add-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0547-Fix-MC-187716-Use-configured-height.patch => 0546-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename Spigot-Server-Patches/{0548-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch => 0547-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch} (100%)
 rename Spigot-Server-Patches/{0549-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0548-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename Spigot-Server-Patches/{0550-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0549-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename Spigot-Server-Patches/{0551-Brand-support.patch => 0550-Brand-support.patch} (97%)
 rename Spigot-Server-Patches/{0552-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch => 0551-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch} (100%)
 rename Spigot-Server-Patches/{0553-Fix-MC-197271.patch => 0552-Fix-MC-197271.patch} (100%)
 rename Spigot-Server-Patches/{0554-MC-197883-Bandaid-decode-issue.patch => 0553-MC-197883-Bandaid-decode-issue.patch} (100%)
 rename Spigot-Server-Patches/{0555-Add-setMaxPlayers-API.patch => 0554-Add-setMaxPlayers-API.patch} (94%)
 rename Spigot-Server-Patches/{0556-Add-playPickupItemAnimation-to-LivingEntity.patch => 0555-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0557-Don-t-require-FACING-data.patch => 0556-Don-t-require-FACING-data.patch} (100%)
 rename Spigot-Server-Patches/{0558-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0557-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename Spigot-Server-Patches/{0559-Add-moon-phase-API.patch => 0558-Add-moon-phase-API.patch} (100%)
 rename Spigot-Server-Patches/{0560-Prevent-headless-pistons-from-being-created.patch => 0559-Prevent-headless-pistons-from-being-created.patch} (97%)
 rename Spigot-Server-Patches/{0561-Brand-support.patch => 0560-Brand-support.patch} (89%)
 rename Spigot-Server-Patches/{0562-Add-BellRingEvent.patch => 0561-Add-BellRingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0563-Add-zombie-targets-turtle-egg-config.patch => 0562-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename Spigot-Server-Patches/{0564-Buffer-joins-to-world.patch => 0563-Buffer-joins-to-world.patch} (96%)
 rename Spigot-Server-Patches/{0565-Optimize-redstone-algorithm.patch => 0564-Optimize-redstone-algorithm.patch} (100%)
 rename Spigot-Server-Patches/{0566-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0565-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename Spigot-Server-Patches/{0567-PortalCreateEvent-needs-to-know-its-entity.patch => 0566-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename Spigot-Server-Patches/{0568-Fix-CraftTeam-null-check.patch => 0567-Fix-CraftTeam-null-check.patch} (100%)
 rename Spigot-Server-Patches/{0569-Add-more-Evoker-API.patch => 0568-Add-more-Evoker-API.patch} (100%)
 rename Spigot-Server-Patches/{0570-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0569-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename Spigot-Server-Patches/{0571-Create-HoverEvent-from-ItemStack-Entity.patch => 0570-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename Spigot-Server-Patches/{0572-Cache-block-data-strings.patch => 0571-Cache-block-data-strings.patch} (100%)
 rename Spigot-Server-Patches/{0573-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0572-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename Spigot-Server-Patches/{0574-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch => 0573-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch} (100%)
 rename Spigot-Server-Patches/{0575-Add-additional-open-container-api-to-HumanEntity.patch => 0574-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename Spigot-Server-Patches/{0576-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0575-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename Spigot-Server-Patches/{0577-Extend-block-drop-capture-to-capture-all-items-added.patch => 0576-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename Spigot-Server-Patches/{0578-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0577-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (89%)
 rename Spigot-Server-Patches/{0579-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0578-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename Spigot-Server-Patches/{0580-Lazily-track-plugin-scoreboards-by-default.patch => 0579-Lazily-track-plugin-scoreboards-by-default.patch} (98%)
 rename Spigot-Server-Patches/{0581-Entity-isTicking.patch => 0580-Entity-isTicking.patch} (100%)
 rename Spigot-Server-Patches/{0582-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0581-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename Spigot-Server-Patches/{0583-Fix-Not-a-string-Map-Conversion-spam.patch => 0582-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename Spigot-Server-Patches/{0584-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0583-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0585-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch => 0584-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch} (100%)
 rename Spigot-Server-Patches/{0586-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0585-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename Spigot-Server-Patches/{0587-Fix-for-large-move-vectors-crashing-server.patch => 0586-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0588-Optimise-getType-calls.patch => 0587-Optimise-getType-calls.patch} (100%)
 rename Spigot-Server-Patches/{0589-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0588-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename Spigot-Server-Patches/{0590-Retain-block-place-order-when-capturing-blockstates.patch => 0589-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename Spigot-Server-Patches/{0591-Reduce-blockpos-allocation-from-pathfinding.patch => 0590-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)

diff --git a/Spigot-API-Patches/0051-Item-canEntityPickup.patch b/Spigot-API-Patches/0051-Item-canEntityPickup.patch
index 0f5325a00f..27894bda93 100644
--- a/Spigot-API-Patches/0051-Item-canEntityPickup.patch
+++ b/Spigot-API-Patches/0051-Item-canEntityPickup.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 4f0caf5a7084f2be1ce1a4b49318e78597b45846..ae3880491682067d4c5baef0a8c90b1036d67ac0 100644
+index 3f2736fbddd8661e764bc2f8d0499bd13ca91df5..c404a5b8efea7c780db5ddae19456753808abb3d 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
-@@ -36,4 +36,20 @@ public interface Item extends Entity {
-      * @param delay New delay
+@@ -75,4 +75,20 @@ public interface Item extends Entity {
       */
-     public void setPickupDelay(int delay);
+     @Nullable
+     public UUID getThrower();
 +
 +    // Paper Start
 +    /**
diff --git a/Spigot-API-Patches/0160-Add-spectator-target-events.patch b/Spigot-API-Patches/0159-Add-spectator-target-events.patch
similarity index 100%
rename from Spigot-API-Patches/0160-Add-spectator-target-events.patch
rename to Spigot-API-Patches/0159-Add-spectator-target-events.patch
diff --git a/Spigot-API-Patches/0159-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0159-Implement-getters-and-setters-for-EntityItem-owner-a.patch
deleted file mode 100644
index 7645d0f72c..0000000000
--- a/Spigot-API-Patches/0159-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 6 Oct 2018 20:54:13 -0500
-Subject: [PATCH] Implement getters and setters for EntityItem owner and
- thrower
-
-
-diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index ae3880491682067d4c5baef0a8c90b1036d67ac0..acd80d812fe88dee3978d19b24149e9fe0ac596b 100644
---- a/src/main/java/org/bukkit/entity/Item.java
-+++ b/src/main/java/org/bukkit/entity/Item.java
-@@ -3,6 +3,11 @@ package org.bukkit.entity;
- import org.bukkit.inventory.ItemStack;
- import org.jetbrains.annotations.NotNull;
- 
-+// Paper start
-+import org.jetbrains.annotations.Nullable;
-+import java.util.UUID;
-+// Paper end
-+
- /**
-  * Represents a dropped item.
-  */
-@@ -51,5 +56,35 @@ public interface Item extends Entity {
-      * @param canMobPickup True to allow non-player entity pickup
-      */
-     public void setCanMobPickup(boolean canMobPickup);
-+
-+    /**
-+     * The owner of this item. Only the owner can pick up the item until it is within 10 seconds of despawning
-+     *
-+     * @return The owner's UUID
-+     */
-+    @Nullable
-+    public UUID getOwner();
-+
-+    /**
-+     * Set the owner of this item. Only the owner can pick up the item until it is within 10 seconds of despawning
-+     *
-+     * @param owner The owner's UUID
-+     */
-+    public void setOwner(@Nullable UUID owner);
-+
-+    /**
-+     * Get the thrower of this item.
-+     *
-+     * @return The thrower's UUID
-+     */
-+    @Nullable
-+    public UUID getThrower();
-+
-+    /**
-+     * Set the thrower of this item.
-+     *
-+     * @param thrower The thrower's UUID
-+     */
-+    public void setThrower(@Nullable UUID thrower);
-     // Paper end
- }
diff --git a/Spigot-API-Patches/0161-Add-more-Witch-API.patch b/Spigot-API-Patches/0160-Add-more-Witch-API.patch
similarity index 100%
rename from Spigot-API-Patches/0161-Add-more-Witch-API.patch
rename to Spigot-API-Patches/0160-Add-more-Witch-API.patch
diff --git a/Spigot-API-Patches/0162-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0161-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from Spigot-API-Patches/0162-Make-the-default-permission-message-configurable.patch
rename to Spigot-API-Patches/0161-Make-the-default-permission-message-configurable.patch
diff --git a/Spigot-API-Patches/0163-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 100%
rename from Spigot-API-Patches/0163-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to Spigot-API-Patches/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/Spigot-API-Patches/0164-Add-more-Zombie-API.patch b/Spigot-API-Patches/0163-Add-more-Zombie-API.patch
similarity index 100%
rename from Spigot-API-Patches/0164-Add-more-Zombie-API.patch
rename to Spigot-API-Patches/0163-Add-more-Zombie-API.patch
diff --git a/Spigot-API-Patches/0165-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0164-Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 100%
rename from Spigot-API-Patches/0165-Change-the-reserved-channel-check-to-be-sensible.patch
rename to Spigot-API-Patches/0164-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/Spigot-API-Patches/0166-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0165-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0166-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-API-Patches/0165-Add-PlayerConnectionCloseEvent.patch
diff --git a/Spigot-API-Patches/0167-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from Spigot-API-Patches/0167-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-API-Patches/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/Spigot-API-Patches/0168-BlockDestroyEvent.patch b/Spigot-API-Patches/0167-BlockDestroyEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0168-BlockDestroyEvent.patch
rename to Spigot-API-Patches/0167-BlockDestroyEvent.patch
diff --git a/Spigot-API-Patches/0169-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0168-Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 100%
rename from Spigot-API-Patches/0169-Add-ItemStack-Recipe-API-helper-methods.patch
rename to Spigot-API-Patches/0168-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/Spigot-API-Patches/0170-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0169-Add-WhitelistToggleEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0170-Add-WhitelistToggleEvent.patch
rename to Spigot-API-Patches/0169-Add-WhitelistToggleEvent.patch
diff --git a/Spigot-API-Patches/0171-Annotation-Test-changes.patch b/Spigot-API-Patches/0170-Annotation-Test-changes.patch
similarity index 100%
rename from Spigot-API-Patches/0171-Annotation-Test-changes.patch
rename to Spigot-API-Patches/0170-Annotation-Test-changes.patch
diff --git a/Spigot-API-Patches/0172-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0171-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from Spigot-API-Patches/0172-Entity-getEntitySpawnReason.patch
rename to Spigot-API-Patches/0171-Entity-getEntitySpawnReason.patch
diff --git a/Spigot-API-Patches/0173-Add-GS4-Query-event.patch b/Spigot-API-Patches/0172-Add-GS4-Query-event.patch
similarity index 100%
rename from Spigot-API-Patches/0173-Add-GS4-Query-event.patch
rename to Spigot-API-Patches/0172-Add-GS4-Query-event.patch
diff --git a/Spigot-API-Patches/0174-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0173-Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0174-Add-PlayerPostRespawnEvent.patch
rename to Spigot-API-Patches/0173-Add-PlayerPostRespawnEvent.patch
diff --git a/Spigot-API-Patches/0175-Ignore-package-private-methods-for-nullability-annot.patch b/Spigot-API-Patches/0174-Ignore-package-private-methods-for-nullability-annot.patch
similarity index 100%
rename from Spigot-API-Patches/0175-Ignore-package-private-methods-for-nullability-annot.patch
rename to Spigot-API-Patches/0174-Ignore-package-private-methods-for-nullability-annot.patch
diff --git a/Spigot-API-Patches/0176-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0175-Flip-some-Spigot-API-null-annotations.patch
similarity index 100%
rename from Spigot-API-Patches/0176-Flip-some-Spigot-API-null-annotations.patch
rename to Spigot-API-Patches/0175-Flip-some-Spigot-API-null-annotations.patch
diff --git a/Spigot-API-Patches/0177-Server-Tick-Events.patch b/Spigot-API-Patches/0176-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-API-Patches/0177-Server-Tick-Events.patch
rename to Spigot-API-Patches/0176-Server-Tick-Events.patch
diff --git a/Spigot-API-Patches/0178-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0177-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from Spigot-API-Patches/0178-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-API-Patches/0177-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/Spigot-API-Patches/0179-Add-Heightmap-API.patch b/Spigot-API-Patches/0178-Add-Heightmap-API.patch
similarity index 100%
rename from Spigot-API-Patches/0179-Add-Heightmap-API.patch
rename to Spigot-API-Patches/0178-Add-Heightmap-API.patch
diff --git a/Spigot-API-Patches/0180-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0179-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-API-Patches/0180-Mob-Spawner-API-Enhancements.patch
rename to Spigot-API-Patches/0179-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-API-Patches/0181-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0180-Add-BlockSoundGroup-interface.patch
similarity index 100%
rename from Spigot-API-Patches/0181-Add-BlockSoundGroup-interface.patch
rename to Spigot-API-Patches/0180-Add-BlockSoundGroup-interface.patch
diff --git a/Spigot-API-Patches/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/Spigot-API-Patches/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
similarity index 100%
rename from Spigot-API-Patches/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
rename to Spigot-API-Patches/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/Spigot-API-Patches/0183-Make-PlayerEvent-public.patch b/Spigot-API-Patches/0182-Make-PlayerEvent-public.patch
similarity index 100%
rename from Spigot-API-Patches/0183-Make-PlayerEvent-public.patch
rename to Spigot-API-Patches/0182-Make-PlayerEvent-public.patch
diff --git a/Spigot-API-Patches/0184-Increase-custom-payload-channel-message-size.patch b/Spigot-API-Patches/0183-Increase-custom-payload-channel-message-size.patch
similarity index 100%
rename from Spigot-API-Patches/0184-Increase-custom-payload-channel-message-size.patch
rename to Spigot-API-Patches/0183-Increase-custom-payload-channel-message-size.patch
diff --git a/Spigot-API-Patches/0185-Expose-the-internal-current-tick.patch b/Spigot-API-Patches/0184-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-API-Patches/0185-Expose-the-internal-current-tick.patch
rename to Spigot-API-Patches/0184-Expose-the-internal-current-tick.patch
diff --git a/Spigot-API-Patches/0186-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-API-Patches/0185-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from Spigot-API-Patches/0186-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-API-Patches/0185-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/Spigot-API-Patches/0187-Add-effect-to-block-break-naturally.patch b/Spigot-API-Patches/0186-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-API-Patches/0187-Add-effect-to-block-break-naturally.patch
rename to Spigot-API-Patches/0186-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-API-Patches/0188-Add-ThrownEggHatchEvent.patch b/Spigot-API-Patches/0187-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0188-Add-ThrownEggHatchEvent.patch
rename to Spigot-API-Patches/0187-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-API-Patches/0189-Entity-Jump-API.patch b/Spigot-API-Patches/0188-Entity-Jump-API.patch
similarity index 100%
rename from Spigot-API-Patches/0189-Entity-Jump-API.patch
rename to Spigot-API-Patches/0188-Entity-Jump-API.patch
diff --git a/Spigot-API-Patches/0190-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-API-Patches/0189-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0190-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-API-Patches/0189-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/Spigot-API-Patches/0191-Add-tick-times-API.patch b/Spigot-API-Patches/0190-Add-tick-times-API.patch
similarity index 100%
rename from Spigot-API-Patches/0191-Add-tick-times-API.patch
rename to Spigot-API-Patches/0190-Add-tick-times-API.patch
diff --git a/Spigot-API-Patches/0192-Expose-MinecraftServer-isRunning.patch b/Spigot-API-Patches/0191-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-API-Patches/0192-Expose-MinecraftServer-isRunning.patch
rename to Spigot-API-Patches/0191-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-API-Patches/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/Spigot-API-Patches/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
similarity index 100%
rename from Spigot-API-Patches/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
rename to Spigot-API-Patches/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
diff --git a/Spigot-API-Patches/0194-Make-JavaPluginLoader-thread-safe.patch b/Spigot-API-Patches/0193-Make-JavaPluginLoader-thread-safe.patch
similarity index 100%
rename from Spigot-API-Patches/0194-Make-JavaPluginLoader-thread-safe.patch
rename to Spigot-API-Patches/0193-Make-JavaPluginLoader-thread-safe.patch
diff --git a/Spigot-API-Patches/0195-Add-Player-Client-Options-API.patch b/Spigot-API-Patches/0194-Add-Player-Client-Options-API.patch
similarity index 100%
rename from Spigot-API-Patches/0195-Add-Player-Client-Options-API.patch
rename to Spigot-API-Patches/0194-Add-Player-Client-Options-API.patch
diff --git a/Spigot-API-Patches/0196-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-API-Patches/0195-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0196-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-API-Patches/0195-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-API-Patches/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/Spigot-API-Patches/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
similarity index 100%
rename from Spigot-API-Patches/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
rename to Spigot-API-Patches/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/Spigot-API-Patches/0198-Villager-Restocks-API.patch b/Spigot-API-Patches/0197-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-API-Patches/0198-Villager-Restocks-API.patch
rename to Spigot-API-Patches/0197-Villager-Restocks-API.patch
diff --git a/Spigot-API-Patches/0199-Expose-game-version.patch b/Spigot-API-Patches/0198-Expose-game-version.patch
similarity index 100%
rename from Spigot-API-Patches/0199-Expose-game-version.patch
rename to Spigot-API-Patches/0198-Expose-game-version.patch
diff --git a/Spigot-API-Patches/0200-Add-item-slot-convenience-methods.patch b/Spigot-API-Patches/0199-Add-item-slot-convenience-methods.patch
similarity index 100%
rename from Spigot-API-Patches/0200-Add-item-slot-convenience-methods.patch
rename to Spigot-API-Patches/0199-Add-item-slot-convenience-methods.patch
diff --git a/Spigot-API-Patches/0201-Add-Mob-Goal-API.patch b/Spigot-API-Patches/0200-Add-Mob-Goal-API.patch
similarity index 100%
rename from Spigot-API-Patches/0201-Add-Mob-Goal-API.patch
rename to Spigot-API-Patches/0200-Add-Mob-Goal-API.patch
diff --git a/Spigot-API-Patches/0202-World-view-distance-api.patch b/Spigot-API-Patches/0201-World-view-distance-api.patch
similarity index 100%
rename from Spigot-API-Patches/0202-World-view-distance-api.patch
rename to Spigot-API-Patches/0201-World-view-distance-api.patch
diff --git a/Spigot-API-Patches/0203-Add-villager-reputation-API.patch b/Spigot-API-Patches/0202-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-API-Patches/0203-Add-villager-reputation-API.patch
rename to Spigot-API-Patches/0202-Add-villager-reputation-API.patch
diff --git a/Spigot-API-Patches/0204-Spawn-Reason-API.patch b/Spigot-API-Patches/0203-Spawn-Reason-API.patch
similarity index 100%
rename from Spigot-API-Patches/0204-Spawn-Reason-API.patch
rename to Spigot-API-Patches/0203-Spawn-Reason-API.patch
diff --git a/Spigot-API-Patches/0205-Potential-bed-API.patch b/Spigot-API-Patches/0204-Potential-bed-API.patch
similarity index 100%
rename from Spigot-API-Patches/0205-Potential-bed-API.patch
rename to Spigot-API-Patches/0204-Potential-bed-API.patch
diff --git a/Spigot-API-Patches/0206-Prioritise-own-classes-where-possible.patch b/Spigot-API-Patches/0205-Prioritise-own-classes-where-possible.patch
similarity index 100%
rename from Spigot-API-Patches/0206-Prioritise-own-classes-where-possible.patch
rename to Spigot-API-Patches/0205-Prioritise-own-classes-where-possible.patch
diff --git a/Spigot-API-Patches/0207-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-API-Patches/0206-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from Spigot-API-Patches/0207-Add-Raw-Byte-ItemStack-Serialization.patch
rename to Spigot-API-Patches/0206-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/Spigot-API-Patches/0208-Provide-a-useful-PluginClassLoader-toString.patch b/Spigot-API-Patches/0207-Provide-a-useful-PluginClassLoader-toString.patch
similarity index 100%
rename from Spigot-API-Patches/0208-Provide-a-useful-PluginClassLoader-toString.patch
rename to Spigot-API-Patches/0207-Provide-a-useful-PluginClassLoader-toString.patch
diff --git a/Spigot-API-Patches/0209-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-API-Patches/0208-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-API-Patches/0209-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-API-Patches/0208-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-API-Patches/0210-Expose-Arrow-getItemStack.patch b/Spigot-API-Patches/0209-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-API-Patches/0210-Expose-Arrow-getItemStack.patch
rename to Spigot-API-Patches/0209-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-API-Patches/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-API-Patches/0210-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-API-Patches/0210-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/Spigot-API-Patches/0212-Support-components-in-ItemMeta.patch b/Spigot-API-Patches/0211-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-API-Patches/0212-Support-components-in-ItemMeta.patch
rename to Spigot-API-Patches/0211-Support-components-in-ItemMeta.patch
diff --git a/Spigot-API-Patches/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/Spigot-API-Patches/0212-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
similarity index 100%
rename from Spigot-API-Patches/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
rename to Spigot-API-Patches/0212-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/Spigot-API-Patches/0214-Add-entity-liquid-API.patch b/Spigot-API-Patches/0213-Add-entity-liquid-API.patch
similarity index 100%
rename from Spigot-API-Patches/0214-Add-entity-liquid-API.patch
rename to Spigot-API-Patches/0213-Add-entity-liquid-API.patch
diff --git a/Spigot-API-Patches/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/Spigot-API-Patches/0214-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
rename to Spigot-API-Patches/0214-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/Spigot-API-Patches/0216-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-API-Patches/0215-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from Spigot-API-Patches/0216-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-API-Patches/0215-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-API-Patches/0217-Support-hex-colors-in-getLastColors.patch b/Spigot-API-Patches/0216-Support-hex-colors-in-getLastColors.patch
similarity index 100%
rename from Spigot-API-Patches/0217-Support-hex-colors-in-getLastColors.patch
rename to Spigot-API-Patches/0216-Support-hex-colors-in-getLastColors.patch
diff --git a/Spigot-API-Patches/0218-Add-setMaxPlayers-API.patch b/Spigot-API-Patches/0217-Add-setMaxPlayers-API.patch
similarity index 100%
rename from Spigot-API-Patches/0218-Add-setMaxPlayers-API.patch
rename to Spigot-API-Patches/0217-Add-setMaxPlayers-API.patch
diff --git a/Spigot-API-Patches/0219-Add-moon-phase-API.patch b/Spigot-API-Patches/0218-Add-moon-phase-API.patch
similarity index 100%
rename from Spigot-API-Patches/0219-Add-moon-phase-API.patch
rename to Spigot-API-Patches/0218-Add-moon-phase-API.patch
diff --git a/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-API-Patches/0219-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-API-Patches/0219-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-API-Patches/0221-Add-BellRingEvent.patch b/Spigot-API-Patches/0220-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0221-Add-BellRingEvent.patch
rename to Spigot-API-Patches/0220-Add-BellRingEvent.patch
diff --git a/Spigot-API-Patches/0222-Brand-support.patch b/Spigot-API-Patches/0221-Brand-support.patch
similarity index 100%
rename from Spigot-API-Patches/0222-Brand-support.patch
rename to Spigot-API-Patches/0221-Brand-support.patch
diff --git a/Spigot-API-Patches/0223-Add-more-Evoker-API.patch b/Spigot-API-Patches/0222-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-API-Patches/0223-Add-more-Evoker-API.patch
rename to Spigot-API-Patches/0222-Add-more-Evoker-API.patch
diff --git a/Spigot-API-Patches/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-API-Patches/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-API-Patches/0225-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-API-Patches/0224-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-API-Patches/0225-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-API-Patches/0224-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/Spigot-API-Patches/0226-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-API-Patches/0225-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-API-Patches/0226-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-API-Patches/0225-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/Spigot-API-Patches/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-API-Patches/0226-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from Spigot-API-Patches/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to Spigot-API-Patches/0226-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/Spigot-API-Patches/0228-Entity-isTicking.patch b/Spigot-API-Patches/0227-Entity-isTicking.patch
similarity index 100%
rename from Spigot-API-Patches/0228-Entity-isTicking.patch
rename to Spigot-API-Patches/0227-Entity-isTicking.patch
diff --git a/Spigot-API-Patches/0229-Remove-unnecessary-space-for-provided-plugins.patch b/Spigot-API-Patches/0228-Remove-unnecessary-space-for-provided-plugins.patch
similarity index 100%
rename from Spigot-API-Patches/0229-Remove-unnecessary-space-for-provided-plugins.patch
rename to Spigot-API-Patches/0228-Remove-unnecessary-space-for-provided-plugins.patch
diff --git a/Spigot-API-Patches/0230-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/Spigot-API-Patches/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
similarity index 100%
rename from Spigot-API-Patches/0230-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
rename to Spigot-API-Patches/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/Spigot-Server-Patches/0148-Item-canEntityPickup.patch b/Spigot-Server-Patches/0148-Item-canEntityPickup.patch
index 5138156be3..e920cd5b1e 100644
--- a/Spigot-Server-Patches/0148-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0148-Item-canEntityPickup.patch
@@ -33,10 +33,10 @@ index 13416bf95869987919e1fcd6b331c3fe2c2b5cee..2ca3886f532050ba7d360efd20a617ef
      public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index cc593fbc995dfc11f8006588059d67c42a7429cd..3f552b5905e5ed51c887ad02410297dd5e2e165f 100644
+index d7da0cf2e7b9e669635b469f87e8da4d7fdecb35..d6a64e4ecf9225f9a93523c50b2f1375296b406e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -49,6 +49,16 @@ public class CraftItem extends CraftEntity implements Item {
          item.age = value;
      }
  
@@ -51,5 +51,5 @@ index cc593fbc995dfc11f8006588059d67c42a7429cd..3f552b5905e5ed51c887ad02410297dd
 +    // Paper End
 +
      @Override
-     public String toString() {
-         return "CraftItem";
+     public void setOwner(UUID uuid) {
+         item.setOwner(uuid);
diff --git a/Spigot-Server-Patches/0342-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0342-Implement-getters-and-setters-for-EntityItem-owner-a.patch
deleted file mode 100644
index fdb1990678..0000000000
--- a/Spigot-Server-Patches/0342-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 6 Oct 2018 20:54:23 -0500
-Subject: [PATCH] Implement getters and setters for EntityItem owner and
- thrower
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 3f552b5905e5ed51c887ad02410297dd5e2e165f..cb756b1ba0438045904a1b3fe8e827e8f1e105bd 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType;
- import org.bukkit.entity.Item;
- import org.bukkit.inventory.ItemStack;
- 
-+// Paper start
-+import javax.annotation.Nullable;
-+import java.util.UUID;
-+// Paper end
-+
- public class CraftItem extends CraftEntity implements Item {
-     private final EntityItem item;
- 
-@@ -56,6 +61,28 @@ public class CraftItem extends CraftEntity implements Item {
-     public void setCanMobPickup(boolean canMobPickup) {
-         item.canMobPickup = canMobPickup;
-     }
-+
-+    @Nullable
-+    @Override
-+    public UUID getOwner() {
-+        return item.getOwner();
-+    }
-+
-+    @Override
-+    public void setOwner(@Nullable UUID owner) {
-+        item.setOwner(owner);
-+    }
-+
-+    @Nullable
-+    @Override
-+    public UUID getThrower() {
-+        return item.getThrower();
-+    }
-+
-+    @Override
-+    public void setThrower(@Nullable UUID thrower) {
-+        item.setThrower(thrower);
-+    }
-     // Paper End
- 
-     @Override
diff --git a/Spigot-Server-Patches/0343-Server-Tick-Events.patch b/Spigot-Server-Patches/0342-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0343-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0342-Server-Tick-Events.patch
diff --git a/Spigot-Server-Patches/0344-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0343-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0344-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0343-PlayerDeathEvent-getItemsToKeep.patch
index a1771ce79e..d884d55637 100644
--- a/Spigot-Server-Patches/0344-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0343-PlayerDeathEvent-getItemsToKeep.patch
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 433140dc33fe2a9eb8241afc2aabf97378dcefdd..05d73610dc1e0e0c411f9cd6c1118ab5a6bb81ab 100644
+index 585e0f8007ff7e73e5b9f363ed4a977b48a3fafc..81ac825acd266329392bf2ebecb73162942d3a21 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -560,6 +560,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0345-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0344-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from Spigot-Server-Patches/0345-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0344-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/Spigot-Server-Patches/0346-Add-Heightmap-API.patch b/Spigot-Server-Patches/0345-Add-Heightmap-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0346-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0345-Add-Heightmap-API.patch
diff --git a/Spigot-Server-Patches/0347-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0346-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0347-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0346-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-Server-Patches/0348-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0347-Per-Player-View-Distance-API-placeholders.patch
similarity index 97%
rename from Spigot-Server-Patches/0348-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0347-Per-Player-View-Distance-API-placeholders.patch
index d9d3b0936e..95ded0998c 100644
--- a/Spigot-Server-Patches/0348-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0347-Per-Player-View-Distance-API-placeholders.patch
@@ -40,7 +40,7 @@ index dd4d12f4e3ab5385b85504bde962adce2981dfb5..1511212cbfbece279d9f66473bd6b5bc
                          double deltaZ = this.locZ() - player.locZ();
                          double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d43ada6dccb45060ea37acf7a2a8ea6a4d74ab18..747dd3c06d24b395d9d940413fe47a63b66e65d0 100644
+index 16edb26f9e66e26e5f26b83301613cd1486c7700..748b1c12ccee67a35232cf7a48e68ef7f34147c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2024,6 +2024,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0349-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0348-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from Spigot-Server-Patches/0349-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0348-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/Spigot-Server-Patches/0350-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0349-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from Spigot-Server-Patches/0350-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0349-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/Spigot-Server-Patches/0351-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0350-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from Spigot-Server-Patches/0351-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0350-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/Spigot-Server-Patches/0352-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0351-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0352-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0351-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0353-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0352-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from Spigot-Server-Patches/0353-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0352-Duplicate-UUID-Resolve-Option.patch
diff --git a/Spigot-Server-Patches/0354-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0353-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from Spigot-Server-Patches/0354-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0353-improve-CraftWorld-isChunkLoaded.patch
diff --git a/Spigot-Server-Patches/0355-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0354-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0355-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0354-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/Spigot-Server-Patches/0356-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0355-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 100%
rename from Spigot-Server-Patches/0356-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0355-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
diff --git a/Spigot-Server-Patches/0357-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0356-ChunkMapDistance-CME.patch
similarity index 100%
rename from Spigot-Server-Patches/0357-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0356-ChunkMapDistance-CME.patch
diff --git a/Spigot-Server-Patches/0358-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0357-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from Spigot-Server-Patches/0358-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0357-Implement-CraftBlockSoundGroup.patch
diff --git a/Spigot-Server-Patches/0359-Chunk-debug-command.patch b/Spigot-Server-Patches/0358-Chunk-debug-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0359-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0358-Chunk-debug-command.patch
diff --git a/Spigot-Server-Patches/0360-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0359-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0360-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0359-Catch-exceptions-from-dispenser-entity-spawns.patch
diff --git a/Spigot-Server-Patches/0361-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0360-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0361-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0360-Fix-World-isChunkGenerated-calls.patch
diff --git a/Spigot-Server-Patches/0362-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0361-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0362-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0361-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/Spigot-Server-Patches/0363-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch b/Spigot-Server-Patches/0362-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
similarity index 100%
rename from Spigot-Server-Patches/0363-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
rename to Spigot-Server-Patches/0362-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
diff --git a/Spigot-Server-Patches/0364-incremental-chunk-saving.patch b/Spigot-Server-Patches/0363-incremental-chunk-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0364-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0363-incremental-chunk-saving.patch
diff --git a/Spigot-Server-Patches/0365-Anti-Xray.patch b/Spigot-Server-Patches/0364-Anti-Xray.patch
similarity index 100%
rename from Spigot-Server-Patches/0365-Anti-Xray.patch
rename to Spigot-Server-Patches/0364-Anti-Xray.patch
diff --git a/Spigot-Server-Patches/0366-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0365-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from Spigot-Server-Patches/0366-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0365-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/Spigot-Server-Patches/0367-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0366-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from Spigot-Server-Patches/0367-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0366-Configurable-projectile-relative-velocity.patch
diff --git a/Spigot-Server-Patches/0368-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0367-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 100%
rename from Spigot-Server-Patches/0368-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0367-Mark-entities-as-being-ticked-when-notifying-navigat.patch
diff --git a/Spigot-Server-Patches/0369-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0368-offset-item-frame-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0369-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0368-offset-item-frame-ticking.patch
diff --git a/Spigot-Server-Patches/0370-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0369-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0370-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0369-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/Spigot-Server-Patches/0371-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0370-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from Spigot-Server-Patches/0371-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0370-Asynchronous-chunk-IO-and-loading.patch
index 6dbd400028..3a5d56f1d2 100644
--- a/Spigot-Server-Patches/0371-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0370-Asynchronous-chunk-IO-and-loading.patch
@@ -199,7 +199,7 @@ index 9ead9b1ea1fafaa3d684c17efbae747386b7c587..9b8b49be032d7ceebcea8d7b98f999ed
                  doChunkInfo(sender, args);
                  break;
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f9b1b198299166759fe0bd0a36d8d88c626e06a4..f4a56028c21427d1164c5777285114a284b5643c 100644
+index 3c034d0354bbc3cb7bd68d499ed01b96f79eeeb8..0f4b4b26bda48084dacff2bf79cc6df288405607 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0372-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0371-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from Spigot-Server-Patches/0372-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0371-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/Spigot-Server-Patches/0373-Reduce-sync-loads.patch b/Spigot-Server-Patches/0372-Reduce-sync-loads.patch
similarity index 100%
rename from Spigot-Server-Patches/0373-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0372-Reduce-sync-loads.patch
diff --git a/Spigot-Server-Patches/0374-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0373-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from Spigot-Server-Patches/0374-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0373-Implement-alternative-item-despawn-rate.patch
diff --git a/Spigot-Server-Patches/0375-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0374-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from Spigot-Server-Patches/0375-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0374-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/Spigot-Server-Patches/0376-Fix-MC-158900.patch b/Spigot-Server-Patches/0375-Fix-MC-158900.patch
similarity index 100%
rename from Spigot-Server-Patches/0376-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0375-Fix-MC-158900.patch
diff --git a/Spigot-Server-Patches/0377-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0376-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from Spigot-Server-Patches/0377-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0376-implement-optional-per-player-mob-spawns.patch
index 4e52f80cc2..5c797c3b66 100644
--- a/Spigot-Server-Patches/0377-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0376-implement-optional-per-player-mob-spawns.patch
@@ -573,7 +573,7 @@ index 55feb186e4f3f7985efdf7c4410ed4232e52733e..dce9c62c0cf37a37994537b74dfdc228
  
              this.p = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 05d73610dc1e0e0c411f9cd6c1118ab5a6bb81ab..f313571ea06fcc77bef92b2c976f651067c5a8d2 100644
+index 81ac825acd266329392bf2ebecb73162942d3a21..18c0957ee66a9c806f4a10fcde582aa43142132e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -87,6 +87,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0378-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0377-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from Spigot-Server-Patches/0378-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0377-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/Spigot-Server-Patches/0379-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0378-Fix-nether-portal-creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0379-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0378-Fix-nether-portal-creation.patch
diff --git a/Spigot-Server-Patches/0380-Generator-Settings.patch b/Spigot-Server-Patches/0379-Generator-Settings.patch
similarity index 100%
rename from Spigot-Server-Patches/0380-Generator-Settings.patch
rename to Spigot-Server-Patches/0379-Generator-Settings.patch
diff --git a/Spigot-Server-Patches/0381-Fix-MC-161754.patch b/Spigot-Server-Patches/0380-Fix-MC-161754.patch
similarity index 100%
rename from Spigot-Server-Patches/0381-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0380-Fix-MC-161754.patch
diff --git a/Spigot-Server-Patches/0382-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0381-Performance-improvement-for-Chunk.getEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0382-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0381-Performance-improvement-for-Chunk.getEntities.patch
diff --git a/Spigot-Server-Patches/0383-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0382-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from Spigot-Server-Patches/0383-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0382-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/Spigot-Server-Patches/0384-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0383-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0384-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0383-Expose-the-internal-current-tick.patch
diff --git a/Spigot-Server-Patches/0385-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0384-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from Spigot-Server-Patches/0385-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0384-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/Spigot-Server-Patches/0386-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0385-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from Spigot-Server-Patches/0386-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0385-Add-option-to-disable-pillager-patrols.patch
diff --git a/Spigot-Server-Patches/0387-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0386-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from Spigot-Server-Patches/0387-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0386-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/Spigot-Server-Patches/0388-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0387-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0388-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0387-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-Server-Patches/0389-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0388-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from Spigot-Server-Patches/0389-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0388-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/Spigot-Server-Patches/0390-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0389-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from Spigot-Server-Patches/0390-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0389-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/Spigot-Server-Patches/0391-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0390-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from Spigot-Server-Patches/0391-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0390-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/Spigot-Server-Patches/0392-Optimize-Hoppers.patch b/Spigot-Server-Patches/0391-Optimize-Hoppers.patch
similarity index 100%
rename from Spigot-Server-Patches/0392-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0391-Optimize-Hoppers.patch
diff --git a/Spigot-Server-Patches/0393-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0392-PlayerDeathEvent-shouldDropExperience.patch
similarity index 90%
rename from Spigot-Server-Patches/0393-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0392-PlayerDeathEvent-shouldDropExperience.patch
index 4de309f840..99cb7bdb17 100644
--- a/Spigot-Server-Patches/0393-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0392-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 50e751cce467d043965b126b37d0e0d86c735328..036b9e56ab3272db790bfb932c681e81e5d05ec2 100644
+index 05723df2e94e40e0e23f9a180068455a4f4722b6..d9e45d0dfb4be8b39161b626400e9551643d7f2f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -692,7 +692,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0394-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0393-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from Spigot-Server-Patches/0394-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0393-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/Spigot-Server-Patches/0395-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0394-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from Spigot-Server-Patches/0395-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0394-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/Spigot-Server-Patches/0396-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0395-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from Spigot-Server-Patches/0396-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0395-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/Spigot-Server-Patches/0397-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0396-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from Spigot-Server-Patches/0397-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0396-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/Spigot-Server-Patches/0398-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0397-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from Spigot-Server-Patches/0398-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0397-Fix-items-not-falling-correctly.patch
diff --git a/Spigot-Server-Patches/0399-Lag-compensate-eating.patch b/Spigot-Server-Patches/0398-Lag-compensate-eating.patch
similarity index 100%
rename from Spigot-Server-Patches/0399-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0398-Lag-compensate-eating.patch
diff --git a/Spigot-Server-Patches/0400-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0399-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from Spigot-Server-Patches/0400-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0399-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/Spigot-Server-Patches/0401-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0400-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0401-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0400-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/Spigot-Server-Patches/0402-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0401-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-Server-Patches/0402-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0401-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-Server-Patches/0403-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0402-Tracking-Range-Improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0403-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0402-Tracking-Range-Improvements.patch
diff --git a/Spigot-Server-Patches/0404-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0403-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from Spigot-Server-Patches/0404-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0403-Entity-Activation-Range-2.0.patch
diff --git a/Spigot-Server-Patches/0405-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0404-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from Spigot-Server-Patches/0405-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0404-Fix-items-vanishing-through-end-portal.patch
diff --git a/Spigot-Server-Patches/0406-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0405-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from Spigot-Server-Patches/0406-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0405-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/Spigot-Server-Patches/0407-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0406-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0407-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0406-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/Spigot-Server-Patches/0408-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0407-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0408-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0407-Allow-overriding-the-java-version-check.patch
diff --git a/Spigot-Server-Patches/0409-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0408-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0409-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0408-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-Server-Patches/0410-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0409-Optimise-random-block-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0410-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0409-Optimise-random-block-ticking.patch
diff --git a/Spigot-Server-Patches/0411-Entity-Jump-API.patch b/Spigot-Server-Patches/0410-Entity-Jump-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0411-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0410-Entity-Jump-API.patch
diff --git a/Spigot-Server-Patches/0412-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0411-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0412-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0411-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/Spigot-Server-Patches/0413-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0412-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from Spigot-Server-Patches/0413-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0412-Make-the-GUI-graph-fancier.patch
diff --git a/Spigot-Server-Patches/0414-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0413-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0414-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0413-add-hand-to-BlockMultiPlaceEvent.patch
index 75f07134f3..f1cc36990d 100644
--- a/Spigot-Server-Patches/0414-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/Spigot-Server-Patches/0413-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 460f473b0158f2392261a55db12fa735969de470..ded7ac09b161135885189e1fb71403ef4856ad30 100644
+index 4d82634cc4f1f4ef16cb027c7edfc8b7638311b5..2f1fa0587636c594d3f15fa6bdfabaca3d98017c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -336,13 +336,18 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0415-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0414-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0415-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0414-Prevent-teleporting-dead-entities.patch
diff --git a/Spigot-Server-Patches/0416-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0415-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from Spigot-Server-Patches/0416-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0415-Validate-tripwire-hook-placement-before-update.patch
diff --git a/Spigot-Server-Patches/0417-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0416-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0417-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0416-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/Spigot-Server-Patches/0418-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0417-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from Spigot-Server-Patches/0418-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0417-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/Spigot-Server-Patches/0419-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0418-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from Spigot-Server-Patches/0419-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0418-Optimise-Chunk-getFluid.patch
diff --git a/Spigot-Server-Patches/0420-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0419-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from Spigot-Server-Patches/0420-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0419-Optimise-TickListServer-by-rewriting-it.patch
index 1a0638be3a..8d80d5d0a4 100644
--- a/Spigot-Server-Patches/0420-Optimise-TickListServer-by-rewriting-it.patch
+++ b/Spigot-Server-Patches/0419-Optimise-TickListServer-by-rewriting-it.patch
@@ -42,7 +42,7 @@ sets the excessive tick delay to the specified ticks (defaults to
 60 * 20 ticks, aka 60 seconds)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f4a56028c21427d1164c5777285114a284b5643c..ee1a690c1b12f28a5282a61917d28deb3ca08f61 100644
+index 0f4b4b26bda48084dacff2bf79cc6df288405607..2901236b1c6bd5d27c9d40f9e5b3756144e14faa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -349,6 +349,13 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0421-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0420-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from Spigot-Server-Patches/0421-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0420-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 544c72345f..6c087a0220 100644
--- a/Spigot-Server-Patches/0421-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/Spigot-Server-Patches/0420-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -36,7 +36,7 @@ index b633d74450c40bcc8831836f79a7a2daa43e3d35..6c80906d0cf3594a30aa201793a16a29
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 036b9e56ab3272db790bfb932c681e81e5d05ec2..4bf0c25bc258f01fe05a48f3e879a1c5b7d1d8ee 100644
+index d9e45d0dfb4be8b39161b626400e9551643d7f2f..5ca93afddf8cf410d7e4b385d0ca7dde3db917ee 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -83,6 +83,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0422-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0421-Ensure-Entity-is-never-double-registered.patch
similarity index 100%
rename from Spigot-Server-Patches/0422-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0421-Ensure-Entity-is-never-double-registered.patch
diff --git a/Spigot-Server-Patches/0423-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0422-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0423-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0422-Fix-unregistering-entities-from-unloading-chunks.patch
diff --git a/Spigot-Server-Patches/0424-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0423-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0424-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0423-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/Spigot-Server-Patches/0425-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0424-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from Spigot-Server-Patches/0425-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0424-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/Spigot-Server-Patches/0426-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0425-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0426-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0425-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/Spigot-Server-Patches/0427-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0426-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0427-Optimize-Collision-to-not-load-chunks.patch
rename to Spigot-Server-Patches/0426-Optimize-Collision-to-not-load-chunks.patch
diff --git a/Spigot-Server-Patches/0428-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0427-Don-t-tick-dead-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0428-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0427-Don-t-tick-dead-players.patch
index 5cd1bb3158..b661f2c511 100644
--- a/Spigot-Server-Patches/0428-Don-t-tick-dead-players.patch
+++ b/Spigot-Server-Patches/0427-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4bf0c25bc258f01fe05a48f3e879a1c5b7d1d8ee..dfef674d64a0d7e546e6360b134699074a7e39b0 100644
+index 5ca93afddf8cf410d7e4b385d0ca7dde3db917ee..799d507643acd6a89ddeb93be142ef4efffd64d3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -473,7 +473,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0429-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0428-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0429-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0428-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/Spigot-Server-Patches/0430-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0429-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0430-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0429-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/Spigot-Server-Patches/0431-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0430-Increase-Light-Queue-Size.patch
similarity index 100%
rename from Spigot-Server-Patches/0431-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0430-Increase-Light-Queue-Size.patch
diff --git a/Spigot-Server-Patches/0432-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0431-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 99%
rename from Spigot-Server-Patches/0432-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0431-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
index b81ce061f9..11871129ff 100644
--- a/Spigot-Server-Patches/0432-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
+++ b/Spigot-Server-Patches/0431-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
@@ -42,7 +42,7 @@ index 11fe3524f38f7756ebd0e3807678e8848fd2217d..884b59d478aa7de49906520e77866a79
      public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions");
      public static final Timing connectionTimer = Timings.ofSafe("Connection Handler");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ee1a690c1b12f28a5282a61917d28deb3ca08f61..7b37f46b29699603629e5e635be89f725f163f00 100644
+index 2901236b1c6bd5d27c9d40f9e5b3756144e14faa..56b32e2319c5f89d12c0ca4ea0211c6d7cbb366f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -405,4 +405,9 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0433-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0432-Don-t-move-existing-players-to-world-spawn.patch
similarity index 93%
rename from Spigot-Server-Patches/0433-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0432-Don-t-move-existing-players-to-world-spawn.patch
index 490292c3b6..fb6858882a 100644
--- a/Spigot-Server-Patches/0433-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0432-Don-t-move-existing-players-to-world-spawn.patch
@@ -10,7 +10,7 @@ larger than the keep loaded range.
 By skipping this, we avoid potential for a large spike on server start.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index dfef674d64a0d7e546e6360b134699074a7e39b0..8a91f76c2c49527ff450ddfc200d01982e18ac17 100644
+index 799d507643acd6a89ddeb93be142ef4efffd64d3..350590dad779f7395941ea24f025ce2d7155833d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -120,7 +120,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -40,7 +40,7 @@ index dfef674d64a0d7e546e6360b134699074a7e39b0..8a91f76c2c49527ff450ddfc200d0198
          this.playerInteractManager.a((WorldServer) world);
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f08de96267ca3bdc7fe4ed1f024b39df3facf0ed..bf8df178256e5eebbdadfd53e2f0edbfced0aba3 100644
+index bf14839c99a2c2336bba4a12ee49d4c7c79c30c9..c11e941ba1ab12507ca5acbcaf034a6dfd97bbca 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -134,6 +134,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0434-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0433-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from Spigot-Server-Patches/0434-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0433-Add-tick-times-API-and-mspt-command.patch
index e12ed8766a..bf071a3f5f 100644
--- a/Spigot-Server-Patches/0434-Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/0433-Add-tick-times-API-and-mspt-command.patch
@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7b37f46b29699603629e5e635be89f725f163f00..093605fe8e079d9ec973702c55ea6caddf0369f1 100644
+index 56b32e2319c5f89d12c0ca4ea0211c6d7cbb366f..273ed1c5537a69256f1020646f5cd0c13d50f170 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -69,6 +69,7 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0435-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0434-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-Server-Patches/0435-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0434-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-Server-Patches/0436-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0435-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0436-Add-Raw-Byte-ItemStack-Serialization.patch
rename to Spigot-Server-Patches/0435-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/Spigot-Server-Patches/0437-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0436-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from Spigot-Server-Patches/0437-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0436-Remove-streams-from-Mob-AI-System.patch
diff --git a/Spigot-Server-Patches/0438-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0437-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0438-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0437-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
diff --git a/Spigot-Server-Patches/0439-Async-command-map-building.patch b/Spigot-Server-Patches/0438-Async-command-map-building.patch
similarity index 100%
rename from Spigot-Server-Patches/0439-Async-command-map-building.patch
rename to Spigot-Server-Patches/0438-Async-command-map-building.patch
diff --git a/Spigot-Server-Patches/0440-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0439-Improved-Watchdog-Support.patch
similarity index 100%
rename from Spigot-Server-Patches/0440-Improved-Watchdog-Support.patch
rename to Spigot-Server-Patches/0439-Improved-Watchdog-Support.patch
diff --git a/Spigot-Server-Patches/0441-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0440-Optimize-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0441-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0440-Optimize-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0442-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0441-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0442-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0441-Reduce-Either-Optional-allocation.patch
diff --git a/Spigot-Server-Patches/0443-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0442-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0443-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0442-Remove-streams-from-PairedQueue.patch
diff --git a/Spigot-Server-Patches/0444-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0443-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from Spigot-Server-Patches/0444-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0443-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/Spigot-Server-Patches/0445-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0444-Prevent-opening-inventories-when-frozen.patch
similarity index 97%
rename from Spigot-Server-Patches/0445-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0444-Prevent-opening-inventories-when-frozen.patch
index a4609f7a1c..bcc8dae652 100644
--- a/Spigot-Server-Patches/0445-Prevent-opening-inventories-when-frozen.patch
+++ b/Spigot-Server-Patches/0444-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8a91f76c2c49527ff450ddfc200d01982e18ac17..87a74f390ed68fd3d3c51f39557669d7c2f75c0c 100644
+index 350590dad779f7395941ea24f025ce2d7155833d..3f2d82ce7ed15ea8b8f718b38bfa2afb8ec225e8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -424,7 +424,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0446-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0445-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from Spigot-Server-Patches/0446-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0445-Optimise-ArraySetSorted-removeIf.patch
diff --git a/Spigot-Server-Patches/0447-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0446-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0447-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0446-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0448-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0447-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 100%
rename from Spigot-Server-Patches/0448-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0447-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
diff --git a/Spigot-Server-Patches/0449-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0448-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from Spigot-Server-Patches/0449-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0448-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/Spigot-Server-Patches/0450-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0449-Implement-Player-Client-Options-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0450-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0449-Implement-Player-Client-Options-API.patch
index 25c488e6e2..a305f3fa33 100644
--- a/Spigot-Server-Patches/0450-Implement-Player-Client-Options-API.patch
+++ b/Spigot-Server-Patches/0449-Implement-Player-Client-Options-API.patch
@@ -98,7 +98,7 @@ index eae7bfa171e648b8ec51465a8d9f7d9b7c59a2c9..ce4ebc96c01f3dacf4e4d0569d86f521
      protected static final DataWatcherObject<NBTTagCompound> bk = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
      protected static final DataWatcherObject<NBTTagCompound> bl = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 87a74f390ed68fd3d3c51f39557669d7c2f75c0c..1bd77af8cf2152eee43684280db7e16e5bcad0f9 100644
+index 3f2d82ce7ed15ea8b8f718b38bfa2afb8ec225e8..de7d0d468e843f671655d01b283a27003d8b4a73 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -149,7 +149,7 @@ index dbc3552d50c4129e1844c8a379ab5ba396645f52..87ec3987d4b6de836016e91ef90383e3
          return this.e;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 747dd3c06d24b395d9d940413fe47a63b66e65d0..ff18c2d8c4752149ace290495d130e12baa52756 100644
+index 748b1c12ccee67a35232cf7a48e68ef7f34147c7..e905aa4d668f51f0e0d2d140fcac54e5038aebfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,8 @@
diff --git a/Spigot-Server-Patches/0451-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0450-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from Spigot-Server-Patches/0451-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0450-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/Spigot-Server-Patches/0452-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0451-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0452-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0451-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/Spigot-Server-Patches/0453-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0452-Broadcast-join-message-to-console.patch
similarity index 92%
rename from Spigot-Server-Patches/0453-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0452-Broadcast-join-message-to-console.patch
index 84ce751921..e2ab2b099d 100644
--- a/Spigot-Server-Patches/0453-Broadcast-join-message-to-console.patch
+++ b/Spigot-Server-Patches/0452-Broadcast-join-message-to-console.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f76bbac925aef6d1e917195ed2f2b4da1d3d7b52..7e63e062bafb838e5c817bf5eb794cee522b369b 100644
+index 0b3ab0ecd263137a789c3d58db6a658666534e89..5943d1a319e0b9f576dd75773b2555a38a00f5ad 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -211,9 +211,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0454-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0453-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0454-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0453-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 5ebc630ce8..a28b901d92 100644
--- a/Spigot-Server-Patches/0454-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/Spigot-Server-Patches/0453-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1bd77af8cf2152eee43684280db7e16e5bcad0f9..9f5ac100ed011b8d5802aebfbc488bdecf9b0586 100644
+index de7d0d468e843f671655d01b283a27003d8b4a73..f128e30e22c0a084124dcddc785162e13242dc8b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -106,6 +106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -52,7 +52,7 @@ index 842f5ebad2a4d040b9912ec4841de426667cd91d..c2abf8dca89f3a4f3671e21b2cbfe9c7
          if (!(entity instanceof EntityComplexPart)) {
              EntityTypes<?> entitytypes = entity.getEntityType();
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7e63e062bafb838e5c817bf5eb794cee522b369b..4995fa3fda87dfb47c8050e57ca29a895b809482 100644
+index 5943d1a319e0b9f576dd75773b2555a38a00f5ad..34ec86448b8351792631a66d5078680f9d73a5f2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -200,6 +200,12 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0455-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0454-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from Spigot-Server-Patches/0455-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0454-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/Spigot-Server-Patches/0456-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 100%
rename from Spigot-Server-Patches/0456-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
diff --git a/Spigot-Server-Patches/0457-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0456-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0457-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0456-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-Server-Patches/0458-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 100%
rename from Spigot-Server-Patches/0458-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/Spigot-Server-Patches/0459-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/0459-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/0460-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/0460-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/0461-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/0461-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 d77292a1e0..d9e47b4f20 100644
--- a/Spigot-Server-Patches/0461-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/Spigot-Server-Patches/0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -88,7 +88,7 @@ index 5c3d2bbf7b2ae22347d251c90c85388779c2cd44..937fa3c69a5cba2fc2fa4506dc34ff8a
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ded7ac09b161135885189e1fb71403ef4856ad30..65de5c4e5ffb993d85af2410c44d0149878b6859 100644
+index 2f1fa0587636c594d3f15fa6bdfabaca3d98017c..9127df12252bbd619d97db996a88ae91da9d3345 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -811,7 +811,8 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0462-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0461-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0462-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0461-Implement-Brigadier-Mojang-API.patch
diff --git a/Spigot-Server-Patches/0463-Villager-Restocks-API.patch b/Spigot-Server-Patches/0462-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0463-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0462-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0464-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0463-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0464-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0463-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/Spigot-Server-Patches/0465-Expose-game-version.patch b/Spigot-Server-Patches/0464-Expose-game-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0465-Expose-game-version.patch
rename to Spigot-Server-Patches/0464-Expose-game-version.patch
diff --git a/Spigot-Server-Patches/0466-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0465-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0466-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0465-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0467-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 100%
rename from Spigot-Server-Patches/0467-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
diff --git a/Spigot-Server-Patches/0468-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch
diff --git a/Spigot-Server-Patches/0469-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/0469-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/0470-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 99%
rename from Spigot-Server-Patches/0470-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch
index 1559f77055..82ea15bf38 100644
--- a/Spigot-Server-Patches/0470-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -148,7 +148,7 @@ index 893a835593af2ea95a50607c8c2f2cdb9af6c944..c54175eaad6230a1098e9b912e0b4788
                              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ebf532d6bc2faea310c373d1526db4e963e90438..98fddca0b906221d34dd7683d83920bbc8f0d70c 100644
+index aef385243ac031d2636cf438ea4885f5608144d0..c2babc4a70b46a88fdd5fd0bfdc8398b29b90253 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -115,6 +115,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0471-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/0471-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/0472-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0471-No-Tick-view-distance-implementation.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0471-No-Tick-view-distance-implementation.patch
diff --git a/Spigot-Server-Patches/0473-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0472-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0472-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0474-Fix-Light-Command.patch b/Spigot-Server-Patches/0473-Fix-Light-Command.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0473-Fix-Light-Command.patch
diff --git a/Spigot-Server-Patches/0475-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/0475-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0474-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0476-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/0476-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0475-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0477-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0476-Don-t-toString-block-unless-actually-showing-the-mes.patch
similarity index 100%
rename from Spigot-Server-Patches/0477-Don-t-toString-block-unless-actually-showing-the-mes.patch
rename to Spigot-Server-Patches/0476-Don-t-toString-block-unless-actually-showing-the-mes.patch
diff --git a/Spigot-Server-Patches/0478-Potential-bed-API.patch b/Spigot-Server-Patches/0477-Potential-bed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Potential-bed-API.patch
rename to Spigot-Server-Patches/0477-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0479-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0478-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0478-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/Spigot-Server-Patches/0480-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0479-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0480-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0479-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0481-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0480-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from Spigot-Server-Patches/0481-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0480-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 81a9389066..61cd58d382 100644
--- a/Spigot-Server-Patches/0481-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/Spigot-Server-Patches/0480-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 093605fe8e079d9ec973702c55ea6caddf0369f1..3d63215a855c71d257b18a247eb7f0b2d7908bce 100644
+index 273ed1c5537a69256f1020646f5cd0c13d50f170..e750aedfad992635019d1abd7c880f4829b1e41d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -411,4 +411,17 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0482-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0481-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0481-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0483-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0482-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0482-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0484-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0483-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0484-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0483-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0485-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0484-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0484-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0486-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0485-Add-option-for-console-having-all-permissions.patch
similarity index 96%
rename from Spigot-Server-Patches/0486-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0485-Add-option-for-console-having-all-permissions.patch
index 5b79a61f25..0eba836a8f 100644
--- a/Spigot-Server-Patches/0486-Add-option-for-console-having-all-permissions.patch
+++ b/Spigot-Server-Patches/0485-Add-option-for-console-having-all-permissions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3d63215a855c71d257b18a247eb7f0b2d7908bce..f2f0b9f011bf5b5aa7d80c605cc885104bb934f8 100644
+index e750aedfad992635019d1abd7c880f4829b1e41d..d393e37f50e2815da6b486ff0c3e277fa3413f3e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -424,4 +424,9 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0487-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/0487-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/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/Spigot-Server-Patches/0489-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0488-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0488-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0490-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0489-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from Spigot-Server-Patches/0490-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0489-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/Spigot-Server-Patches/0491-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0490-Improve-Chunk-Status-Transition-Speed.patch
similarity index 97%
rename from Spigot-Server-Patches/0491-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0490-Improve-Chunk-Status-Transition-Speed.patch
index 41710bc3d6..7e27534594 100644
--- a/Spigot-Server-Patches/0491-Improve-Chunk-Status-Transition-Speed.patch
+++ b/Spigot-Server-Patches/0490-Improve-Chunk-Status-Transition-Speed.patch
@@ -36,7 +36,7 @@ scenario / path:
 Previously would have hopped to SERVER around 12+ times there extra.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index c3621d9d410c23da5db024254311864680465125..1f14ebf09de9f2671b30498ea8fd66750ae85dff 100644
+index ca9e0208aa35c597a947485f67213ff4b1b1185f..7de56172023e49cd8957e3dd45fa8e731809c16a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -58,6 +58,13 @@ public class PlayerChunk {
@@ -54,7 +54,7 @@ index c3621d9d410c23da5db024254311864680465125..1f14ebf09de9f2671b30498ea8fd6675
      // Paper start - no-tick view distance
      public final Chunk getSendingChunk() {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 753d67c8a711d293bd70eb913c47ec817e2718e3..7c7b23590735d31cefda5cced96d4e874c06c8f2 100644
+index b6ae589548bdc75052f4986069b3374cb5fd837c..c44eeaae0cff03ae5cfa53b3c0f240ef5e982083 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -741,7 +741,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0492-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0491-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0491-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0493-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0492-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0492-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0494-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0493-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from Spigot-Server-Patches/0494-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0493-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/Spigot-Server-Patches/0495-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0494-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0494-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0496-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0495-Optimize-Light-Engine.patch
similarity index 99%
rename from Spigot-Server-Patches/0496-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0495-Optimize-Light-Engine.patch
index 3858156ed8..6adcb958b1 100644
--- a/Spigot-Server-Patches/0496-Optimize-Light-Engine.patch
+++ b/Spigot-Server-Patches/0495-Optimize-Light-Engine.patch
@@ -1341,7 +1341,7 @@ index 7de56172023e49cd8957e3dd45fa8e731809c16a..8146d88a90a758760e383985170d5803
          if (getCurrentPriority() != priority) {
              this.u.a(this.location, this::getCurrentPriority, priority, this::setPriority); // use preferred priority
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 7c7b23590735d31cefda5cced96d4e874c06c8f2..fcd3388d88aad6e897b73e2c823267ada327cbda 100644
+index c44eeaae0cff03ae5cfa53b3c0f240ef5e982083..6c399bcea03e839bf2f21e92b5d76d46b7088667 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -277,6 +277,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0497-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0496-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0496-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/Spigot-Server-Patches/0498-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0497-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0498-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0497-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/Spigot-Server-Patches/0499-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0498-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0498-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0500-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0499-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0500-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0499-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0501-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0500-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 98%
rename from Spigot-Server-Patches/0501-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0500-Fix-piston-physics-inconsistency-MC-188840.patch
index d283ab77e8..cedc5efb3d 100644
--- a/Spigot-Server-Patches/0501-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/Spigot-Server-Patches/0500-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f2f0b9f011bf5b5aa7d80c605cc885104bb934f8..56e4359ba32339e1bef58061585ff3e12e4215f3 100644
+index d393e37f50e2815da6b486ff0c3e277fa3413f3e..53b62057a3edc3c211c4bade3a01fb065a523fcf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -429,4 +429,10 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0502-Fix-sand-duping.patch b/Spigot-Server-Patches/0501-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0501-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0503-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0502-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0502-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/Spigot-Server-Patches/0504-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0503-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0503-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0505-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0504-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0504-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0506-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0505-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0505-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0507-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0506-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0507-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0506-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/Spigot-Server-Patches/0508-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0507-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0507-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0509-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0508-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0509-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0508-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0510-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0509-Add-permission-for-command-blocks.patch
similarity index 100%
rename from Spigot-Server-Patches/0510-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0509-Add-permission-for-command-blocks.patch
diff --git a/Spigot-Server-Patches/0511-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0510-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0510-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/Spigot-Server-Patches/0512-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0511-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0512-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0511-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/Spigot-Server-Patches/0513-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0512-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0513-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0512-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/Spigot-Server-Patches/0514-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0513-Paper-dumpitem-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Paper-dumpitem-command.patch
rename to Spigot-Server-Patches/0513-Paper-dumpitem-command.patch
diff --git a/Spigot-Server-Patches/0515-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0514-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from Spigot-Server-Patches/0515-Don-t-allow-null-UUID-s-for-chat.patch
rename to Spigot-Server-Patches/0514-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0516-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0515-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Improve-Legacy-Component-serialization-size.patch
rename to Spigot-Server-Patches/0515-Improve-Legacy-Component-serialization-size.patch
diff --git a/Spigot-Server-Patches/0517-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0516-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Support-old-UUID-format-for-NBT.patch
rename to Spigot-Server-Patches/0516-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0518-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0517-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Clean-up-duplicated-GameProfile-Properties.patch
rename to Spigot-Server-Patches/0517-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0519-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0518-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Convert-legacy-attributes-in-Item-Meta.patch
rename to Spigot-Server-Patches/0518-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0520-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0519-Remove-some-streams-from-structures.patch
similarity index 100%
rename from Spigot-Server-Patches/0520-Remove-some-streams-from-structures.patch
rename to Spigot-Server-Patches/0519-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0521-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0520-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from Spigot-Server-Patches/0521-Remove-streams-from-classes-related-villager-gossip.patch
rename to Spigot-Server-Patches/0520-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0522-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0521-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0522-Support-components-in-ItemMeta.patch
rename to Spigot-Server-Patches/0521-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0523-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0522-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from Spigot-Server-Patches/0523-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to Spigot-Server-Patches/0522-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0524-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0523-Add-entity-liquid-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Add-entity-liquid-API.patch
rename to Spigot-Server-Patches/0523-Add-entity-liquid-API.patch
diff --git a/Spigot-Server-Patches/0525-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0524-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from Spigot-Server-Patches/0525-Update-itemstack-legacy-name-and-lore.patch
rename to Spigot-Server-Patches/0524-Update-itemstack-legacy-name-and-lore.patch
diff --git a/Spigot-Server-Patches/0526-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0525-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from Spigot-Server-Patches/0526-Spawn-player-in-correct-world-on-login.patch
rename to Spigot-Server-Patches/0525-Spawn-player-in-correct-world-on-login.patch
index 6805ba6a55..400d5108fd 100644
--- a/Spigot-Server-Patches/0526-Spawn-player-in-correct-world-on-login.patch
+++ b/Spigot-Server-Patches/0525-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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3e11c9ca6efde2347a963177f325b1efa67eb4f8..3a38e3fc1f59cee5505c6ad7174c7014ec8efc25 100644
+index a7e3a89a25771e4650bf7d44fe006825f8e766ec..52322b3e9963b9e1b899a84fbb95bbaf048f8ad6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -119,7 +119,18 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0527-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0526-Add-PrepareResultEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0527-Add-PrepareResultEvent.patch
rename to Spigot-Server-Patches/0526-Add-PrepareResultEvent.patch
diff --git a/Spigot-Server-Patches/0528-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0527-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from Spigot-Server-Patches/0528-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-Server-Patches/0527-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-Server-Patches/0529-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0528-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from Spigot-Server-Patches/0529-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to Spigot-Server-Patches/0528-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/Spigot-Server-Patches/0530-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0529-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0530-Optimize-NetworkManager-Exception-Handling.patch
rename to Spigot-Server-Patches/0529-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0531-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0530-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from Spigot-Server-Patches/0531-Fix-Concurrency-issue-in-WeightedList.patch
rename to Spigot-Server-Patches/0530-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0532-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0531-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0532-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to Spigot-Server-Patches/0531-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0533-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0532-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from Spigot-Server-Patches/0533-Fix-arrows-never-despawning-MC-125757.patch
rename to Spigot-Server-Patches/0532-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/Spigot-Server-Patches/0534-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0533-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0534-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to Spigot-Server-Patches/0533-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0535-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0534-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from Spigot-Server-Patches/0535-Move-range-check-for-block-placing-up.patch
rename to Spigot-Server-Patches/0534-Move-range-check-for-block-placing-up.patch
diff --git a/Spigot-Server-Patches/0536-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0535-Fix-SPIGOT-5989.patch
similarity index 100%
rename from Spigot-Server-Patches/0536-Fix-SPIGOT-5989.patch
rename to Spigot-Server-Patches/0535-Fix-SPIGOT-5989.patch
diff --git a/Spigot-Server-Patches/0537-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0536-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from Spigot-Server-Patches/0537-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to Spigot-Server-Patches/0536-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/Spigot-Server-Patches/0538-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0537-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0538-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to Spigot-Server-Patches/0537-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/Spigot-Server-Patches/0539-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0538-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from Spigot-Server-Patches/0539-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to Spigot-Server-Patches/0538-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0540-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0539-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from Spigot-Server-Patches/0540-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to Spigot-Server-Patches/0539-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/Spigot-Server-Patches/0541-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0540-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from Spigot-Server-Patches/0541-Fix-some-rails-connecting-improperly.patch
rename to Spigot-Server-Patches/0540-Fix-some-rails-connecting-improperly.patch
diff --git a/Spigot-Server-Patches/0542-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0541-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from Spigot-Server-Patches/0542-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to Spigot-Server-Patches/0541-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/Spigot-Server-Patches/0543-Incremental-player-saving.patch b/Spigot-Server-Patches/0542-Incremental-player-saving.patch
similarity index 98%
rename from Spigot-Server-Patches/0543-Incremental-player-saving.patch
rename to Spigot-Server-Patches/0542-Incremental-player-saving.patch
index f432e5f4f0..3c19340872 100644
--- a/Spigot-Server-Patches/0543-Incremental-player-saving.patch
+++ b/Spigot-Server-Patches/0542-Incremental-player-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Incremental player saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 56e4359ba32339e1bef58061585ff3e12e4215f3..60f03502a7fd622d2de3b2da9fe8014b289f3d31 100644
+index 53b62057a3edc3c211c4bade3a01fb065a523fcf..669653b5cfb057b277e509b630fd73a843b42b24 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -435,4 +435,15 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0544-Import-fastutil-classes.patch b/Spigot-Server-Patches/0543-Import-fastutil-classes.patch
similarity index 100%
rename from Spigot-Server-Patches/0544-Import-fastutil-classes.patch
rename to Spigot-Server-Patches/0543-Import-fastutil-classes.patch
diff --git a/Spigot-Server-Patches/0545-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0544-Don-t-mark-null-chunk-sections-for-block-updates.patch
similarity index 92%
rename from Spigot-Server-Patches/0545-Don-t-mark-null-chunk-sections-for-block-updates.patch
rename to Spigot-Server-Patches/0544-Don-t-mark-null-chunk-sections-for-block-updates.patch
index ae133d2f20..ffd3355802 100644
--- a/Spigot-Server-Patches/0545-Don-t-mark-null-chunk-sections-for-block-updates.patch
+++ b/Spigot-Server-Patches/0544-Don-t-mark-null-chunk-sections-for-block-updates.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark null chunk sections for block updates
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index de1e409dc5161371c6f14d036603be448fcd3e26..31684667a6a76fc83feb657def40bd34599ae159 100644
+index 8146d88a90a758760e383985170d580372577615..c69b5a2c7b8061a65b2d5bb7ceb3ffe39dc36b8c 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -420,6 +420,7 @@ public class PlayerChunk {
diff --git a/Spigot-Server-Patches/0546-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0545-Remove-armour-stand-double-add-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0546-Remove-armour-stand-double-add-to-world.patch
rename to Spigot-Server-Patches/0545-Remove-armour-stand-double-add-to-world.patch
diff --git a/Spigot-Server-Patches/0547-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0546-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from Spigot-Server-Patches/0547-Fix-MC-187716-Use-configured-height.patch
rename to Spigot-Server-Patches/0546-Fix-MC-187716-Use-configured-height.patch
diff --git a/Spigot-Server-Patches/0548-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch b/Spigot-Server-Patches/0547-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
rename to Spigot-Server-Patches/0547-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
diff --git a/Spigot-Server-Patches/0549-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0548-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0549-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to Spigot-Server-Patches/0548-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/Spigot-Server-Patches/0550-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0549-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0550-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to Spigot-Server-Patches/0549-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/Spigot-Server-Patches/0551-Brand-support.patch b/Spigot-Server-Patches/0550-Brand-support.patch
similarity index 97%
rename from Spigot-Server-Patches/0551-Brand-support.patch
rename to Spigot-Server-Patches/0550-Brand-support.patch
index 3fb2edae2f..bf1ff7e1b5 100644
--- a/Spigot-Server-Patches/0551-Brand-support.patch
+++ b/Spigot-Server-Patches/0550-Brand-support.patch
@@ -65,7 +65,7 @@ index 45cf34c35af9d2ae9a60ff81af5bea3495d4621f..16664a446192c77903ff1f10989c7afa
          return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9a812b34698feb7d09f1063a913363b3ea6820eb..c756b2f3faf253420b4d5737389acaa2f38b34ab 100644
+index 0c45159eb7747d943dc45efc60f5dc7d72b8f022..da32f4affd381b08bd50e5882abffa58575737dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2143,6 +2143,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0552-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0551-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
similarity index 100%
rename from Spigot-Server-Patches/0552-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
rename to Spigot-Server-Patches/0551-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
diff --git a/Spigot-Server-Patches/0553-Fix-MC-197271.patch b/Spigot-Server-Patches/0552-Fix-MC-197271.patch
similarity index 100%
rename from Spigot-Server-Patches/0553-Fix-MC-197271.patch
rename to Spigot-Server-Patches/0552-Fix-MC-197271.patch
diff --git a/Spigot-Server-Patches/0554-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0553-MC-197883-Bandaid-decode-issue.patch
similarity index 100%
rename from Spigot-Server-Patches/0554-MC-197883-Bandaid-decode-issue.patch
rename to Spigot-Server-Patches/0553-MC-197883-Bandaid-decode-issue.patch
diff --git a/Spigot-Server-Patches/0555-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0554-Add-setMaxPlayers-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0555-Add-setMaxPlayers-API.patch
rename to Spigot-Server-Patches/0554-Add-setMaxPlayers-API.patch
index 5569b20a92..2e738f647d 100644
--- a/Spigot-Server-Patches/0555-Add-setMaxPlayers-API.patch
+++ b/Spigot-Server-Patches/0554-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 2ae926d9a2ad99a46409dfa000c6f895600a2616..787e80c50a61d6bd80efd8bd0d4b5140908aaeed 100644
+index eb247855f880049e85372ea8dfcc2bf10d756835..38f26e25cb7d022c0bec5a5928db70611a0d347a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -67,7 +67,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0556-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0555-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0556-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-Server-Patches/0555-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0557-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0556-Don-t-require-FACING-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0557-Don-t-require-FACING-data.patch
rename to Spigot-Server-Patches/0556-Don-t-require-FACING-data.patch
diff --git a/Spigot-Server-Patches/0558-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0557-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from Spigot-Server-Patches/0558-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to Spigot-Server-Patches/0557-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/Spigot-Server-Patches/0559-Add-moon-phase-API.patch b/Spigot-Server-Patches/0558-Add-moon-phase-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0559-Add-moon-phase-API.patch
rename to Spigot-Server-Patches/0558-Add-moon-phase-API.patch
diff --git a/Spigot-Server-Patches/0560-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0559-Prevent-headless-pistons-from-being-created.patch
similarity index 97%
rename from Spigot-Server-Patches/0560-Prevent-headless-pistons-from-being-created.patch
rename to Spigot-Server-Patches/0559-Prevent-headless-pistons-from-being-created.patch
index a2839249da..3bc27df4e1 100644
--- a/Spigot-Server-Patches/0560-Prevent-headless-pistons-from-being-created.patch
+++ b/Spigot-Server-Patches/0559-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 60f03502a7fd622d2de3b2da9fe8014b289f3d31..9fc12595a566f216620a7fb296d2d30e22332689 100644
+index 669653b5cfb057b277e509b630fd73a843b42b24..a01b28d47669cbc36a9e6c47deb5135bec231948 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -436,6 +436,12 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0561-Brand-support.patch b/Spigot-Server-Patches/0560-Brand-support.patch
similarity index 89%
rename from Spigot-Server-Patches/0561-Brand-support.patch
rename to Spigot-Server-Patches/0560-Brand-support.patch
index bc9a522afe..ca109b5443 100644
--- a/Spigot-Server-Patches/0561-Brand-support.patch
+++ b/Spigot-Server-Patches/0560-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c756b2f3faf253420b4d5737389acaa2f38b34ab..b97be51c6859fa2d45c07c853980adb05d11b65f 100644
+index da32f4affd381b08bd50e5882abffa58575737dd..7e91e95941039cce630ed3eb88e1919e1d08c091 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2146,7 +2146,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0562-Add-BellRingEvent.patch b/Spigot-Server-Patches/0561-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0562-Add-BellRingEvent.patch
rename to Spigot-Server-Patches/0561-Add-BellRingEvent.patch
diff --git a/Spigot-Server-Patches/0563-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0562-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from Spigot-Server-Patches/0563-Add-zombie-targets-turtle-egg-config.patch
rename to Spigot-Server-Patches/0562-Add-zombie-targets-turtle-egg-config.patch
diff --git a/Spigot-Server-Patches/0564-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0563-Buffer-joins-to-world.patch
similarity index 96%
rename from Spigot-Server-Patches/0564-Buffer-joins-to-world.patch
rename to Spigot-Server-Patches/0563-Buffer-joins-to-world.patch
index 0de11bc5c3..fd0bf7dbd7 100644
--- a/Spigot-Server-Patches/0564-Buffer-joins-to-world.patch
+++ b/Spigot-Server-Patches/0563-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9fc12595a566f216620a7fb296d2d30e22332689..f65d3545039a2c471819ab5950c171ef6193cdb4 100644
+index a01b28d47669cbc36a9e6c47deb5135bec231948..9be3a3e0752a31ca465e3e50bbdad05951a28739 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -452,4 +452,9 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0565-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0564-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0565-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0564-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0566-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0565-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0566-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to Spigot-Server-Patches/0565-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/Spigot-Server-Patches/0567-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0566-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0567-PortalCreateEvent-needs-to-know-its-entity.patch
rename to Spigot-Server-Patches/0566-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/Spigot-Server-Patches/0568-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0567-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0568-Fix-CraftTeam-null-check.patch
rename to Spigot-Server-Patches/0567-Fix-CraftTeam-null-check.patch
diff --git a/Spigot-Server-Patches/0569-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0568-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0569-Add-more-Evoker-API.patch
rename to Spigot-Server-Patches/0568-Add-more-Evoker-API.patch
diff --git a/Spigot-Server-Patches/0570-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0569-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-Server-Patches/0570-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-Server-Patches/0569-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-Server-Patches/0571-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0570-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0571-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-Server-Patches/0570-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/Spigot-Server-Patches/0572-Cache-block-data-strings.patch b/Spigot-Server-Patches/0571-Cache-block-data-strings.patch
similarity index 100%
rename from Spigot-Server-Patches/0572-Cache-block-data-strings.patch
rename to Spigot-Server-Patches/0571-Cache-block-data-strings.patch
diff --git a/Spigot-Server-Patches/0573-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0572-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from Spigot-Server-Patches/0573-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to Spigot-Server-Patches/0572-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/Spigot-Server-Patches/0574-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch b/Spigot-Server-Patches/0573-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch
similarity index 100%
rename from Spigot-Server-Patches/0574-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch
rename to Spigot-Server-Patches/0573-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch
diff --git a/Spigot-Server-Patches/0575-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0574-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0575-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-Server-Patches/0574-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0576-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0575-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from Spigot-Server-Patches/0576-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to Spigot-Server-Patches/0575-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/Spigot-Server-Patches/0577-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0576-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from Spigot-Server-Patches/0577-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to Spigot-Server-Patches/0576-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/Spigot-Server-Patches/0578-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0577-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 89%
rename from Spigot-Server-Patches/0578-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to Spigot-Server-Patches/0577-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index 9a2ab9414c..8176571527 100644
--- a/Spigot-Server-Patches/0578-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/Spigot-Server-Patches/0577-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086)
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 31684667a6a76fc83feb657def40bd34599ae159..6ef71230ef8fac4d9bc2d48a433521d541027e96 100644
+index c69b5a2c7b8061a65b2d5bb7ceb3ffe39dc36b8c..11a67ca18f566bfc214659e7fb454ea2b4d8a7ad 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -359,6 +359,7 @@ public class PlayerChunk {
diff --git a/Spigot-Server-Patches/0579-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0578-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from Spigot-Server-Patches/0579-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to Spigot-Server-Patches/0578-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/Spigot-Server-Patches/0580-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0579-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 98%
rename from Spigot-Server-Patches/0580-Lazily-track-plugin-scoreboards-by-default.patch
rename to Spigot-Server-Patches/0579-Lazily-track-plugin-scoreboards-by-default.patch
index cec2465246..3d3225b787 100644
--- a/Spigot-Server-Patches/0580-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/Spigot-Server-Patches/0579-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,7 +14,7 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f65d3545039a2c471819ab5950c171ef6193cdb4..e14d71d60c3433c39dcf217d48bd667b2c2b49e1 100644
+index 9be3a3e0752a31ca465e3e50bbdad05951a28739..053da5119404ded5e3cf6bb55967cc8ffba47de6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -457,4 +457,9 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0581-Entity-isTicking.patch b/Spigot-Server-Patches/0580-Entity-isTicking.patch
similarity index 100%
rename from Spigot-Server-Patches/0581-Entity-isTicking.patch
rename to Spigot-Server-Patches/0580-Entity-isTicking.patch
diff --git a/Spigot-Server-Patches/0582-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0581-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from Spigot-Server-Patches/0582-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to Spigot-Server-Patches/0581-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/Spigot-Server-Patches/0583-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0582-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from Spigot-Server-Patches/0583-Fix-Not-a-string-Map-Conversion-spam.patch
rename to Spigot-Server-Patches/0582-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/Spigot-Server-Patches/0584-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0583-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0584-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0583-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0585-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0584-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
similarity index 100%
rename from Spigot-Server-Patches/0585-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
rename to Spigot-Server-Patches/0584-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
diff --git a/Spigot-Server-Patches/0586-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0585-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0586-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to Spigot-Server-Patches/0585-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/Spigot-Server-Patches/0587-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0586-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0587-Fix-for-large-move-vectors-crashing-server.patch
rename to Spigot-Server-Patches/0586-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/Spigot-Server-Patches/0588-Optimise-getType-calls.patch b/Spigot-Server-Patches/0587-Optimise-getType-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0588-Optimise-getType-calls.patch
rename to Spigot-Server-Patches/0587-Optimise-getType-calls.patch
diff --git a/Spigot-Server-Patches/0589-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0588-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0589-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to Spigot-Server-Patches/0588-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/Spigot-Server-Patches/0590-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0589-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from Spigot-Server-Patches/0590-Retain-block-place-order-when-capturing-blockstates.patch
rename to Spigot-Server-Patches/0589-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/Spigot-Server-Patches/0591-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0590-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0591-Reduce-blockpos-allocation-from-pathfinding.patch
rename to Spigot-Server-Patches/0590-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/work/Bukkit b/work/Bukkit
index b45a7eedcf..e461dcfe42 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b45a7eedcfcd975eaa8b75a4d719b220a8263796
+Subproject commit e461dcfe4231846ba4d50bb16bd51505516abdd7
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 29dd68eb99..055870c4bc 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 29dd68eb99bc890790a757d59d07e864dce98a4f
+Subproject commit 055870c4bca477067f9113deb1090228cccf67c6