From 36f34f01c09652b3a55008000302114570473953 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 6 May 2020 06:05:22 -0400
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:
da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots
3abebc9f #492: Let Tameable extend Animals rather than Entity
941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent
4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME

CraftBukkit Changes:
933e9094 #664: Add methods to get/set ItemStacks in EquipmentSlots
18722312 #662: Expose ItemStack and hand used in PlayerShearEntityEvent
---
 .../0027-Access-items-by-EquipmentSlot.patch  | 34 ----------
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  0
 ...t.patch => 0028-EntityPathfindEvent.patch} |  0
 ...ynchronization-in-MetadataStoreBase.patch} |  0
 ...-MetadataStoreBase.removeAll-Plugin.patch} |  0
 ...031-Add-PlayerUseUnknownEntityEvent.patch} |  0
 ...nt-to-allow-plugins-to-handle-clien.patch} |  0
 ...patch => 0033-Arrow-pickup-rule-API.patch} |  0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  0
 ...ble-API.patch => 0035-LootTable-API.patch} |  0
 ...nt.patch => 0036-Add-EntityZapEvent.patch} |  0
 ...Misc-Utils.patch => 0037-Misc-Utils.patch} |  0
 ...-Allow-Reloading-of-Command-Aliases.patch} |  0
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  0
 ... => 0040-Add-ProjectileCollideEvent.patch} |  0
 ...041-Add-String-based-Action-Bar-API.patch} |  0
 ...o-control-if-armour-stands-can-move.patch} |  0
 ...nt.patch => 0043-IllegalPacketEvent.patch} |  0
 ...API-s.patch => 0044-Fireworks-API-s.patch} |  0
 ... 0045-PlayerTeleportEndGatewayEvent.patch} |  0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  0
 ...I-for-Reason-Source-Triggering-play.patch} |  0
 ...rldBorder-isInBounds-Location-check.patch} |  0
 ...-option-to-prevent-player-names-fro.patch} |  0
 ...pstream-javadoc-warnings-and-errors.patch} |  0
 ....patch => 0051-Item-canEntityPickup.patch} |  0
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  0
 ...> 0053-PlayerAttemptPickupItemEvent.patch} |  0
 ...tch => 0054-Add-UnknownCommandEvent.patch} |  0
 ...tch => 0055-Basic-PlayerProfile-API.patch} |  0
 ... 0056-Shoulder-Entities-Release-API.patch} |  0
 ...patch => 0057-Profile-Lookup-Events.patch} |  0
 ...patch => 0058-Entity-fromMobSpawner.patch} |  0
 ...9-Improve-the-Saddle-API-for-Horses.patch} |  0
 ...=> 0060-ensureServerConversions-API.patch} |  0
 ... => 0061-Add-getI18NDisplayName-API.patch} |  0
 ...=> 0062-ProfileWhitelistVerifyEvent.patch} |  0
 ...0063-Make-plugins-list-alphabetical.patch} |  0
 ...atch => 0064-LivingEntity-setKiller.patch} |  0
 ...fixes-in-implementation-logging-con.patch} |  0
 ...ow-plugins-to-use-SLF4J-for-logging.patch} |  0
 ...r-plugins-modifying-the-parent-of-t.patch} |  0
 ...t.patch => 0068-Add-PlayerJumpEvent.patch} |  0
 ...t-protocol-version-and-virtual-host.patch} |  0
 ... => 0070-Add-PlayerArmorChangeEvent.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  0
 ...patch => 0072-AsyncTabCompleteEvent.patch} |  0
 ...ay-warning-on-deprecated-recipe-API.patch} |  0
 ...=> 0074-PlayerPickupExperienceEvent.patch} |  0
 ...tch => 0075-ExperienceOrbMergeEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...patch => 0077-PreCreatureSpawnEvent.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0080-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0082-Add-ArmorStand-Item-Meta.patch} |  0
 ...pers.patch => 0083-Optimize-Hoppers.patch} |  0
 ... 0084-Tameable-getOwnerUniqueId-API.patch} |  6 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  0
 ...d-extended-PaperServerListPingEvent.patch} |  0
 ...=> 0087-Player.setPlayerProfile-API.patch} |  0
 ...patch => 0088-getPlayerUniqueId-API.patch} |  0
 ...support-to-PaperServerListPingEvent.patch} |  0
 ...-method-to-open-already-placed-sign.patch} |  0
 ...1-Add-Ban-Methods-to-Player-Objects.patch} |  0
 ...t.patch => 0092-EndermanEscapeEvent.patch} |  0
 ...h => 0093-Enderman.teleportRandomly.patch} |  0
 ...ional-world.getNearbyEntities-API-s.patch} |  0
 ... => 0095-Location.isChunkLoaded-API.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  0
 ...h => 0097-EndermanAttackPlayerEvent.patch} |  0
 ...ose-Plugin-Class-Loaders-on-Disable.patch} |  0
 ...tch => 0099-WitchConsumePotionEvent.patch} |  0
 ...patch => 0100-WitchThrowPotionEvent.patch} |  0
 ...on.toBlockLocation-toCenterLocation.patch} |  0
 ... => 0102-PotionEffect-clone-methods.patch} |  0
 ...patch => 0103-WitchReadyPotionEvent.patch} |  0
 ...104-ItemStack-getMaxItemUseDuration.patch} |  0
 ...5-Add-EntityTeleportEndGatewayEvent.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  0
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  0
 ...dd-getNearbyXXX-methods-to-Location.patch} |  0
 ...patch => 0109-PlayerReadyArrowEvent.patch} |  0
 ...10-Add-EntityKnockbackByEntityEvent.patch} |  0
 ...patch => 0111-Expand-Explosions-API.patch} |  0
 ...I-additions-for-quantity-flags-lore.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0114-RangedEntity-API.patch} |  0
 ...> 0115-Add-World.getEntity-UUID-API.patch} |  0
 ...0116-InventoryCloseEvent-Reason-API.patch} |  0
 ...I.patch => 0117-Entity-getChunk-API.patch} |  0
 ...d-an-asterisk-to-legacy-API-plugins.patch} |  0
 ...ts.patch => 0119-EnderDragon-Events.patch} |  0
 ...=> 0120-PlayerLaunchProjectileEvent.patch} |  0
 ...atch => 0121-PlayerElytraBoostEvent.patch} |  0
 ...atch => 0122-EntityTransformedEvent.patch} |  0
 ...llow-disabling-armour-stand-ticking.patch} |  0
 ...tch => 0124-SkeletonHorse-Additions.patch} |  0
 ...25-Expand-Location-Manipulation-API.patch} |  0
 ...patch => 0126-Expand-ArmorStand-API.patch} |  0
 ...vent.patch => 0127-AnvilDamageEvent.patch} |  0
 ...eadlock-risk-in-firing-async-events.patch} |  0
 ...h => 0129-Add-hand-to-bucket-events.patch} |  0
 ...ent.patch => 0130-Add-TNTPrimeEvent.patch} |  0
 ...ide-Chunk-Coordinates-as-a-Long-API.patch} |  0
 ...-API.patch => 0132-Async-Chunks-API.patch} |  0
 ...=> 0133-Make-EnderDragon-extend-Mob.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...ots-for-Timings-Tile-Entity-reports.patch} |  0
 ...locks-to-be-accessed-via-a-long-key.patch} |  0
 ...tch => 0137-Slime-Pathfinder-Events.patch} |  0
 ....patch => 0138-isChunkGenerated-API.patch} |  0
 ....patch => 0139-Add-More-Creeper-API.patch} |  0
 ...ch => 0140-Add-PhantomPreSpawnEvent.patch} |  0
 ...d-source-block-to-BlockPhysicsEvent.patch} |  0
 ...=> 0142-Inventory-removeItemAnySlot.patch} |  0
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ....patch => 0144-Improve-death-events.patch} |  0
 ...I.patch => 0145-Mob-Pathfinding-API.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ...anPlaceOn-and-CanDestroy-NBT-values.patch} |  0
 ...urrency-Improvements-to-Permissions.patch} |  0
 ...Add-ItemStackRecipeChoice-Draft-API.patch} |  0
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ....patch => 0151-PreSpawnerSpawnEvent.patch} |  0
 ...ition-on-name-for-AttributeModifier.patch} |  0
 ...atch => 0153-Material-API-additions.patch} |  0
 ...ags.patch => 0154-Add-Material-Tags.patch} |  0
 ...55-Allow-setting-the-vex-s-summoner.patch} |  0
 ...56-Add-LivingEntity-getTargetEntity.patch} |  0
 ...I.patch => 0157-Add-sun-related-API.patch} |  0
 ...-Johnny.patch => 0158-Here-s-Johnny.patch} |  0
 ...Turtle-API.patch => 0159-Turtle-API.patch} |  0
 ...-and-setters-for-EntityItem-owner-a.patch} |  0
 ...=> 0161-Add-spectator-target-events.patch} |  0
 ...PI.patch => 0162-Add-more-Witch-API.patch} |  0
 ...ult-permission-message-configurable.patch} |  0
 ...ion-supression-of-EntityDismount-Ve.patch} |  0
 ...I.patch => 0165-Add-more-Zombie-API.patch} |  0
 ...served-channel-check-to-be-sensible.patch} |  0
 ...0167-Add-PlayerConnectionCloseEvent.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 ...ent.patch => 0169-BlockDestroyEvent.patch} |  0
 ...ItemStack-Recipe-API-helper-methods.patch} |  0
 ...ch => 0171-Add-WhitelistToggleEvent.patch} |  0
 ...tch => 0172-Annotation-Test-changes.patch} |  0
 ...=> 0173-Entity-getEntitySpawnReason.patch} |  0
 ...t.patch => 0174-Add-GS4-Query-event.patch} |  0
 ... => 0175-Add-PlayerPostRespawnEvent.patch} |  0
 ...ivate-methods-for-nullability-annot.patch} |  0
 ...ip-some-Spigot-API-null-annotations.patch} |  0
 ...ts.patch => 0178-Server-Tick-Events.patch} |  0
 ...179-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...API.patch => 0180-Add-Heightmap-API.patch} |  0
 ...> 0181-Mob-Spawner-API-Enhancements.patch} |  0
 ... 0182-Add-BlockSoundGroup-interface.patch} |  0
 ...actAtEntityEvent-javadoc-for-ArmorS.patch} |  0
 ...tch => 0184-Make-PlayerEvent-public.patch} |  0
 ...custom-payload-channel-message-size.patch} |  0
 ...86-Expose-the-internal-current-tick.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...tch => 0189-Add-ThrownEggHatchEvent.patch} |  0
 ...p-API.patch => 0190-Entity-Jump-API.patch} |  0
 ...91-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...PI.patch => 0192-Add-tick-times-API.patch} |  0
 ...93-Expose-MinecraftServer-isRunning.patch} |  0
 ...ts-firing-Async-errors-during-shutd.patch} |  0
 ...5-Make-JavaPluginLoader-thread-safe.patch} |  0
 ... 0196-Add-Player-Client-Options-API.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...Stack-swapping-the-extended-and-upg.patch} |  0
 ...patch => 0199-Villager-Restocks-API.patch} |  0
 ...n.patch => 0200-Expose-game-version.patch} |  0
 ...1-Add-item-slot-convenience-methods.patch} |  0
 ...-API.patch => 0202-Add-Mob-Goal-API.patch} | 13 ----
 ...tch => 0203-World-view-distance-api.patch} |  0
 ...=> 0204-Add-villager-reputation-API.patch} |  0
 .../0073-Access-items-by-EquipmentSlot.patch  | 65 -------------------
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |  0
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  0
 ...5-Configurable-Chunk-Inhabited-Time.patch} |  0
 ...t.patch => 0076-EntityPathfindEvent.patch} |  0
 ...gionFileCache-and-make-configurable.patch} |  0
 ...-Do-not-load-chunks-for-Pathfinding.patch} |  0
 ...079-Add-PlayerUseUnknownEntityEvent.patch} |  0
 ...DebugInfo-not-initialized-on-client.patch} |  0
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  0
 ...-BlockPlaceEvent-triggering-physics.patch} |  0
 ...3-Remove-Debug-checks-from-DataBits.patch} |  0
 ...illa-per-world-scoreboard-coloring-.patch} |  0
 ...d-for-setting-passengers-on-players.patch} |  0
 ...emove-unused-World-Tile-Entity-List.patch} |  0
 ... 0087-Don-t-tick-Skulls-unused-code.patch} |  0
 ... 0088-Configurable-Player-Collision.patch} |  0
 ...nt-to-allow-plugins-to-handle-clien.patch} |  0
 ...> 0090-Configurable-RCON-IP-address.patch} |  0
 ...91-Prevent-Fire-from-loading-chunks.patch} |  0
 ...2-Implement-PlayerLocaleChangeEvent.patch} |  0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  0
 ...to-configure-frosted_ice-properties.patch} |  0
 ...possibility-for-getServer-singleton.patch} |  0
 ...tem-frames-performance-and-bug-fixe.patch} |  0
 ...API-Replenishable-Lootables-Feature.patch} |  0
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  0
 ...em-property-for-disabling-watchdoge.patch} |  0
 ...0100-Optimize-UserCache-Thread-Safe.patch} |  0
 ...locking-on-Network-Manager-creation.patch} |  0
 ...-Optional-TNT-doesn-t-move-in-water.patch} |  0
 ...-redstone-torch-rapid-clock-removal.patch} |  0
 ...h => 0104-Add-server-name-parameter.patch} |  0
 ...n-Wither-Death-sounds-to-same-world.patch} |  0
 ...=> 0106-Fix-Double-World-Add-issues.patch} |  0
 ...tch => 0107-Fix-Old-Sign-Conversion.patch} |  0
 ...-profiles-that-have-no-UUID-and-no-.patch} |  0
 ...ative-vehicle-moved-wrongly-message.patch} |  0
 ...etting-for-proxy-online-mode-status.patch} |  0
 ...timise-BlockState-s-hashCode-equals.patch} |  0
 ...nfigurable-packet-in-spam-threshold.patch} |  0
 ...3-Configurable-flying-kick-messages.patch} |  0
 ...ch => 0114-Chunk-registration-fixes.patch} |  0
 ...k-reference-on-Craft-Entity-removal.patch} |  0
 ...to-fix-bad-Y-levels-on-player-login.patch} |  0
 ...ion-to-remove-corrupt-tile-entities.patch} |  0
 ...nt.patch => 0118-Add-EntityZapEvent.patch} |  4 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  0
 ...20-Cache-user-authenticator-threads.patch} |  0
 ....patch => 0121-Optimise-removeQueue.patch} |  0
 ...-Allow-Reloading-of-Command-Aliases.patch} |  0
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  4 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |  0
 ... => 0125-Add-ProjectileCollideEvent.patch} |  4 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |  0
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  0
 ...Bound-Treasure-Maps-to-World-Border.patch} |  0
 ...igurable-Cartographer-Treasure-Maps.patch} |  0
 ... => 0130-Optimize-ItemStack.isEmpty.patch} |  0
 ...o-control-if-armour-stands-can-move.patch} |  0
 ...2-Properly-fix-item-duplication-bug.patch} |  0
 ...=> 0133-String-based-Action-Bar-API.patch} |  0
 ...-API-s.patch => 0134-Firework-API-s.patch} |  0
 ... 0135-PlayerTeleportEndGatewayEvent.patch} |  0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  0
 ...h => 0137-Enforce-Sync-Player-Saves.patch} |  0
 ...low-entities-to-ride-themselves-572.patch} |  0
 ...I-for-Reason-Source-Triggering-play.patch} |  0
 ...patch => 0140-Cap-Entity-Collisions.patch} |  0
 ...-CraftScheduler-Async-Task-Debugger.patch} |  0
 ...ore-aggressive-in-the-chunk-unload-.patch} |  0
 ...> 0143-Do-not-let-armorstands-drown.patch} |  0
 ...e-async-calls-to-restart-the-server.patch} |  0
 ...roperty-to-disable-book-size-limits.patch} |  0
 ...e-parrots-stay-on-shoulders-despite.patch} |  0
 ...-option-to-prevent-player-names-fro.patch} |  0
 ...leAppender-for-console-improvements.patch} |  0
 ...rable-option-to-disable-creeper-lin.patch} |  0
 ....patch => 0150-Item-canEntityPickup.patch} |  0
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  0
 ...> 0152-PlayerAttemptPickupItemEvent.patch} |  0
 ...tch => 0153-Add-UnknownCommandEvent.patch} |  0
 ...tch => 0154-Basic-PlayerProfile-API.patch} |  0
 ... 0155-Shoulder-Entities-Release-API.patch} |  0
 ...patch => 0156-Profile-Lookup-Events.patch} |  0
 ...layer-logins-during-server-shutdown.patch} |  0
 ...patch => 0158-Entity-fromMobSpawner.patch} |  0
 ...9-Improve-the-Saddle-API-for-Horses.patch} |  0
 ...plement-ensureServerConversions-API.patch} |  0
 ...> 0161-Implement-getI18NDisplayName.patch} |  0
 ...=> 0162-ProfileWhitelistVerifyEvent.patch} |  0
 ...ch => 0163-Fix-this-stupid-bullshit.patch} |  0
 ...wns-should-honor-nametags-and-leash.patch} |  0
 ...mer-when-spawner-event-is-cancelled.patch} |  0
 ...6-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  0
 ...a-custom-authentication-servers-dow.patch} |  0
 ...atch => 0168-LivingEntity-setKiller.patch} |  0
 ...ms-to-redirect-System.out-err-to-lo.patch} |  0
 ...-prefixes-using-Log4J-configuration.patch} |  0
 ...Include-Log4J2-SLF4J-implementation.patch} |  0
 ...efix-for-various-plugins-bypassing-.patch} |  0
 ...t.patch => 0173-Add-PlayerJumpEvent.patch} |  0
 ...-handle-PacketPlayInKeepAlive-async.patch} |  0
 ...t-protocol-version-and-virtual-host.patch} |  0
 ...t-serverside-behavior-of-keepalives.patch} |  0
 ...Effects-only-to-players-who-can-see.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  4 +-
 ... => 0179-Add-PlayerArmorChangeEvent.patch} |  0
 ...om-being-processed-when-the-player-.patch} |  0
 ...-implementations-for-captured-block.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  0
 ...patch => 0183-AsyncTabCompleteEvent.patch} |  0
 ...84-Avoid-NPE-in-PathfinderGoalTempt.patch} |  0
 ...=> 0185-PlayerPickupExperienceEvent.patch} |  0
 ...tch => 0186-ExperienceOrbMergeEvent.patch} |  4 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...max-squid-spawn-height-configurable.patch} |  0
 ...patch => 0189-PreCreatureSpawnEvent.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0192-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0194-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0196-Tameable-getOwnerUniqueId-API.patch} |  0
 ...-crits-helps-mitigate-hacked-client.patch} |  0
 ...ing-location-from-InventoryEnderChe.patch} |  0
 ...ted-Ice-from-loading-holding-chunks.patch} |  0
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  0
 ... 0202-Improved-Async-Task-Scheduler.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  0
 ...=> 0204-Player.setPlayerProfile-API.patch} |  0
 ...h => 0205-Fix-Dragon-Server-Crashes.patch} |  0
 ...patch => 0206-getPlayerUniqueId-API.patch} |  0
 ...ake-player-data-saving-configurable.patch} |  0
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...0-Flag-to-disable-the-channel-limit.patch} |  0
 ...-method-to-open-already-placed-sign.patch} |  0
 ...rable-sprint-interruption-on-attack.patch} |  0
 ...allowed-colored-signs-to-be-created.patch} |  0
 ...t.patch => 0214-EndermanEscapeEvent.patch} |  0
 ...h => 0215-Enderman.teleportRandomly.patch} |  0
 ...216-Block-Enderpearl-Travel-Exploit.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  0
 ...h => 0218-EndermanAttackPlayerEvent.patch} |  0
 ...tch => 0219-WitchConsumePotionEvent.patch} |  0
 ...patch => 0220-WitchThrowPotionEvent.patch} |  0
 ...tem-entities-with-World.spawnEntity.patch} |  0
 ...patch => 0222-WitchReadyPotionEvent.patch} |  0
 ...223-ItemStack-getMaxItemUseDuration.patch} |  0
 ...ement-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  0
 ...ch => 0226-Fix-CraftEntity-hashCode.patch} |  0
 ...e-Alternative-LootPool-Luck-Formula.patch} |  0
 ...ls-when-failing-to-save-player-data.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  0
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  4 +-
 ...patch => 0231-PlayerReadyArrowEvent.patch} |  0
 ...-EntityShootBowEvent-for-Illusioner.patch} |  0
 ...lement-EntityKnockbackByEntityEvent.patch} |  0
 ...patch => 0234-Expand-Explosions-API.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0236-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  0
 ...-Implement-World.getEntity-UUID-API.patch} |  0
 ...0239-InventoryCloseEvent-Reason-API.patch} |  4 +-
 ...0240-Configurable-Bed-Search-Radius.patch} |  0
 ...I.patch => 0241-Vex-getSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  0
 ...e-the-Entity-Random-seed-for-squids.patch} |  0
 ...illa-entity-warnings-for-duplicates.patch} |  0
 ...-if-stack-size-above-max-stack-size.patch} |  0
 ...46-Use-asynchronous-Log4j-2-loggers.patch} |  0
 ...more-information-to-Entity.toString.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  0
 ...ts.patch => 0249-EnderDragon-Events.patch} |  0
 ...atch => 0250-PlayerElytraBoostEvent.patch} |  0
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  0
 ...patch => 0252-Optimize-RegistryID.c.patch} |  0
 ...-armor-stands-from-doing-entity-loo.patch} |  0
 ...-Vanished-players-don-t-have-rights.patch} |  4 +-
 ...anytime-entities-change-to-guarante.patch} |  0
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  0
 ...atch => 0257-EntityTransformedEvent.patch} |  4 +-
 ...tch => 0258-SkeletonHorse-Additions.patch} |  0
 ...event-Saving-Bad-entities-to-chunks.patch} |  0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...ad-Entities-in-entityList-iteration.patch} |  0
 ...2-Implement-Expanded-ArmorStand-API.patch} |  0
 ...vent.patch => 0263-AnvilDamageEvent.patch} |  0
 ...ent.patch => 0264-Add-TNTPrimeEvent.patch} |  0
 ...d-make-tab-spam-limits-configurable.patch} |  0
 ...h => 0266-Add-hand-to-bucket-events.patch} |  6 +-
 ...-Experience-should-save-as-Integers.patch} |  0
 ...ent-rendering-skulls-from-same-user.patch} |  0
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  0
 ...0270-Make-EnderDragon-implement-Mob.patch} |  0
 ...1-Use-ConcurrentHashMap-in-JsonList.patch} |  0
 ...2-Use-a-Queue-for-Queueing-Commands.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...llow-disabling-armour-stand-ticking.patch} |  0
 ...timize-BlockPosition-helper-methods.patch} |  0
 ...ts-from-world-player-list-not-serve.patch} |  0
 ...tore-vanlla-default-mob-spawn-range.patch} |  0
 ...78-Optimize-CraftBlockData-Creation.patch} |  0
 ...-124320.patch => 0279-Fix-MC-124320.patch} |  0
 ...tch => 0280-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ... => 0282-Optimize-RegistryMaterials.patch} |  0
 ...ch => 0283-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0284-Add-More-Creeper-API.patch} |  0
 ...=> 0285-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  0
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0289-Improve-death-events.patch} |  8 +--
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0291-Mob-Pathfinding-API.patch} |  0
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  0
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  0
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  0
 ...ning-from-loading-generating-chunks.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ...0298-Support-Overriding-World-Seeds.patch} |  0
 ...h => 0299-Optimize-Server-World-Map.patch} |  0
 ....patch => 0300-PreSpawnerSpawnEvent.patch} |  0
 ...rseException-in-Entity-and-TE-names.patch} |  0
 ... 0302-Avoid-dimension-id-collisions.patch} |  0
 ...=> 0303-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  0
 ...> 0305-Hook-into-CB-plugin-rewrites.patch} |  0
 ...06-Allow-setting-the-vex-s-summoner.patch} |  0
 ...I.patch => 0307-Add-sun-related-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...-Johnny.patch => 0309-Here-s-Johnny.patch} |  0
 ...Turtle-API.patch => 0310-Turtle-API.patch} |  0
 ...it-lightning-strike-effect-distance.patch} |  0
 ...her-worlds-for-shooter-of-projectil.patch} |  0
 ...Call-player-spectator-target-events.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...PI.patch => 0315-Add-more-Witch-API.patch} |  0
 ...MC-93764.patch => 0316-Fix-MC-93764.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  0
 ...8-Reset-players-airTicks-on-respawn.patch} |  0
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...le-thread-count-default-for-bootstr.patch} |  0
 ...=> 0321-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0323-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0324-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  0
 ...=> 0326-Optimize-redstone-algorithm.patch} |  0
 ...ntity-dismount-during-teleportation.patch} |  0
 ...mits.patch => 0328-Book-Size-Limits.patch} |  0
 ...ult-permission-message-configurable.patch} |  0
 ...I.patch => 0330-Add-more-Zombie-API.patch} |  0
 ...revent-rayTrace-from-loading-chunks.patch} |  0
 ...-Large-Packets-disconnecting-client.patch} |  0
 ...world-storage-in-CraftOfflinePlayer.patch} |  0
 ...0334-Add-PlayerConnectionCloseEvent.patch} |  0
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 ...tch => 0337-Fix-PlayerEditBookEvent.patch} |  0
 ...ehicle-tracking-issue-on-disconnect.patch} |  0
 ...nRetractEvent-for-all-empty-pistons.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  0
 ...ent.patch => 0341-BlockDestroyEvent.patch} |  0
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ...h => 0343-Fix-sign-edit-memory-leak.patch} |  0
 ... 0344-Limit-Client-Sign-length-more.patch} |  0
 ...onvertSigns-boolean-every-sign-save.patch} |  0
 ...Manager-and-add-advanced-packet-sup.patch} |  0
 ...e-Oversized-Tile-Entities-in-chunks.patch} |  0
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  0
 ...t-tick-at-start-of-drowning-process.patch} |  0
 ...50-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...ggleEvent-when-whitelist-is-toggled.patch} |  0
 ...52-Add-LivingEntity-getTargetEntity.patch} |  0
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0354-Entity-getEntitySpawnReason.patch} |  0
 ...ty-Metadata-for-all-tracked-players.patch} |  0
 ...tch => 0356-Fire-event-on-GS4-query.patch} |  0
 ...57-Implement-PlayerPostRespawnEvent.patch} |  0
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...-and-setters-for-EntityItem-owner-a.patch} |  0
 ...ts.patch => 0360-Server-Tick-Events.patch} |  0
 ...361-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0363-Add-Heightmap-API.patch} |  0
 ...> 0364-Mob-Spawner-API-Enhancements.patch} |  0
 ...ayer-View-Distance-API-placeholders.patch} |  0
 ...-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
 ... 0370-Duplicate-UUID-Resolve-Option.patch} |  0
 ...71-improve-CraftWorld-isChunkLoaded.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  0
 ...-some-generation-concurrency-issues.patch} |  0
 ...ityAreaEffectCloud-from-going-negat.patch} |  0
 ....patch => 0375-ChunkMapDistance-CME.patch} |  0
 ...0376-Implement-CraftBlockSoundGroup.patch} |  0
 ...d.patch => 0377-Chunk-debug-command.patch} |  0
 ...ch => 0378-incremental-chunk-saving.patch} |  0
 ...ptions-from-dispenser-entity-spawns.patch} |  0
 ...80-Fix-World-isChunkGenerated-calls.patch} |  0
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...ad-in-DataPaletteBlock-lock-failure.patch} |  0
 ...tatus-cache-when-saving-protochunks.patch} |  0
 ...5-Anti-Xray.patch => 0384-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 => 0388-offset-item-frame-ticking.patch} |  0
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...0-Asynchronous-chunk-IO-and-loading.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...ads.patch => 0392-Reduce-sync-loads.patch} |  0
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...f-we-have-a-custom-Bukkit-generator.patch} |  0
 ...-158900.patch => 0395-Fix-MC-158900.patch} |  0
 ...ment-optional-per-player-mob-spawns.patch} |  0
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ...ssanger-entities-once-from-spawners.patch} |  0
 ... => 0399-Fix-nether-portal-creation.patch} |  0
 ...gs.patch => 0400-Generator-Settings.patch} |  0
 ...o-tick-instant-grow-farms-MC-113809.patch} |  0
 ...-161754.patch => 0402-Fix-MC-161754.patch} |  0
 ...e-improvement-for-Chunk.getEntities.patch} |  0
 ...anging-entities-that-are-not-ItemFr.patch} |  0
 ...05-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
 ...=> 0409-PlayerLaunchProjectileEvent.patch} |  0
 ...tMagicNumbers.isSupportedApiVersion.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...Fix-spawn-radius-being-treated-as-0.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ...pers.patch => 0414-Optimize-Hoppers.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  0
 ...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
 ...420-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0421-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...=> 0424-Entity-Activation-Range-2.0.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0426-Tracking-Range-Improvements.patch} |  0
 ...tor-behavior-for-EntityPhanton-goal.patch} |  0
 ...-items-vanishing-through-end-portal.patch} |  0
 ...h => 0429-Seed-based-feature-search.patch} |  0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  0
 ...more-tolerant-of-invalid-attributes.patch} |  0
 ...w-overriding-the-java-version-check.patch} |  0
 ...tch => 0434-Add-ThrownEggHatchEvent.patch} |  0
 ... 0435-Optimise-random-block-ticking.patch} |  0
 ...p-API.patch => 0436-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0438-Make-the-GUI-graph-fancier.patch} |  0
 ... => 0439-Backport-fix-for-MC-167561.patch} |  0
 ...40-add-hand-to-BlockMultiPlaceEvent.patch} |  4 +-
 ...1-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 => 0445-Optimise-Chunk-getFluid.patch} |  0
 ...mise-TickListServer-by-rewriting-it.patch} |  0
 ...pawn-settings-and-per-player-option.patch} |  0
 ...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
 ...n-Chunk-lookup-and-avoid-loading-fa.patch} |  0
 ...tch => 0454-Don-t-tick-dead-players.patch} |  0
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  0
 ...unkMap-memory-use-for-visibleChunks.patch} |  0
 ...s-when-attempting-to-unload-a-chunk.patch} |  0
 ...h => 0458-Increase-Light-Queue-Size.patch} |  0
 ...sks-Speed-up-processing-of-chunk-lo.patch} |  0
 ...ove-existing-players-to-world-spawn.patch} |  0
 ...Add-tick-times-API-and-mspt-command.patch} |  0
 ...62-Expose-MinecraftServer-isRunning.patch} |  0
 ...riority-Urgency-System-for-World-Ge.patch} |  0
 ...4-Remove-streams-from-Mob-AI-System.patch} |  0
 ...ons-until-after-entity-ticking-is-d.patch} |  0
 ... => 0466-Async-command-map-building.patch} |  0
 ...rash-support-and-Improve-Async-Shut.patch} |  0
 ....patch => 0468-Optimize-Pathfinding.patch} |  0
 ...Villager-AI-optimizations-DROP-1.16.patch} |  0
 ...0-Reduce-Either-Optional-allocation.patch} |  0
 ...471-Remove-streams-from-PairedQueue.patch} |  0
 ...72-Remove-streams-from-MinecraftKey.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...75-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...mise-entity-hard-collision-checking.patch} |  0
 ...viderServer-s-chunk-level-checking-.patch} |  0
 ...teleport-command-to-valid-locations.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  0
 ...Chunk-Post-Processing-deadlock-risk.patch} |  0
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...3-Broadcast-join-message-to-console.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  0
 ...oad-Chunks-for-Login-Asynchronously.patch} |  0
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...487-Allow-sleeping-players-to-float.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} |  4 +-
 ...0493-Implement-Brigadier-Mojang-API.patch} |  0
 ...patch => 0494-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  0
 ...n.patch => 0496-Expose-game-version.patch} |  0
 ...0497-Sync-position-on-teleportation.patch} |  0
 ...> 0498-Optimize-Voxel-Shape-Merging.patch} |  0
 ...Region-Files-Direct-Memory-on-close.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ...atch => 0501-Implement-Mob-Goal-API.patch} |  0
 ...ist-iteration-requiring-entities-be.patch} |  0
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...isOutsideRange-to-use-distance-maps.patch} |  0
 ...e-operations-for-updating-light-dat.patch} |  0
 ...o-Tick-view-distance-implementation.patch} |  0
 ...=> 0507-Add-villager-reputation-API.patch} |  0
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 617 files changed, 34 insertions(+), 146 deletions(-)
 delete mode 100644 Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
 rename Spigot-API-Patches/{0028-Entity-AddTo-RemoveFrom-World-Events.patch => 0027-Entity-AddTo-RemoveFrom-World-Events.patch} (100%)
 rename Spigot-API-Patches/{0029-EntityPathfindEvent.patch => 0028-EntityPathfindEvent.patch} (100%)
 rename Spigot-API-Patches/{0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch => 0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch} (100%)
 rename Spigot-API-Patches/{0031-Add-MetadataStoreBase.removeAll-Plugin.patch => 0030-Add-MetadataStoreBase.removeAll-Plugin.patch} (100%)
 rename Spigot-API-Patches/{0032-Add-PlayerUseUnknownEntityEvent.patch => 0031-Add-PlayerUseUnknownEntityEvent.patch} (100%)
 rename Spigot-API-Patches/{0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename Spigot-API-Patches/{0034-Arrow-pickup-rule-API.patch => 0033-Arrow-pickup-rule-API.patch} (100%)
 rename Spigot-API-Patches/{0035-EntityRegainHealthEvent-isFastRegen-API.patch => 0034-EntityRegainHealthEvent-isFastRegen-API.patch} (100%)
 rename Spigot-API-Patches/{0036-LootTable-API.patch => 0035-LootTable-API.patch} (100%)
 rename Spigot-API-Patches/{0037-Add-EntityZapEvent.patch => 0036-Add-EntityZapEvent.patch} (100%)
 rename Spigot-API-Patches/{0038-Misc-Utils.patch => 0037-Misc-Utils.patch} (100%)
 rename Spigot-API-Patches/{0039-Allow-Reloading-of-Command-Aliases.patch => 0038-Allow-Reloading-of-Command-Aliases.patch} (100%)
 rename Spigot-API-Patches/{0040-Add-source-to-PlayerExpChangeEvent.patch => 0039-Add-source-to-PlayerExpChangeEvent.patch} (100%)
 rename Spigot-API-Patches/{0041-Add-ProjectileCollideEvent.patch => 0040-Add-ProjectileCollideEvent.patch} (100%)
 rename Spigot-API-Patches/{0042-Add-String-based-Action-Bar-API.patch => 0041-Add-String-based-Action-Bar-API.patch} (100%)
 rename Spigot-API-Patches/{0043-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0042-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename Spigot-API-Patches/{0044-IllegalPacketEvent.patch => 0043-IllegalPacketEvent.patch} (100%)
 rename Spigot-API-Patches/{0045-Fireworks-API-s.patch => 0044-Fireworks-API-s.patch} (100%)
 rename Spigot-API-Patches/{0046-PlayerTeleportEndGatewayEvent.patch => 0045-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename Spigot-API-Patches/{0047-Provide-E-TE-Chunk-count-stat-methods.patch => 0046-Provide-E-TE-Chunk-count-stat-methods.patch} (100%)
 rename Spigot-API-Patches/{0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (100%)
 rename Spigot-API-Patches/{0049-Expose-WorldBorder-isInBounds-Location-check.patch => 0048-Expose-WorldBorder-isInBounds-Location-check.patch} (100%)
 rename Spigot-API-Patches/{0050-Add-configuration-option-to-prevent-player-names-fro.patch => 0049-Add-configuration-option-to-prevent-player-names-fro.patch} (100%)
 rename Spigot-API-Patches/{0051-Fix-upstream-javadoc-warnings-and-errors.patch => 0050-Fix-upstream-javadoc-warnings-and-errors.patch} (100%)
 rename Spigot-API-Patches/{0052-Item-canEntityPickup.patch => 0051-Item-canEntityPickup.patch} (100%)
 rename Spigot-API-Patches/{0053-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0052-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename Spigot-API-Patches/{0054-PlayerAttemptPickupItemEvent.patch => 0053-PlayerAttemptPickupItemEvent.patch} (100%)
 rename Spigot-API-Patches/{0055-Add-UnknownCommandEvent.patch => 0054-Add-UnknownCommandEvent.patch} (100%)
 rename Spigot-API-Patches/{0056-Basic-PlayerProfile-API.patch => 0055-Basic-PlayerProfile-API.patch} (100%)
 rename Spigot-API-Patches/{0057-Shoulder-Entities-Release-API.patch => 0056-Shoulder-Entities-Release-API.patch} (100%)
 rename Spigot-API-Patches/{0058-Profile-Lookup-Events.patch => 0057-Profile-Lookup-Events.patch} (100%)
 rename Spigot-API-Patches/{0059-Entity-fromMobSpawner.patch => 0058-Entity-fromMobSpawner.patch} (100%)
 rename Spigot-API-Patches/{0060-Improve-the-Saddle-API-for-Horses.patch => 0059-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename Spigot-API-Patches/{0061-ensureServerConversions-API.patch => 0060-ensureServerConversions-API.patch} (100%)
 rename Spigot-API-Patches/{0062-Add-getI18NDisplayName-API.patch => 0061-Add-getI18NDisplayName-API.patch} (100%)
 rename Spigot-API-Patches/{0063-ProfileWhitelistVerifyEvent.patch => 0062-ProfileWhitelistVerifyEvent.patch} (100%)
 rename Spigot-API-Patches/{0064-Make-plugins-list-alphabetical.patch => 0063-Make-plugins-list-alphabetical.patch} (100%)
 rename Spigot-API-Patches/{0065-LivingEntity-setKiller.patch => 0064-LivingEntity-setKiller.patch} (100%)
 rename Spigot-API-Patches/{0066-Handle-plugin-prefixes-in-implementation-logging-con.patch => 0065-Handle-plugin-prefixes-in-implementation-logging-con.patch} (100%)
 rename Spigot-API-Patches/{0067-Allow-plugins-to-use-SLF4J-for-logging.patch => 0066-Allow-plugins-to-use-SLF4J-for-logging.patch} (100%)
 rename Spigot-API-Patches/{0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch => 0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch} (100%)
 rename Spigot-API-Patches/{0069-Add-PlayerJumpEvent.patch => 0068-Add-PlayerJumpEvent.patch} (100%)
 rename Spigot-API-Patches/{0070-Expose-client-protocol-version-and-virtual-host.patch => 0069-Expose-client-protocol-version-and-virtual-host.patch} (100%)
 rename Spigot-API-Patches/{0071-Add-PlayerArmorChangeEvent.patch => 0070-Add-PlayerArmorChangeEvent.patch} (100%)
 rename Spigot-API-Patches/{0072-API-to-get-a-BlockState-without-a-snapshot.patch => 0071-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename Spigot-API-Patches/{0073-AsyncTabCompleteEvent.patch => 0072-AsyncTabCompleteEvent.patch} (100%)
 rename Spigot-API-Patches/{0074-Display-warning-on-deprecated-recipe-API.patch => 0073-Display-warning-on-deprecated-recipe-API.patch} (100%)
 rename Spigot-API-Patches/{0075-PlayerPickupExperienceEvent.patch => 0074-PlayerPickupExperienceEvent.patch} (100%)
 rename Spigot-API-Patches/{0076-ExperienceOrbMergeEvent.patch => 0075-ExperienceOrbMergeEvent.patch} (100%)
 rename Spigot-API-Patches/{0077-Ability-to-apply-mending-to-XP-API.patch => 0076-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename Spigot-API-Patches/{0078-PreCreatureSpawnEvent.patch => 0077-PreCreatureSpawnEvent.patch} (100%)
 rename Spigot-API-Patches/{0079-PlayerNaturallySpawnCreaturesEvent.patch => 0078-PlayerNaturallySpawnCreaturesEvent.patch} (100%)
 rename Spigot-API-Patches/{0080-Add-setPlayerProfile-API-for-Skulls.patch => 0079-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename Spigot-API-Patches/{0081-Fill-Profile-Property-Events.patch => 0080-Fill-Profile-Property-Events.patch} (100%)
 rename Spigot-API-Patches/{0082-PlayerAdvancementCriterionGrantEvent.patch => 0081-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename Spigot-API-Patches/{0083-Add-ArmorStand-Item-Meta.patch => 0082-Add-ArmorStand-Item-Meta.patch} (100%)
 rename Spigot-API-Patches/{0084-Optimize-Hoppers.patch => 0083-Optimize-Hoppers.patch} (100%)
 rename Spigot-API-Patches/{0085-Tameable-getOwnerUniqueId-API.patch => 0084-Tameable-getOwnerUniqueId-API.patch} (86%)
 rename Spigot-API-Patches/{0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename Spigot-API-Patches/{0087-Add-extended-PaperServerListPingEvent.patch => 0086-Add-extended-PaperServerListPingEvent.patch} (100%)
 rename Spigot-API-Patches/{0088-Player.setPlayerProfile-API.patch => 0087-Player.setPlayerProfile-API.patch} (100%)
 rename Spigot-API-Patches/{0089-getPlayerUniqueId-API.patch => 0088-getPlayerUniqueId-API.patch} (100%)
 rename Spigot-API-Patches/{0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch => 0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch} (100%)
 rename Spigot-API-Patches/{0091-Add-method-to-open-already-placed-sign.patch => 0090-Add-method-to-open-already-placed-sign.patch} (100%)
 rename Spigot-API-Patches/{0092-Add-Ban-Methods-to-Player-Objects.patch => 0091-Add-Ban-Methods-to-Player-Objects.patch} (100%)
 rename Spigot-API-Patches/{0093-EndermanEscapeEvent.patch => 0092-EndermanEscapeEvent.patch} (100%)
 rename Spigot-API-Patches/{0094-Enderman.teleportRandomly.patch => 0093-Enderman.teleportRandomly.patch} (100%)
 rename Spigot-API-Patches/{0095-Additional-world.getNearbyEntities-API-s.patch => 0094-Additional-world.getNearbyEntities-API-s.patch} (100%)
 rename Spigot-API-Patches/{0096-Location.isChunkLoaded-API.patch => 0095-Location.isChunkLoaded-API.patch} (100%)
 rename Spigot-API-Patches/{0097-Expand-World.spawnParticle-API-and-add-Builder.patch => 0096-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename Spigot-API-Patches/{0098-EndermanAttackPlayerEvent.patch => 0097-EndermanAttackPlayerEvent.patch} (100%)
 rename Spigot-API-Patches/{0099-Close-Plugin-Class-Loaders-on-Disable.patch => 0098-Close-Plugin-Class-Loaders-on-Disable.patch} (100%)
 rename Spigot-API-Patches/{0100-WitchConsumePotionEvent.patch => 0099-WitchConsumePotionEvent.patch} (100%)
 rename Spigot-API-Patches/{0101-WitchThrowPotionEvent.patch => 0100-WitchThrowPotionEvent.patch} (100%)
 rename Spigot-API-Patches/{0102-Location.toBlockLocation-toCenterLocation.patch => 0101-Location.toBlockLocation-toCenterLocation.patch} (100%)
 rename Spigot-API-Patches/{0103-PotionEffect-clone-methods.patch => 0102-PotionEffect-clone-methods.patch} (100%)
 rename Spigot-API-Patches/{0104-WitchReadyPotionEvent.patch => 0103-WitchReadyPotionEvent.patch} (100%)
 rename Spigot-API-Patches/{0105-ItemStack-getMaxItemUseDuration.patch => 0104-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename Spigot-API-Patches/{0106-Add-EntityTeleportEndGatewayEvent.patch => 0105-Add-EntityTeleportEndGatewayEvent.patch} (100%)
 rename Spigot-API-Patches/{0107-Make-shield-blocking-delay-configurable.patch => 0106-Make-shield-blocking-delay-configurable.patch} (100%)
 rename Spigot-API-Patches/{0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0107-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (100%)
 rename Spigot-API-Patches/{0109-Add-getNearbyXXX-methods-to-Location.patch => 0108-Add-getNearbyXXX-methods-to-Location.patch} (100%)
 rename Spigot-API-Patches/{0110-PlayerReadyArrowEvent.patch => 0109-PlayerReadyArrowEvent.patch} (100%)
 rename Spigot-API-Patches/{0111-Add-EntityKnockbackByEntityEvent.patch => 0110-Add-EntityKnockbackByEntityEvent.patch} (100%)
 rename Spigot-API-Patches/{0112-Expand-Explosions-API.patch => 0111-Expand-Explosions-API.patch} (100%)
 rename Spigot-API-Patches/{0113-ItemStack-API-additions-for-quantity-flags-lore.patch => 0112-ItemStack-API-additions-for-quantity-flags-lore.patch} (100%)
 rename Spigot-API-Patches/{0114-LivingEntity-Hand-Raised-Item-Use-API.patch => 0113-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename Spigot-API-Patches/{0115-RangedEntity-API.patch => 0114-RangedEntity-API.patch} (100%)
 rename Spigot-API-Patches/{0116-Add-World.getEntity-UUID-API.patch => 0115-Add-World.getEntity-UUID-API.patch} (100%)
 rename Spigot-API-Patches/{0117-InventoryCloseEvent-Reason-API.patch => 0116-InventoryCloseEvent-Reason-API.patch} (100%)
 rename Spigot-API-Patches/{0118-Entity-getChunk-API.patch => 0117-Entity-getChunk-API.patch} (100%)
 rename Spigot-API-Patches/{0119-Add-an-asterisk-to-legacy-API-plugins.patch => 0118-Add-an-asterisk-to-legacy-API-plugins.patch} (100%)
 rename Spigot-API-Patches/{0120-EnderDragon-Events.patch => 0119-EnderDragon-Events.patch} (100%)
 rename Spigot-API-Patches/{0121-PlayerLaunchProjectileEvent.patch => 0120-PlayerLaunchProjectileEvent.patch} (100%)
 rename Spigot-API-Patches/{0122-PlayerElytraBoostEvent.patch => 0121-PlayerElytraBoostEvent.patch} (100%)
 rename Spigot-API-Patches/{0123-EntityTransformedEvent.patch => 0122-EntityTransformedEvent.patch} (100%)
 rename Spigot-API-Patches/{0124-Allow-disabling-armour-stand-ticking.patch => 0123-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename Spigot-API-Patches/{0125-SkeletonHorse-Additions.patch => 0124-SkeletonHorse-Additions.patch} (100%)
 rename Spigot-API-Patches/{0126-Expand-Location-Manipulation-API.patch => 0125-Expand-Location-Manipulation-API.patch} (100%)
 rename Spigot-API-Patches/{0127-Expand-ArmorStand-API.patch => 0126-Expand-ArmorStand-API.patch} (100%)
 rename Spigot-API-Patches/{0128-AnvilDamageEvent.patch => 0127-AnvilDamageEvent.patch} (100%)
 rename Spigot-API-Patches/{0129-Remove-deadlock-risk-in-firing-async-events.patch => 0128-Remove-deadlock-risk-in-firing-async-events.patch} (100%)
 rename Spigot-API-Patches/{0130-Add-hand-to-bucket-events.patch => 0129-Add-hand-to-bucket-events.patch} (100%)
 rename Spigot-API-Patches/{0131-Add-TNTPrimeEvent.patch => 0130-Add-TNTPrimeEvent.patch} (100%)
 rename Spigot-API-Patches/{0132-Provide-Chunk-Coordinates-as-a-Long-API.patch => 0131-Provide-Chunk-Coordinates-as-a-Long-API.patch} (100%)
 rename Spigot-API-Patches/{0133-Async-Chunks-API.patch => 0132-Async-Chunks-API.patch} (100%)
 rename Spigot-API-Patches/{0134-Make-EnderDragon-extend-Mob.patch => 0133-Make-EnderDragon-extend-Mob.patch} (100%)
 rename Spigot-API-Patches/{0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename Spigot-API-Patches/{0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch => 0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch} (100%)
 rename Spigot-API-Patches/{0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch => 0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch} (100%)
 rename Spigot-API-Patches/{0138-Slime-Pathfinder-Events.patch => 0137-Slime-Pathfinder-Events.patch} (100%)
 rename Spigot-API-Patches/{0139-isChunkGenerated-API.patch => 0138-isChunkGenerated-API.patch} (100%)
 rename Spigot-API-Patches/{0140-Add-More-Creeper-API.patch => 0139-Add-More-Creeper-API.patch} (100%)
 rename Spigot-API-Patches/{0141-Add-PhantomPreSpawnEvent.patch => 0140-Add-PhantomPreSpawnEvent.patch} (100%)
 rename Spigot-API-Patches/{0142-Add-source-block-to-BlockPhysicsEvent.patch => 0141-Add-source-block-to-BlockPhysicsEvent.patch} (100%)
 rename Spigot-API-Patches/{0143-Inventory-removeItemAnySlot.patch => 0142-Inventory-removeItemAnySlot.patch} (100%)
 rename Spigot-API-Patches/{0144-Add-ray-tracing-methods-to-LivingEntity.patch => 0143-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename Spigot-API-Patches/{0145-Improve-death-events.patch => 0144-Improve-death-events.patch} (100%)
 rename Spigot-API-Patches/{0146-Mob-Pathfinding-API.patch => 0145-Mob-Pathfinding-API.patch} (100%)
 rename Spigot-API-Patches/{0147-Expose-attack-cooldown-methods-for-Player.patch => 0146-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename Spigot-API-Patches/{0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (100%)
 rename Spigot-API-Patches/{0149-Performance-Concurrency-Improvements-to-Permissions.patch => 0148-Performance-Concurrency-Improvements-to-Permissions.patch} (100%)
 rename Spigot-API-Patches/{0150-Add-ItemStackRecipeChoice-Draft-API.patch => 0149-Add-ItemStackRecipeChoice-Draft-API.patch} (100%)
 rename Spigot-API-Patches/{0151-Implement-furnace-cook-speed-multiplier-API.patch => 0150-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename Spigot-API-Patches/{0152-PreSpawnerSpawnEvent.patch => 0151-PreSpawnerSpawnEvent.patch} (100%)
 rename Spigot-API-Patches/{0153-Remove-Precondition-on-name-for-AttributeModifier.patch => 0152-Remove-Precondition-on-name-for-AttributeModifier.patch} (100%)
 rename Spigot-API-Patches/{0154-Material-API-additions.patch => 0153-Material-API-additions.patch} (100%)
 rename Spigot-API-Patches/{0155-Add-Material-Tags.patch => 0154-Add-Material-Tags.patch} (100%)
 rename Spigot-API-Patches/{0156-Allow-setting-the-vex-s-summoner.patch => 0155-Allow-setting-the-vex-s-summoner.patch} (100%)
 rename Spigot-API-Patches/{0157-Add-LivingEntity-getTargetEntity.patch => 0156-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename Spigot-API-Patches/{0158-Add-sun-related-API.patch => 0157-Add-sun-related-API.patch} (100%)
 rename Spigot-API-Patches/{0159-Here-s-Johnny.patch => 0158-Here-s-Johnny.patch} (100%)
 rename Spigot-API-Patches/{0160-Turtle-API.patch => 0159-Turtle-API.patch} (100%)
 rename Spigot-API-Patches/{0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0160-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (100%)
 rename Spigot-API-Patches/{0162-Add-spectator-target-events.patch => 0161-Add-spectator-target-events.patch} (100%)
 rename Spigot-API-Patches/{0163-Add-more-Witch-API.patch => 0162-Add-more-Witch-API.patch} (100%)
 rename Spigot-API-Patches/{0164-Make-the-default-permission-message-configurable.patch => 0163-Make-the-default-permission-message-configurable.patch} (100%)
 rename Spigot-API-Patches/{0165-Support-cancellation-supression-of-EntityDismount-Ve.patch => 0164-Support-cancellation-supression-of-EntityDismount-Ve.patch} (100%)
 rename Spigot-API-Patches/{0166-Add-more-Zombie-API.patch => 0165-Add-more-Zombie-API.patch} (100%)
 rename Spigot-API-Patches/{0167-Change-the-reserved-channel-check-to-be-sensible.patch => 0166-Change-the-reserved-channel-check-to-be-sensible.patch} (100%)
 rename Spigot-API-Patches/{0168-Add-PlayerConnectionCloseEvent.patch => 0167-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename Spigot-API-Patches/{0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename Spigot-API-Patches/{0170-BlockDestroyEvent.patch => 0169-BlockDestroyEvent.patch} (100%)
 rename Spigot-API-Patches/{0171-Add-ItemStack-Recipe-API-helper-methods.patch => 0170-Add-ItemStack-Recipe-API-helper-methods.patch} (100%)
 rename Spigot-API-Patches/{0172-Add-WhitelistToggleEvent.patch => 0171-Add-WhitelistToggleEvent.patch} (100%)
 rename Spigot-API-Patches/{0173-Annotation-Test-changes.patch => 0172-Annotation-Test-changes.patch} (100%)
 rename Spigot-API-Patches/{0174-Entity-getEntitySpawnReason.patch => 0173-Entity-getEntitySpawnReason.patch} (100%)
 rename Spigot-API-Patches/{0175-Add-GS4-Query-event.patch => 0174-Add-GS4-Query-event.patch} (100%)
 rename Spigot-API-Patches/{0176-Add-PlayerPostRespawnEvent.patch => 0175-Add-PlayerPostRespawnEvent.patch} (100%)
 rename Spigot-API-Patches/{0177-Ignore-package-private-methods-for-nullability-annot.patch => 0176-Ignore-package-private-methods-for-nullability-annot.patch} (100%)
 rename Spigot-API-Patches/{0178-Flip-some-Spigot-API-null-annotations.patch => 0177-Flip-some-Spigot-API-null-annotations.patch} (100%)
 rename Spigot-API-Patches/{0179-Server-Tick-Events.patch => 0178-Server-Tick-Events.patch} (100%)
 rename Spigot-API-Patches/{0180-PlayerDeathEvent-getItemsToKeep.patch => 0179-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename Spigot-API-Patches/{0181-Add-Heightmap-API.patch => 0180-Add-Heightmap-API.patch} (100%)
 rename Spigot-API-Patches/{0182-Mob-Spawner-API-Enhancements.patch => 0181-Mob-Spawner-API-Enhancements.patch} (100%)
 rename Spigot-API-Patches/{0183-Add-BlockSoundGroup-interface.patch => 0182-Add-BlockSoundGroup-interface.patch} (100%)
 rename Spigot-API-Patches/{0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch => 0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch} (100%)
 rename Spigot-API-Patches/{0185-Make-PlayerEvent-public.patch => 0184-Make-PlayerEvent-public.patch} (100%)
 rename Spigot-API-Patches/{0186-Increase-custom-payload-channel-message-size.patch => 0185-Increase-custom-payload-channel-message-size.patch} (100%)
 rename Spigot-API-Patches/{0187-Expose-the-internal-current-tick.patch => 0186-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-API-Patches/{0188-PlayerDeathEvent-shouldDropExperience.patch => 0187-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename Spigot-API-Patches/{0189-Add-effect-to-block-break-naturally.patch => 0188-Add-effect-to-block-break-naturally.patch} (100%)
 rename Spigot-API-Patches/{0190-Add-ThrownEggHatchEvent.patch => 0189-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-API-Patches/{0191-Entity-Jump-API.patch => 0190-Entity-Jump-API.patch} (100%)
 rename Spigot-API-Patches/{0192-add-hand-to-BlockMultiPlaceEvent.patch => 0191-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename Spigot-API-Patches/{0193-Add-tick-times-API.patch => 0192-Add-tick-times-API.patch} (100%)
 rename Spigot-API-Patches/{0194-Expose-MinecraftServer-isRunning.patch => 0193-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-API-Patches/{0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch => 0194-Disable-Sync-Events-firing-Async-errors-during-shutd.patch} (100%)
 rename Spigot-API-Patches/{0196-Make-JavaPluginLoader-thread-safe.patch => 0195-Make-JavaPluginLoader-thread-safe.patch} (100%)
 rename Spigot-API-Patches/{0197-Add-Player-Client-Options-API.patch => 0196-Add-Player-Client-Options-API.patch} (100%)
 rename Spigot-API-Patches/{0198-Add-PlayerAttackEntityCooldownResetEvent.patch => 0197-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-API-Patches/{0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch => 0198-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch} (100%)
 rename Spigot-API-Patches/{0200-Villager-Restocks-API.patch => 0199-Villager-Restocks-API.patch} (100%)
 rename Spigot-API-Patches/{0201-Expose-game-version.patch => 0200-Expose-game-version.patch} (100%)
 rename Spigot-API-Patches/{0202-Add-item-slot-convenience-methods.patch => 0201-Add-item-slot-convenience-methods.patch} (100%)
 rename Spigot-API-Patches/{0203-Add-Mob-Goal-API.patch => 0202-Add-Mob-Goal-API.patch} (97%)
 rename Spigot-API-Patches/{0204-World-view-distance-api.patch => 0203-World-view-distance-api.patch} (100%)
 rename Spigot-API-Patches/{0205-Add-villager-reputation-API.patch => 0204-Add-villager-reputation-API.patch} (100%)
 delete mode 100644 Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch
 rename Spigot-Server-Patches/{0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (100%)
 rename Spigot-Server-Patches/{0075-Entity-AddTo-RemoveFrom-World-Events.patch => 0074-Entity-AddTo-RemoveFrom-World-Events.patch} (100%)
 rename Spigot-Server-Patches/{0076-Configurable-Chunk-Inhabited-Time.patch => 0075-Configurable-Chunk-Inhabited-Time.patch} (100%)
 rename Spigot-Server-Patches/{0077-EntityPathfindEvent.patch => 0076-EntityPathfindEvent.patch} (100%)
 rename Spigot-Server-Patches/{0078-Sanitise-RegionFileCache-and-make-configurable.patch => 0077-Sanitise-RegionFileCache-and-make-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0079-Do-not-load-chunks-for-Pathfinding.patch => 0078-Do-not-load-chunks-for-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0080-Add-PlayerUseUnknownEntityEvent.patch => 0079-Add-PlayerUseUnknownEntityEvent.patch} (100%)
 rename Spigot-Server-Patches/{0081-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0080-Fix-reducedDebugInfo-not-initialized-on-client.patch} (100%)
 rename Spigot-Server-Patches/{0082-Configurable-Grass-Spread-Tick-Rate.patch => 0081-Configurable-Grass-Spread-Tick-Rate.patch} (100%)
 rename Spigot-Server-Patches/{0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (100%)
 rename Spigot-Server-Patches/{0084-Remove-Debug-checks-from-DataBits.patch => 0083-Remove-Debug-checks-from-DataBits.patch} (100%)
 rename Spigot-Server-Patches/{0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (100%)
 rename Spigot-Server-Patches/{0086-Workaround-for-setting-passengers-on-players.patch => 0085-Workaround-for-setting-passengers-on-players.patch} (100%)
 rename Spigot-Server-Patches/{0087-Remove-unused-World-Tile-Entity-List.patch => 0086-Remove-unused-World-Tile-Entity-List.patch} (100%)
 rename Spigot-Server-Patches/{0088-Don-t-tick-Skulls-unused-code.patch => 0087-Don-t-tick-Skulls-unused-code.patch} (100%)
 rename Spigot-Server-Patches/{0089-Configurable-Player-Collision.patch => 0088-Configurable-Player-Collision.patch} (100%)
 rename Spigot-Server-Patches/{0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename Spigot-Server-Patches/{0091-Configurable-RCON-IP-address.patch => 0090-Configurable-RCON-IP-address.patch} (100%)
 rename Spigot-Server-Patches/{0092-Prevent-Fire-from-loading-chunks.patch => 0091-Prevent-Fire-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0093-Implement-PlayerLocaleChangeEvent.patch => 0092-Implement-PlayerLocaleChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0094-EntityRegainHealthEvent-isFastRegen-API.patch => 0093-EntityRegainHealthEvent-isFastRegen-API.patch} (100%)
 rename Spigot-Server-Patches/{0095-Add-ability-to-configure-frosted_ice-properties.patch => 0094-Add-ability-to-configure-frosted_ice-properties.patch} (100%)
 rename Spigot-Server-Patches/{0096-remove-null-possibility-for-getServer-singleton.patch => 0095-remove-null-possibility-for-getServer-singleton.patch} (100%)
 rename Spigot-Server-Patches/{0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0096-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%)
 rename Spigot-Server-Patches/{0098-LootTable-API-Replenishable-Lootables-Feature.patch => 0097-LootTable-API-Replenishable-Lootables-Feature.patch} (100%)
 rename Spigot-Server-Patches/{0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (100%)
 rename Spigot-Server-Patches/{0100-System-property-for-disabling-watchdoge.patch => 0099-System-property-for-disabling-watchdoge.patch} (100%)
 rename Spigot-Server-Patches/{0101-Optimize-UserCache-Thread-Safe.patch => 0100-Optimize-UserCache-Thread-Safe.patch} (100%)
 rename Spigot-Server-Patches/{0102-Avoid-blocking-on-Network-Manager-creation.patch => 0101-Avoid-blocking-on-Network-Manager-creation.patch} (100%)
 rename Spigot-Server-Patches/{0103-Optional-TNT-doesn-t-move-in-water.patch => 0102-Optional-TNT-doesn-t-move-in-water.patch} (100%)
 rename Spigot-Server-Patches/{0104-Faster-redstone-torch-rapid-clock-removal.patch => 0103-Faster-redstone-torch-rapid-clock-removal.patch} (100%)
 rename Spigot-Server-Patches/{0105-Add-server-name-parameter.patch => 0104-Add-server-name-parameter.patch} (100%)
 rename Spigot-Server-Patches/{0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0105-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (100%)
 rename Spigot-Server-Patches/{0107-Fix-Double-World-Add-issues.patch => 0106-Fix-Double-World-Add-issues.patch} (100%)
 rename Spigot-Server-Patches/{0108-Fix-Old-Sign-Conversion.patch => 0107-Fix-Old-Sign-Conversion.patch} (100%)
 rename Spigot-Server-Patches/{0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (100%)
 rename Spigot-Server-Patches/{0110-More-informative-vehicle-moved-wrongly-message.patch => 0109-More-informative-vehicle-moved-wrongly-message.patch} (100%)
 rename Spigot-Server-Patches/{0111-Add-setting-for-proxy-online-mode-status.patch => 0110-Add-setting-for-proxy-online-mode-status.patch} (100%)
 rename Spigot-Server-Patches/{0112-Optimise-BlockState-s-hashCode-equals.patch => 0111-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename Spigot-Server-Patches/{0113-Configurable-packet-in-spam-threshold.patch => 0112-Configurable-packet-in-spam-threshold.patch} (100%)
 rename Spigot-Server-Patches/{0114-Configurable-flying-kick-messages.patch => 0113-Configurable-flying-kick-messages.patch} (100%)
 rename Spigot-Server-Patches/{0115-Chunk-registration-fixes.patch => 0114-Chunk-registration-fixes.patch} (100%)
 rename Spigot-Server-Patches/{0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0115-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (100%)
 rename Spigot-Server-Patches/{0117-Auto-fix-bad-Y-levels-on-player-login.patch => 0116-Auto-fix-bad-Y-levels-on-player-login.patch} (100%)
 rename Spigot-Server-Patches/{0118-Option-to-remove-corrupt-tile-entities.patch => 0117-Option-to-remove-corrupt-tile-entities.patch} (100%)
 rename Spigot-Server-Patches/{0119-Add-EntityZapEvent.patch => 0118-Add-EntityZapEvent.patch} (95%)
 rename Spigot-Server-Patches/{0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0119-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (100%)
 rename Spigot-Server-Patches/{0121-Cache-user-authenticator-threads.patch => 0120-Cache-user-authenticator-threads.patch} (100%)
 rename Spigot-Server-Patches/{0122-Optimise-removeQueue.patch => 0121-Optimise-removeQueue.patch} (100%)
 rename Spigot-Server-Patches/{0123-Allow-Reloading-of-Command-Aliases.patch => 0122-Allow-Reloading-of-Command-Aliases.patch} (100%)
 rename Spigot-Server-Patches/{0124-Add-source-to-PlayerExpChangeEvent.patch => 0123-Add-source-to-PlayerExpChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0125-Don-t-let-fishinghooks-use-portals.patch => 0124-Don-t-let-fishinghooks-use-portals.patch} (100%)
 rename Spigot-Server-Patches/{0126-Add-ProjectileCollideEvent.patch => 0125-Add-ProjectileCollideEvent.patch} (97%)
 rename Spigot-Server-Patches/{0127-Prevent-Pathfinding-out-of-World-Border.patch => 0126-Prevent-Pathfinding-out-of-World-Border.patch} (100%)
 rename Spigot-Server-Patches/{0128-Optimize-World.isLoaded-BlockPosition-Z.patch => 0127-Optimize-World.isLoaded-BlockPosition-Z.patch} (100%)
 rename Spigot-Server-Patches/{0129-Bound-Treasure-Maps-to-World-Border.patch => 0128-Bound-Treasure-Maps-to-World-Border.patch} (100%)
 rename Spigot-Server-Patches/{0130-Configurable-Cartographer-Treasure-Maps.patch => 0129-Configurable-Cartographer-Treasure-Maps.patch} (100%)
 rename Spigot-Server-Patches/{0131-Optimize-ItemStack.isEmpty.patch => 0130-Optimize-ItemStack.isEmpty.patch} (100%)
 rename Spigot-Server-Patches/{0132-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0131-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename Spigot-Server-Patches/{0133-Properly-fix-item-duplication-bug.patch => 0132-Properly-fix-item-duplication-bug.patch} (100%)
 rename Spigot-Server-Patches/{0134-String-based-Action-Bar-API.patch => 0133-String-based-Action-Bar-API.patch} (100%)
 rename Spigot-Server-Patches/{0135-Firework-API-s.patch => 0134-Firework-API-s.patch} (100%)
 rename Spigot-Server-Patches/{0136-PlayerTeleportEndGatewayEvent.patch => 0135-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename Spigot-Server-Patches/{0137-Provide-E-TE-Chunk-count-stat-methods.patch => 0136-Provide-E-TE-Chunk-count-stat-methods.patch} (100%)
 rename Spigot-Server-Patches/{0138-Enforce-Sync-Player-Saves.patch => 0137-Enforce-Sync-Player-Saves.patch} (100%)
 rename Spigot-Server-Patches/{0139-Don-t-allow-entities-to-ride-themselves-572.patch => 0138-Don-t-allow-entities-to-ride-themselves-572.patch} (100%)
 rename Spigot-Server-Patches/{0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0139-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (100%)
 rename Spigot-Server-Patches/{0141-Cap-Entity-Collisions.patch => 0140-Cap-Entity-Collisions.patch} (100%)
 rename Spigot-Server-Patches/{0142-Remove-CraftScheduler-Async-Task-Debugger.patch => 0141-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename Spigot-Server-Patches/{0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0142-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (100%)
 rename Spigot-Server-Patches/{0144-Do-not-let-armorstands-drown.patch => 0143-Do-not-let-armorstands-drown.patch} (100%)
 rename Spigot-Server-Patches/{0145-Properly-handle-async-calls-to-restart-the-server.patch => 0144-Properly-handle-async-calls-to-restart-the-server.patch} (100%)
 rename Spigot-Server-Patches/{0146-Add-system-property-to-disable-book-size-limits.patch => 0145-Add-system-property-to-disable-book-size-limits.patch} (100%)
 rename Spigot-Server-Patches/{0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0146-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (100%)
 rename Spigot-Server-Patches/{0148-Add-configuration-option-to-prevent-player-names-fro.patch => 0147-Add-configuration-option-to-prevent-player-names-fro.patch} (100%)
 rename Spigot-Server-Patches/{0149-Use-TerminalConsoleAppender-for-console-improvements.patch => 0148-Use-TerminalConsoleAppender-for-console-improvements.patch} (100%)
 rename Spigot-Server-Patches/{0150-provide-a-configurable-option-to-disable-creeper-lin.patch => 0149-provide-a-configurable-option-to-disable-creeper-lin.patch} (100%)
 rename Spigot-Server-Patches/{0151-Item-canEntityPickup.patch => 0150-Item-canEntityPickup.patch} (100%)
 rename Spigot-Server-Patches/{0152-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0151-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename Spigot-Server-Patches/{0153-PlayerAttemptPickupItemEvent.patch => 0152-PlayerAttemptPickupItemEvent.patch} (100%)
 rename Spigot-Server-Patches/{0154-Add-UnknownCommandEvent.patch => 0153-Add-UnknownCommandEvent.patch} (100%)
 rename Spigot-Server-Patches/{0155-Basic-PlayerProfile-API.patch => 0154-Basic-PlayerProfile-API.patch} (100%)
 rename Spigot-Server-Patches/{0156-Shoulder-Entities-Release-API.patch => 0155-Shoulder-Entities-Release-API.patch} (100%)
 rename Spigot-Server-Patches/{0157-Profile-Lookup-Events.patch => 0156-Profile-Lookup-Events.patch} (100%)
 rename Spigot-Server-Patches/{0158-Block-player-logins-during-server-shutdown.patch => 0157-Block-player-logins-during-server-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0159-Entity-fromMobSpawner.patch => 0158-Entity-fromMobSpawner.patch} (100%)
 rename Spigot-Server-Patches/{0160-Improve-the-Saddle-API-for-Horses.patch => 0159-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename Spigot-Server-Patches/{0161-Implement-ensureServerConversions-API.patch => 0160-Implement-ensureServerConversions-API.patch} (100%)
 rename Spigot-Server-Patches/{0162-Implement-getI18NDisplayName.patch => 0161-Implement-getI18NDisplayName.patch} (100%)
 rename Spigot-Server-Patches/{0163-ProfileWhitelistVerifyEvent.patch => 0162-ProfileWhitelistVerifyEvent.patch} (100%)
 rename Spigot-Server-Patches/{0164-Fix-this-stupid-bullshit.patch => 0163-Fix-this-stupid-bullshit.patch} (100%)
 rename Spigot-Server-Patches/{0165-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0164-Ocelot-despawns-should-honor-nametags-and-leash.patch} (100%)
 rename Spigot-Server-Patches/{0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0165-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (100%)
 rename Spigot-Server-Patches/{0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (100%)
 rename Spigot-Server-Patches/{0168-Allow-specifying-a-custom-authentication-servers-dow.patch => 0167-Allow-specifying-a-custom-authentication-servers-dow.patch} (100%)
 rename Spigot-Server-Patches/{0169-LivingEntity-setKiller.patch => 0168-LivingEntity-setKiller.patch} (100%)
 rename Spigot-Server-Patches/{0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0169-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (100%)
 rename Spigot-Server-Patches/{0171-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0170-Handle-plugin-prefixes-using-Log4J-configuration.patch} (100%)
 rename Spigot-Server-Patches/{0172-Include-Log4J2-SLF4J-implementation.patch => 0171-Include-Log4J2-SLF4J-implementation.patch} (100%)
 rename Spigot-Server-Patches/{0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0172-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (100%)
 rename Spigot-Server-Patches/{0174-Add-PlayerJumpEvent.patch => 0173-Add-PlayerJumpEvent.patch} (100%)
 rename Spigot-Server-Patches/{0175-handle-PacketPlayInKeepAlive-async.patch => 0174-handle-PacketPlayInKeepAlive-async.patch} (100%)
 rename Spigot-Server-Patches/{0176-Expose-client-protocol-version-and-virtual-host.patch => 0175-Expose-client-protocol-version-and-virtual-host.patch} (100%)
 rename Spigot-Server-Patches/{0177-revert-serverside-behavior-of-keepalives.patch => 0176-revert-serverside-behavior-of-keepalives.patch} (100%)
 rename Spigot-Server-Patches/{0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0177-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (100%)
 rename Spigot-Server-Patches/{0179-Option-for-maximum-exp-value-when-merging-orbs.patch => 0178-Option-for-maximum-exp-value-when-merging-orbs.patch} (95%)
 rename Spigot-Server-Patches/{0180-Add-PlayerArmorChangeEvent.patch => 0179-Add-PlayerArmorChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0181-Prevent-logins-from-being-processed-when-the-player-.patch => 0180-Prevent-logins-from-being-processed-when-the-player-.patch} (100%)
 rename Spigot-Server-Patches/{0182-use-CB-BlockState-implementations-for-captured-block.patch => 0181-use-CB-BlockState-implementations-for-captured-block.patch} (100%)
 rename Spigot-Server-Patches/{0183-API-to-get-a-BlockState-without-a-snapshot.patch => 0182-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0184-AsyncTabCompleteEvent.patch => 0183-AsyncTabCompleteEvent.patch} (100%)
 rename Spigot-Server-Patches/{0185-Avoid-NPE-in-PathfinderGoalTempt.patch => 0184-Avoid-NPE-in-PathfinderGoalTempt.patch} (100%)
 rename Spigot-Server-Patches/{0186-PlayerPickupExperienceEvent.patch => 0185-PlayerPickupExperienceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0187-ExperienceOrbMergeEvent.patch => 0186-ExperienceOrbMergeEvent.patch} (91%)
 rename Spigot-Server-Patches/{0188-Ability-to-apply-mending-to-XP-API.patch => 0187-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename Spigot-Server-Patches/{0189-Make-max-squid-spawn-height-configurable.patch => 0188-Make-max-squid-spawn-height-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0190-PreCreatureSpawnEvent.patch => 0189-PreCreatureSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0191-PlayerNaturallySpawnCreaturesEvent.patch => 0190-PlayerNaturallySpawnCreaturesEvent.patch} (100%)
 rename Spigot-Server-Patches/{0192-Add-setPlayerProfile-API-for-Skulls.patch => 0191-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename Spigot-Server-Patches/{0193-Fill-Profile-Property-Events.patch => 0192-Fill-Profile-Property-Events.patch} (100%)
 rename Spigot-Server-Patches/{0194-PlayerAdvancementCriterionGrantEvent.patch => 0193-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename Spigot-Server-Patches/{0195-Add-ArmorStand-Item-Meta.patch => 0194-Add-ArmorStand-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0196-Extend-Player-Interact-cancellation.patch => 0195-Extend-Player-Interact-cancellation.patch} (100%)
 rename Spigot-Server-Patches/{0197-Tameable-getOwnerUniqueId-API.patch => 0196-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename Spigot-Server-Patches/{0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0197-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (100%)
 rename Spigot-Server-Patches/{0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0198-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (100%)
 rename Spigot-Server-Patches/{0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0201-Disable-Explicit-Network-Manager-Flushing.patch => 0200-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename Spigot-Server-Patches/{0202-Implement-extended-PaperServerListPingEvent.patch => 0201-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0203-Improved-Async-Task-Scheduler.patch => 0202-Improved-Async-Task-Scheduler.patch} (100%)
 rename Spigot-Server-Patches/{0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0203-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename Spigot-Server-Patches/{0205-Player.setPlayerProfile-API.patch => 0204-Player.setPlayerProfile-API.patch} (100%)
 rename Spigot-Server-Patches/{0206-Fix-Dragon-Server-Crashes.patch => 0205-Fix-Dragon-Server-Crashes.patch} (100%)
 rename Spigot-Server-Patches/{0207-getPlayerUniqueId-API.patch => 0206-getPlayerUniqueId-API.patch} (100%)
 rename Spigot-Server-Patches/{0208-Make-player-data-saving-configurable.patch => 0207-Make-player-data-saving-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0209-Make-legacy-ping-handler-more-reliable.patch => 0208-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename Spigot-Server-Patches/{0210-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0209-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename Spigot-Server-Patches/{0211-Flag-to-disable-the-channel-limit.patch => 0210-Flag-to-disable-the-channel-limit.patch} (100%)
 rename Spigot-Server-Patches/{0212-Add-method-to-open-already-placed-sign.patch => 0211-Add-method-to-open-already-placed-sign.patch} (100%)
 rename Spigot-Server-Patches/{0213-Configurable-sprint-interruption-on-attack.patch => 0212-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename Spigot-Server-Patches/{0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0213-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (100%)
 rename Spigot-Server-Patches/{0215-EndermanEscapeEvent.patch => 0214-EndermanEscapeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0216-Enderman.teleportRandomly.patch => 0215-Enderman.teleportRandomly.patch} (100%)
 rename Spigot-Server-Patches/{0217-Block-Enderpearl-Travel-Exploit.patch => 0216-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename Spigot-Server-Patches/{0218-Expand-World.spawnParticle-API-and-add-Builder.patch => 0217-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename Spigot-Server-Patches/{0219-EndermanAttackPlayerEvent.patch => 0218-EndermanAttackPlayerEvent.patch} (100%)
 rename Spigot-Server-Patches/{0220-WitchConsumePotionEvent.patch => 0219-WitchConsumePotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0221-WitchThrowPotionEvent.patch => 0220-WitchThrowPotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0221-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename Spigot-Server-Patches/{0223-WitchReadyPotionEvent.patch => 0222-WitchReadyPotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0224-ItemStack-getMaxItemUseDuration.patch => 0223-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename Spigot-Server-Patches/{0225-Implement-EntityTeleportEndGatewayEvent.patch => 0224-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename Spigot-Server-Patches/{0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0225-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename Spigot-Server-Patches/{0227-Fix-CraftEntity-hashCode.patch => 0226-Fix-CraftEntity-hashCode.patch} (100%)
 rename Spigot-Server-Patches/{0228-Configurable-Alternative-LootPool-Luck-Formula.patch => 0227-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename Spigot-Server-Patches/{0229-Print-Error-details-when-failing-to-save-player-data.patch => 0228-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename Spigot-Server-Patches/{0230-Make-shield-blocking-delay-configurable.patch => 0229-Make-shield-blocking-delay-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0230-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (98%)
 rename Spigot-Server-Patches/{0232-PlayerReadyArrowEvent.patch => 0231-PlayerReadyArrowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0233-Fire-EntityShootBowEvent-for-Illusioner.patch => 0232-Fire-EntityShootBowEvent-for-Illusioner.patch} (100%)
 rename Spigot-Server-Patches/{0234-Implement-EntityKnockbackByEntityEvent.patch => 0233-Implement-EntityKnockbackByEntityEvent.patch} (100%)
 rename Spigot-Server-Patches/{0235-Expand-Explosions-API.patch => 0234-Expand-Explosions-API.patch} (100%)
 rename Spigot-Server-Patches/{0236-LivingEntity-Hand-Raised-Item-Use-API.patch => 0235-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename Spigot-Server-Patches/{0237-RangedEntity-API.patch => 0236-RangedEntity-API.patch} (100%)
 rename Spigot-Server-Patches/{0238-Add-config-to-disable-ender-dragon-legacy-check.patch => 0237-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename Spigot-Server-Patches/{0239-Implement-World.getEntity-UUID-API.patch => 0238-Implement-World.getEntity-UUID-API.patch} (100%)
 rename Spigot-Server-Patches/{0240-InventoryCloseEvent-Reason-API.patch => 0239-InventoryCloseEvent-Reason-API.patch} (98%)
 rename Spigot-Server-Patches/{0241-Configurable-Bed-Search-Radius.patch => 0240-Configurable-Bed-Search-Radius.patch} (100%)
 rename Spigot-Server-Patches/{0242-Vex-getSummoner-API.patch => 0241-Vex-getSummoner-API.patch} (100%)
 rename Spigot-Server-Patches/{0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0242-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (100%)
 rename Spigot-Server-Patches/{0244-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0243-Don-t-change-the-Entity-Random-seed-for-squids.patch} (100%)
 rename Spigot-Server-Patches/{0245-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0244-Re-add-vanilla-entity-warnings-for-duplicates.patch} (100%)
 rename Spigot-Server-Patches/{0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0245-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (100%)
 rename Spigot-Server-Patches/{0247-Use-asynchronous-Log4j-2-loggers.patch => 0246-Use-asynchronous-Log4j-2-loggers.patch} (100%)
 rename Spigot-Server-Patches/{0248-add-more-information-to-Entity.toString.patch => 0247-add-more-information-to-Entity.toString.patch} (100%)
 rename Spigot-Server-Patches/{0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0248-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (100%)
 rename Spigot-Server-Patches/{0250-EnderDragon-Events.patch => 0249-EnderDragon-Events.patch} (100%)
 rename Spigot-Server-Patches/{0251-PlayerElytraBoostEvent.patch => 0250-PlayerElytraBoostEvent.patch} (100%)
 rename Spigot-Server-Patches/{0252-Speedup-BlockPos-by-fixing-inlining.patch => 0251-Speedup-BlockPos-by-fixing-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0253-Optimize-RegistryID.c.patch => 0252-Optimize-RegistryID.c.patch} (100%)
 rename Spigot-Server-Patches/{0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0253-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (100%)
 rename Spigot-Server-Patches/{0255-Vanished-players-don-t-have-rights.patch => 0254-Vanished-players-don-t-have-rights.patch} (98%)
 rename Spigot-Server-Patches/{0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0255-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (100%)
 rename Spigot-Server-Patches/{0257-Add-some-Debug-to-Chunk-Entity-slices.patch => 0256-Add-some-Debug-to-Chunk-Entity-slices.patch} (100%)
 rename Spigot-Server-Patches/{0258-EntityTransformedEvent.patch => 0257-EntityTransformedEvent.patch} (96%)
 rename Spigot-Server-Patches/{0259-SkeletonHorse-Additions.patch => 0258-SkeletonHorse-Additions.patch} (100%)
 rename Spigot-Server-Patches/{0260-Prevent-Saving-Bad-entities-to-chunks.patch => 0259-Prevent-Saving-Bad-entities-to-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0261-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0260-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0262-Ignore-Dead-Entities-in-entityList-iteration.patch => 0261-Ignore-Dead-Entities-in-entityList-iteration.patch} (100%)
 rename Spigot-Server-Patches/{0263-Implement-Expanded-ArmorStand-API.patch => 0262-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename Spigot-Server-Patches/{0264-AnvilDamageEvent.patch => 0263-AnvilDamageEvent.patch} (100%)
 rename Spigot-Server-Patches/{0265-Add-TNTPrimeEvent.patch => 0264-Add-TNTPrimeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0266-Break-up-and-make-tab-spam-limits-configurable.patch => 0265-Break-up-and-make-tab-spam-limits-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0267-Add-hand-to-bucket-events.patch => 0266-Add-hand-to-bucket-events.patch} (97%)
 rename Spigot-Server-Patches/{0268-MC-135506-Experience-should-save-as-Integers.patch => 0267-MC-135506-Experience-should-save-as-Integers.patch} (100%)
 rename Spigot-Server-Patches/{0269-Fix-client-rendering-skulls-from-same-user.patch => 0268-Fix-client-rendering-skulls-from-same-user.patch} (100%)
 rename Spigot-Server-Patches/{0270-Add-Early-Warning-Feature-to-WatchDog.patch => 0269-Add-Early-Warning-Feature-to-WatchDog.patch} (100%)
 rename Spigot-Server-Patches/{0271-Make-EnderDragon-implement-Mob.patch => 0270-Make-EnderDragon-implement-Mob.patch} (100%)
 rename Spigot-Server-Patches/{0272-Use-ConcurrentHashMap-in-JsonList.patch => 0271-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename Spigot-Server-Patches/{0273-Use-a-Queue-for-Queueing-Commands.patch => 0272-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename Spigot-Server-Patches/{0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0273-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename Spigot-Server-Patches/{0275-Allow-disabling-armour-stand-ticking.patch => 0274-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0276-Optimize-BlockPosition-helper-methods.patch => 0275-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename Spigot-Server-Patches/{0277-Send-nearby-packets-from-world-player-list-not-serve.patch => 0276-Send-nearby-packets-from-world-player-list-not-serve.patch} (100%)
 rename Spigot-Server-Patches/{0278-Restore-vanlla-default-mob-spawn-range.patch => 0277-Restore-vanlla-default-mob-spawn-range.patch} (100%)
 rename Spigot-Server-Patches/{0279-Optimize-CraftBlockData-Creation.patch => 0278-Optimize-CraftBlockData-Creation.patch} (100%)
 rename Spigot-Server-Patches/{0280-Fix-MC-124320.patch => 0279-Fix-MC-124320.patch} (100%)
 rename Spigot-Server-Patches/{0281-Slime-Pathfinder-Events.patch => 0280-Slime-Pathfinder-Events.patch} (100%)
 rename Spigot-Server-Patches/{0282-Configurable-speed-for-water-flowing-over-lava.patch => 0281-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename Spigot-Server-Patches/{0283-Optimize-RegistryMaterials.patch => 0282-Optimize-RegistryMaterials.patch} (100%)
 rename Spigot-Server-Patches/{0284-Add-PhantomPreSpawnEvent.patch => 0283-Add-PhantomPreSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0285-Add-More-Creeper-API.patch => 0284-Add-More-Creeper-API.patch} (100%)
 rename Spigot-Server-Patches/{0286-Inventory-removeItemAnySlot.patch => 0285-Inventory-removeItemAnySlot.patch} (100%)
 rename Spigot-Server-Patches/{0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0286-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename Spigot-Server-Patches/{0288-Add-ray-tracing-methods-to-LivingEntity.patch => 0287-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0289-Expose-attack-cooldown-methods-for-Player.patch => 0288-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename Spigot-Server-Patches/{0290-Improve-death-events.patch => 0289-Improve-death-events.patch} (98%)
 rename Spigot-Server-Patches/{0291-Allow-chests-to-be-placed-with-NBT-data.patch => 0290-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename Spigot-Server-Patches/{0292-Mob-Pathfinding-API.patch => 0291-Mob-Pathfinding-API.patch} (100%)
 rename Spigot-Server-Patches/{0293-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0292-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename Spigot-Server-Patches/{0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0293-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename Spigot-Server-Patches/{0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0294-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0296-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0295-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0296-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename Spigot-Server-Patches/{0298-Implement-furnace-cook-speed-multiplier-API.patch => 0297-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename Spigot-Server-Patches/{0299-Support-Overriding-World-Seeds.patch => 0298-Support-Overriding-World-Seeds.patch} (100%)
 rename Spigot-Server-Patches/{0300-Optimize-Server-World-Map.patch => 0299-Optimize-Server-World-Map.patch} (100%)
 rename Spigot-Server-Patches/{0301-PreSpawnerSpawnEvent.patch => 0300-PreSpawnerSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0302-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0301-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename Spigot-Server-Patches/{0303-Avoid-dimension-id-collisions.patch => 0302-Avoid-dimension-id-collisions.patch} (100%)
 rename Spigot-Server-Patches/{0304-Honor-EntityAgeable.ageLock.patch => 0303-Honor-EntityAgeable.ageLock.patch} (100%)
 rename Spigot-Server-Patches/{0305-Configurable-connection-throttle-kick-message.patch => 0304-Configurable-connection-throttle-kick-message.patch} (100%)
 rename Spigot-Server-Patches/{0306-Hook-into-CB-plugin-rewrites.patch => 0305-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename Spigot-Server-Patches/{0307-Allow-setting-the-vex-s-summoner.patch => 0306-Allow-setting-the-vex-s-summoner.patch} (100%)
 rename Spigot-Server-Patches/{0308-Add-sun-related-API.patch => 0307-Add-sun-related-API.patch} (100%)
 rename Spigot-Server-Patches/{0309-Check-Drowned-for-Villager-Aggression-Config.patch => 0308-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename Spigot-Server-Patches/{0310-Here-s-Johnny.patch => 0309-Here-s-Johnny.patch} (100%)
 rename Spigot-Server-Patches/{0311-Turtle-API.patch => 0310-Turtle-API.patch} (100%)
 rename Spigot-Server-Patches/{0312-Limit-lightning-strike-effect-distance.patch => 0311-Limit-lightning-strike-effect-distance.patch} (100%)
 rename Spigot-Server-Patches/{0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0312-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename Spigot-Server-Patches/{0314-Call-player-spectator-target-events.patch => 0313-Call-player-spectator-target-events.patch} (100%)
 rename Spigot-Server-Patches/{0315-Add-Velocity-IP-Forwarding-Support.patch => 0314-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename Spigot-Server-Patches/{0316-Add-more-Witch-API.patch => 0315-Add-more-Witch-API.patch} (100%)
 rename Spigot-Server-Patches/{0317-Fix-MC-93764.patch => 0316-Fix-MC-93764.patch} (100%)
 rename Spigot-Server-Patches/{0318-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0317-Add-option-to-prevent-players-from-moving-into-unloa.patch} (100%)
 rename Spigot-Server-Patches/{0319-Reset-players-airTicks-on-respawn.patch => 0318-Reset-players-airTicks-on-respawn.patch} (100%)
 rename Spigot-Server-Patches/{0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0319-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0321-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0320-Use-more-reasonable-thread-count-default-for-bootstr.patch} (100%)
 rename Spigot-Server-Patches/{0322-Optimize-World-Time-Updates.patch => 0321-Optimize-World-Time-Updates.patch} (100%)
 rename Spigot-Server-Patches/{0323-Restore-custom-InventoryHolder-support.patch => 0322-Restore-custom-InventoryHolder-support.patch} (100%)
 rename Spigot-Server-Patches/{0324-Use-Vanilla-Minecart-Speeds.patch => 0323-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename Spigot-Server-Patches/{0325-Fix-SpongeAbsortEvent-handling.patch => 0324-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename Spigot-Server-Patches/{0326-Don-t-allow-digging-into-unloaded-chunks.patch => 0325-Don-t-allow-digging-into-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0327-Optimize-redstone-algorithm.patch => 0326-Optimize-redstone-algorithm.patch} (100%)
 rename Spigot-Server-Patches/{0328-force-entity-dismount-during-teleportation.patch => 0327-force-entity-dismount-during-teleportation.patch} (100%)
 rename Spigot-Server-Patches/{0329-Book-Size-Limits.patch => 0328-Book-Size-Limits.patch} (100%)
 rename Spigot-Server-Patches/{0330-Make-the-default-permission-message-configurable.patch => 0329-Make-the-default-permission-message-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0331-Add-more-Zombie-API.patch => 0330-Add-more-Zombie-API.patch} (100%)
 rename Spigot-Server-Patches/{0332-Prevent-rayTrace-from-loading-chunks.patch => 0331-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0333-Handle-Large-Packets-disconnecting-client.patch => 0332-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename Spigot-Server-Patches/{0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0333-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (100%)
 rename Spigot-Server-Patches/{0335-Add-PlayerConnectionCloseEvent.patch => 0334-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0336-Prevent-Enderman-from-loading-chunks.patch => 0335-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0336-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename Spigot-Server-Patches/{0338-Fix-PlayerEditBookEvent.patch => 0337-Fix-PlayerEditBookEvent.patch} (100%)
 rename Spigot-Server-Patches/{0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0338-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename Spigot-Server-Patches/{0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0339-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename Spigot-Server-Patches/{0341-Block-Entity-remove-from-being-called-on-Players.patch => 0340-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename Spigot-Server-Patches/{0342-BlockDestroyEvent.patch => 0341-BlockDestroyEvent.patch} (100%)
 rename Spigot-Server-Patches/{0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0342-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename Spigot-Server-Patches/{0344-Fix-sign-edit-memory-leak.patch => 0343-Fix-sign-edit-memory-leak.patch} (100%)
 rename Spigot-Server-Patches/{0345-Limit-Client-Sign-length-more.patch => 0344-Limit-Client-Sign-length-more.patch} (100%)
 rename Spigot-Server-Patches/{0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0345-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename Spigot-Server-Patches/{0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0346-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename Spigot-Server-Patches/{0348-Handle-Oversized-Tile-Entities-in-chunks.patch => 0347-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (100%)
 rename Spigot-Server-Patches/{0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename Spigot-Server-Patches/{0351-Allow-Saving-of-Oversized-Chunks.patch => 0350-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename Spigot-Server-Patches/{0353-Add-LivingEntity-getTargetEntity.patch => 0352-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename Spigot-Server-Patches/{0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename Spigot-Server-Patches/{0355-Entity-getEntitySpawnReason.patch => 0354-Entity-getEntitySpawnReason.patch} (100%)
 rename Spigot-Server-Patches/{0356-Update-entity-Metadata-for-all-tracked-players.patch => 0355-Update-entity-Metadata-for-all-tracked-players.patch} (100%)
 rename Spigot-Server-Patches/{0357-Fire-event-on-GS4-query.patch => 0356-Fire-event-on-GS4-query.patch} (100%)
 rename Spigot-Server-Patches/{0358-Implement-PlayerPostRespawnEvent.patch => 0357-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename Spigot-Server-Patches/{0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (100%)
 rename Spigot-Server-Patches/{0361-Server-Tick-Events.patch => 0360-Server-Tick-Events.patch} (100%)
 rename Spigot-Server-Patches/{0362-PlayerDeathEvent-getItemsToKeep.patch => 0361-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename Spigot-Server-Patches/{0363-Optimize-Captured-TileEntity-Lookup.patch => 0362-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename Spigot-Server-Patches/{0364-Add-Heightmap-API.patch => 0363-Add-Heightmap-API.patch} (100%)
 rename Spigot-Server-Patches/{0365-Mob-Spawner-API-Enhancements.patch => 0364-Mob-Spawner-API-Enhancements.patch} (100%)
 rename Spigot-Server-Patches/{0366-Per-Player-View-Distance-API-placeholders.patch => 0365-Per-Player-View-Distance-API-placeholders.patch} (100%)
 rename Spigot-Server-Patches/{0367-Fix-CB-call-to-changed-postToMainThread-method.patch => 0366-Fix-CB-call-to-changed-postToMainThread-method.patch} (100%)
 rename Spigot-Server-Patches/{0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename Spigot-Server-Patches/{0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename Spigot-Server-Patches/{0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0371-Duplicate-UUID-Resolve-Option.patch => 0370-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename Spigot-Server-Patches/{0372-improve-CraftWorld-isChunkLoaded.patch => 0371-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename Spigot-Server-Patches/{0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (100%)
 rename Spigot-Server-Patches/{0374-Fix-some-generation-concurrency-issues.patch => 0373-Fix-some-generation-concurrency-issues.patch} (100%)
 rename Spigot-Server-Patches/{0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (100%)
 rename Spigot-Server-Patches/{0376-ChunkMapDistance-CME.patch => 0375-ChunkMapDistance-CME.patch} (100%)
 rename Spigot-Server-Patches/{0377-Implement-CraftBlockSoundGroup.patch => 0376-Implement-CraftBlockSoundGroup.patch} (100%)
 rename Spigot-Server-Patches/{0378-Chunk-debug-command.patch => 0377-Chunk-debug-command.patch} (100%)
 rename Spigot-Server-Patches/{0379-incremental-chunk-saving.patch => 0378-incremental-chunk-saving.patch} (100%)
 rename Spigot-Server-Patches/{0380-Catch-exceptions-from-dispenser-entity-spawns.patch => 0379-Catch-exceptions-from-dispenser-entity-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0381-Fix-World-isChunkGenerated-calls.patch => 0380-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename Spigot-Server-Patches/{0382-Show-blockstate-location-if-we-failed-to-read-it.patch => 0381-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename Spigot-Server-Patches/{0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch => 0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch} (100%)
 rename Spigot-Server-Patches/{0384-Use-ChunkStatus-cache-when-saving-protochunks.patch => 0383-Use-ChunkStatus-cache-when-saving-protochunks.patch} (100%)
 rename Spigot-Server-Patches/{0385-Anti-Xray.patch => 0384-Anti-Xray.patch} (100%)
 rename Spigot-Server-Patches/{0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename Spigot-Server-Patches/{0387-Configurable-projectile-relative-velocity.patch => 0386-Configurable-projectile-relative-velocity.patch} (100%)
 rename Spigot-Server-Patches/{0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (100%)
 rename Spigot-Server-Patches/{0389-offset-item-frame-ticking.patch => 0388-offset-item-frame-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0390-Avoid-hopper-searches-if-there-are-no-items.patch => 0389-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename Spigot-Server-Patches/{0391-Asynchronous-chunk-IO-and-loading.patch => 0390-Asynchronous-chunk-IO-and-loading.patch} (100%)
 rename Spigot-Server-Patches/{0392-Use-getChunkIfLoadedImmediately-in-places.patch => 0391-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename Spigot-Server-Patches/{0393-Reduce-sync-loads.patch => 0392-Reduce-sync-loads.patch} (100%)
 rename Spigot-Server-Patches/{0394-Implement-alternative-item-despawn-rate.patch => 0393-Implement-alternative-item-despawn-rate.patch} (100%)
 rename Spigot-Server-Patches/{0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (100%)
 rename Spigot-Server-Patches/{0396-Fix-MC-158900.patch => 0395-Fix-MC-158900.patch} (100%)
 rename Spigot-Server-Patches/{0397-implement-optional-per-player-mob-spawns.patch => 0396-implement-optional-per-player-mob-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0398-Prevent-consuming-the-wrong-itemstack.patch => 0397-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename Spigot-Server-Patches/{0399-only-add-passanger-entities-once-from-spawners.patch => 0398-only-add-passanger-entities-once-from-spawners.patch} (100%)
 rename Spigot-Server-Patches/{0400-Fix-nether-portal-creation.patch => 0399-Fix-nether-portal-creation.patch} (100%)
 rename Spigot-Server-Patches/{0401-Generator-Settings.patch => 0400-Generator-Settings.patch} (100%)
 rename Spigot-Server-Patches/{0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch => 0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch} (100%)
 rename Spigot-Server-Patches/{0403-Fix-MC-161754.patch => 0402-Fix-MC-161754.patch} (100%)
 rename Spigot-Server-Patches/{0404-Performance-improvement-for-Chunk.getEntities.patch => 0403-Performance-improvement-for-Chunk.getEntities.patch} (100%)
 rename Spigot-Server-Patches/{0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename Spigot-Server-Patches/{0406-Expose-the-internal-current-tick.patch => 0405-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-Server-Patches/{0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (100%)
 rename Spigot-Server-Patches/{0408-Add-option-to-disable-pillager-patrols.patch => 0407-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename Spigot-Server-Patches/{0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (100%)
 rename Spigot-Server-Patches/{0410-PlayerLaunchProjectileEvent.patch => 0409-PlayerLaunchProjectileEvent.patch} (100%)
 rename Spigot-Server-Patches/{0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename Spigot-Server-Patches/{0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename Spigot-Server-Patches/{0413-Fix-spawn-radius-being-treated-as-0.patch => 0412-Fix-spawn-radius-being-treated-as-0.patch} (100%)
 rename Spigot-Server-Patches/{0414-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0413-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename Spigot-Server-Patches/{0415-Optimize-Hoppers.patch => 0414-Optimize-Hoppers.patch} (100%)
 rename Spigot-Server-Patches/{0416-PlayerDeathEvent-shouldDropExperience.patch => 0415-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename Spigot-Server-Patches/{0417-Prevent-bees-loading-chunks-checking-hive-position.patch => 0416-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename Spigot-Server-Patches/{0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename Spigot-Server-Patches/{0419-Guard-against-serializing-mismatching-chunk-coordina.patch => 0418-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename Spigot-Server-Patches/{0420-Optimise-IEntityAccess-getPlayerByUUID.patch => 0419-Optimise-IEntityAccess-getPlayerByUUID.patch} (100%)
 rename Spigot-Server-Patches/{0421-Fix-items-not-falling-correctly.patch => 0420-Fix-items-not-falling-correctly.patch} (100%)
 rename Spigot-Server-Patches/{0422-Lag-compensate-eating.patch => 0421-Lag-compensate-eating.patch} (100%)
 rename Spigot-Server-Patches/{0423-Optimize-call-to-getFluid-for-explosions.patch => 0422-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename Spigot-Server-Patches/{0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename Spigot-Server-Patches/{0425-Entity-Activation-Range-2.0.patch => 0424-Entity-Activation-Range-2.0.patch} (100%)
 rename Spigot-Server-Patches/{0426-Add-effect-to-block-break-naturally.patch => 0425-Add-effect-to-block-break-naturally.patch} (100%)
 rename Spigot-Server-Patches/{0427-Tracking-Range-Improvements.patch => 0426-Tracking-Range-Improvements.patch} (100%)
 rename Spigot-Server-Patches/{0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch => 0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch} (100%)
 rename Spigot-Server-Patches/{0429-Fix-items-vanishing-through-end-portal.patch => 0428-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename Spigot-Server-Patches/{0430-Seed-based-feature-search.patch => 0429-Seed-based-feature-search.patch} (100%)
 rename Spigot-Server-Patches/{0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename Spigot-Server-Patches/{0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0433-Be-more-tolerant-of-invalid-attributes.patch => 0432-Be-more-tolerant-of-invalid-attributes.patch} (100%)
 rename Spigot-Server-Patches/{0434-Allow-overriding-the-java-version-check.patch => 0433-Allow-overriding-the-java-version-check.patch} (100%)
 rename Spigot-Server-Patches/{0435-Add-ThrownEggHatchEvent.patch => 0434-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-Server-Patches/{0436-Optimise-random-block-ticking.patch => 0435-Optimise-random-block-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0437-Entity-Jump-API.patch => 0436-Entity-Jump-API.patch} (100%)
 rename Spigot-Server-Patches/{0438-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0437-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename Spigot-Server-Patches/{0439-Make-the-GUI-graph-fancier.patch => 0438-Make-the-GUI-graph-fancier.patch} (100%)
 rename Spigot-Server-Patches/{0440-Backport-fix-for-MC-167561.patch => 0439-Backport-fix-for-MC-167561.patch} (100%)
 rename Spigot-Server-Patches/{0441-add-hand-to-BlockMultiPlaceEvent.patch => 0440-add-hand-to-BlockMultiPlaceEvent.patch} (89%)
 rename Spigot-Server-Patches/{0442-Prevent-teleporting-dead-entities.patch => 0441-Prevent-teleporting-dead-entities.patch} (100%)
 rename Spigot-Server-Patches/{0443-Validate-tripwire-hook-placement-before-update.patch => 0442-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename Spigot-Server-Patches/{0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename Spigot-Server-Patches/{0445-Configurable-chance-of-villager-zombie-infection.patch => 0444-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename Spigot-Server-Patches/{0446-Optimise-Chunk-getFluid.patch => 0445-Optimise-Chunk-getFluid.patch} (100%)
 rename Spigot-Server-Patches/{0447-Optimise-TickListServer-by-rewriting-it.patch => 0446-Optimise-TickListServer-by-rewriting-it.patch} (100%)
 rename Spigot-Server-Patches/{0448-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0447-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename Spigot-Server-Patches/{0449-Ensure-Entity-is-never-double-registered.patch => 0448-Ensure-Entity-is-never-double-registered.patch} (100%)
 rename Spigot-Server-Patches/{0450-Fix-unregistering-entities-from-unloading-chunks.patch => 0449-Fix-unregistering-entities-from-unloading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0450-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0451-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename Spigot-Server-Patches/{0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0452-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch => 0453-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch} (100%)
 rename Spigot-Server-Patches/{0455-Don-t-tick-dead-players.patch => 0454-Don-t-tick-dead-players.patch} (100%)
 rename Spigot-Server-Patches/{0456-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0455-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename Spigot-Server-Patches/{0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0456-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (100%)
 rename Spigot-Server-Patches/{0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch => 0457-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch} (100%)
 rename Spigot-Server-Patches/{0459-Increase-Light-Queue-Size.patch => 0458-Increase-Light-Queue-Size.patch} (100%)
 rename Spigot-Server-Patches/{0460-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0459-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (100%)
 rename Spigot-Server-Patches/{0461-Don-t-move-existing-players-to-world-spawn.patch => 0460-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename Spigot-Server-Patches/{0462-Add-tick-times-API-and-mspt-command.patch => 0461-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename Spigot-Server-Patches/{0463-Expose-MinecraftServer-isRunning.patch => 0462-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-Server-Patches/{0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch => 0463-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch} (100%)
 rename Spigot-Server-Patches/{0465-Remove-streams-from-Mob-AI-System.patch => 0464-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename Spigot-Server-Patches/{0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0465-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (100%)
 rename Spigot-Server-Patches/{0467-Async-command-map-building.patch => 0466-Async-command-map-building.patch} (100%)
 rename Spigot-Server-Patches/{0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch => 0467-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch} (100%)
 rename Spigot-Server-Patches/{0469-Optimize-Pathfinding.patch => 0468-Optimize-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch => 0469-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch} (100%)
 rename Spigot-Server-Patches/{0471-Reduce-Either-Optional-allocation.patch => 0470-Reduce-Either-Optional-allocation.patch} (100%)
 rename Spigot-Server-Patches/{0472-Remove-streams-from-PairedQueue.patch => 0471-Remove-streams-from-PairedQueue.patch} (100%)
 rename Spigot-Server-Patches/{0473-Remove-streams-from-MinecraftKey.patch => 0472-Remove-streams-from-MinecraftKey.patch} (100%)
 rename Spigot-Server-Patches/{0474-Reduce-memory-footprint-of-NBTTagCompound.patch => 0473-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename Spigot-Server-Patches/{0475-Prevent-opening-inventories-when-frozen.patch => 0474-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename Spigot-Server-Patches/{0476-Optimise-ArraySetSorted-removeIf.patch => 0475-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename Spigot-Server-Patches/{0477-Don-t-run-entity-collision-code-if-not-needed.patch => 0476-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0478-Optimise-entity-hard-collision-checking.patch => 0477-Optimise-entity-hard-collision-checking.patch} (100%)
 rename Spigot-Server-Patches/{0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0478-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (100%)
 rename Spigot-Server-Patches/{0480-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0479-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename Spigot-Server-Patches/{0481-Implement-Player-Client-Options-API.patch => 0480-Implement-Player-Client-Options-API.patch} (100%)
 rename Spigot-Server-Patches/{0482-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0481-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename Spigot-Server-Patches/{0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0482-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename Spigot-Server-Patches/{0484-Broadcast-join-message-to-console.patch => 0483-Broadcast-join-message-to-console.patch} (100%)
 rename Spigot-Server-Patches/{0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0484-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename Spigot-Server-Patches/{0486-Load-Chunks-for-Login-Asynchronously.patch => 0485-Load-Chunks-for-Login-Asynchronously.patch} (100%)
 rename Spigot-Server-Patches/{0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0486-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename Spigot-Server-Patches/{0488-Allow-sleeping-players-to-float.patch => 0487-Allow-sleeping-players-to-float.patch} (100%)
 rename Spigot-Server-Patches/{0489-Add-PlayerAttackEntityCooldownResetEvent.patch => 0488-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-Server-Patches/{0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0489-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (100%)
 rename Spigot-Server-Patches/{0491-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0490-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename Spigot-Server-Patches/{0492-Add-phantom-creative-and-insomniac-controls.patch => 0491-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename Spigot-Server-Patches/{0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0492-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (97%)
 rename Spigot-Server-Patches/{0494-Implement-Brigadier-Mojang-API.patch => 0493-Implement-Brigadier-Mojang-API.patch} (100%)
 rename Spigot-Server-Patches/{0495-Villager-Restocks-API.patch => 0494-Villager-Restocks-API.patch} (100%)
 rename Spigot-Server-Patches/{0496-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0495-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0497-Expose-game-version.patch => 0496-Expose-game-version.patch} (100%)
 rename Spigot-Server-Patches/{0498-Sync-position-on-teleportation.patch => 0497-Sync-position-on-teleportation.patch} (100%)
 rename Spigot-Server-Patches/{0499-Optimize-Voxel-Shape-Merging.patch => 0498-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename Spigot-Server-Patches/{0500-Cleanup-Region-Files-Direct-Memory-on-close.patch => 0499-Cleanup-Region-Files-Direct-Memory-on-close.patch} (100%)
 rename Spigot-Server-Patches/{0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0500-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename Spigot-Server-Patches/{0502-Implement-Mob-Goal-API.patch => 0501-Implement-Mob-Goal-API.patch} (100%)
 rename Spigot-Server-Patches/{0503-Optimize-entity-list-iteration-requiring-entities-be.patch => 0502-Optimize-entity-list-iteration-requiring-entities-be.patch} (100%)
 rename Spigot-Server-Patches/{0504-Use-distance-map-to-optimise-entity-tracker.patch => 0503-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0505-Optimize-isOutsideRange-to-use-distance-maps.patch => 0504-Optimize-isOutsideRange-to-use-distance-maps.patch} (100%)
 rename Spigot-Server-Patches/{0506-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0505-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename Spigot-Server-Patches/{0507-No-Tick-view-distance-implementation.patch => 0506-No-Tick-view-distance-implementation.patch} (100%)
 rename Spigot-Server-Patches/{0508-Add-villager-reputation-API.patch => 0507-Add-villager-reputation-API.patch} (100%)

diff --git a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
deleted file mode 100644
index 6b76ad615..000000000
--- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sun, 20 Mar 2016 06:44:49 -0400
-Subject: [PATCH] Access items by EquipmentSlot
-
-
-diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index 88ce9dc6b94fec5ffe50866e4b5e0c18021d6158..96916ec95e124b984b51fc60c601274c87dc9447 100644
---- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
-+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-@@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory {
-     @Override
-     @Nullable
-     public HumanEntity getHolder();
-+
-+    // Paper start
-+    /**
-+     * Gets the {@link ItemStack} found in the slot.
-+     *
-+     * @param slot The slot
-+     * @return The item stack in the slot
-+     */
-+    @Nullable
-+    ItemStack getItem(@NotNull EquipmentSlot slot);
-+
-+    /**
-+     * Sets the {@link ItemStack} at the given {@link EquipmentSlot}.
-+     *
-+     * @param slot The slot for the stack
-+     * @param stack The item stack to set
-+     */
-+    void setItem(@NotNull EquipmentSlot slot, @Nullable ItemStack stack);
-+    // Paper end
- }
diff --git a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/Spigot-API-Patches/0029-EntityPathfindEvent.patch b/Spigot-API-Patches/0028-EntityPathfindEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0029-EntityPathfindEvent.patch
rename to Spigot-API-Patches/0028-EntityPathfindEvent.patch
diff --git a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch
similarity index 100%
rename from Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
rename to Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch
diff --git a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0030-Add-MetadataStoreBase.removeAll-Plugin.patch
similarity index 100%
rename from Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
rename to Spigot-API-Patches/0030-Add-MetadataStoreBase.removeAll-Plugin.patch
diff --git a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch
similarity index 100%
rename from Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
rename to Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch
diff --git a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0035-LootTable-API.patch
similarity index 100%
rename from Spigot-API-Patches/0036-LootTable-API.patch
rename to Spigot-API-Patches/0035-LootTable-API.patch
diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0036-Add-EntityZapEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0037-Add-EntityZapEvent.patch
rename to Spigot-API-Patches/0036-Add-EntityZapEvent.patch
diff --git a/Spigot-API-Patches/0038-Misc-Utils.patch b/Spigot-API-Patches/0037-Misc-Utils.patch
similarity index 100%
rename from Spigot-API-Patches/0038-Misc-Utils.patch
rename to Spigot-API-Patches/0037-Misc-Utils.patch
diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
diff --git a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0039-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-API-Patches/0039-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
rename to Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch
diff --git a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
similarity index 100%
rename from Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
rename to Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
diff --git a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/Spigot-API-Patches/0044-IllegalPacketEvent.patch b/Spigot-API-Patches/0043-IllegalPacketEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0044-IllegalPacketEvent.patch
rename to Spigot-API-Patches/0043-IllegalPacketEvent.patch
diff --git a/Spigot-API-Patches/0045-Fireworks-API-s.patch b/Spigot-API-Patches/0044-Fireworks-API-s.patch
similarity index 100%
rename from Spigot-API-Patches/0045-Fireworks-API-s.patch
rename to Spigot-API-Patches/0044-Fireworks-API-s.patch
diff --git a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch
diff --git a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch
similarity index 100%
rename from Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
rename to Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch
diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
similarity index 100%
rename from Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
rename to Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
diff --git a/Spigot-API-Patches/0052-Item-canEntityPickup.patch b/Spigot-API-Patches/0051-Item-canEntityPickup.patch
similarity index 100%
rename from Spigot-API-Patches/0052-Item-canEntityPickup.patch
rename to Spigot-API-Patches/0051-Item-canEntityPickup.patch
diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
rename to Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch
diff --git a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
rename to Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch
diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
similarity index 100%
rename from Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
rename to Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
rename to Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
diff --git a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch b/Spigot-API-Patches/0057-Profile-Lookup-Events.patch
similarity index 100%
rename from Spigot-API-Patches/0058-Profile-Lookup-Events.patch
rename to Spigot-API-Patches/0057-Profile-Lookup-Events.patch
diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
similarity index 100%
rename from Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
rename to Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
diff --git a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch b/Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch
diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0060-ensureServerConversions-API.patch
similarity index 100%
rename from Spigot-API-Patches/0061-ensureServerConversions-API.patch
rename to Spigot-API-Patches/0060-ensureServerConversions-API.patch
diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch
similarity index 100%
rename from Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
rename to Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch
diff --git a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
rename to Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch
diff --git a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch
similarity index 100%
rename from Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
rename to Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch
diff --git a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch
similarity index 100%
rename from Spigot-API-Patches/0065-LivingEntity-setKiller.patch
rename to Spigot-API-Patches/0064-LivingEntity-setKiller.patch
diff --git a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch
similarity index 100%
rename from Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
rename to Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch
diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch
similarity index 100%
rename from Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
rename to Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch
diff --git a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
similarity index 100%
rename from Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
rename to Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
rename to Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch
diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
rename to Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch
diff --git a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
rename to Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch
diff --git a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch
similarity index 100%
rename from Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
rename to Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch
diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
rename to Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch
diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
rename to Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch
diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
rename to Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch
diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch
similarity index 100%
rename from Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
rename to Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch
diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
rename to Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch
diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0083-Optimize-Hoppers.patch
similarity index 100%
rename from Spigot-API-Patches/0084-Optimize-Hoppers.patch
rename to Spigot-API-Patches/0083-Optimize-Hoppers.patch
diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch
similarity index 86%
rename from Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch
index 1f7213f94..b911542a6 100644
--- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
-index 0c066bdfc9c3e3d56519870e51dfe487d0580414..957a60167215d00e9e0edaf418736f7f24c0a04b 100644
+index 26c996cd41acc88490ac0135a9239cffc03e8efb..65e68da98ab66ed781bce2f0dbe0913be48d2990 100644
 --- a/src/main/java/org/bukkit/entity/Tameable.java
 +++ b/src/main/java/org/bukkit/entity/Tameable.java
 @@ -1,5 +1,6 @@
@@ -16,8 +16,8 @@ index 0c066bdfc9c3e3d56519870e51dfe487d0580414..957a60167215d00e9e0edaf418736f7f
 +import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
- public interface Tameable extends Entity {
-@@ -25,9 +26,22 @@ public interface Tameable extends Entity {
+ public interface Tameable extends Animals {
+@@ -25,9 +26,22 @@ public interface Tameable extends Animals {
       */
      public void setTamed(boolean tame);
  
diff --git a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
rename to Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch
diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
similarity index 100%
rename from Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
rename to Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0088-getPlayerUniqueId-API.patch
similarity index 100%
rename from Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
rename to Spigot-API-Patches/0088-getPlayerUniqueId-API.patch
diff --git a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
rename to Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
diff --git a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
rename to Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0091-Add-Ban-Methods-to-Player-Objects.patch
similarity index 100%
rename from Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
rename to Spigot-API-Patches/0091-Add-Ban-Methods-to-Player-Objects.patch
diff --git a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch b/Spigot-API-Patches/0092-EndermanEscapeEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0093-EndermanEscapeEvent.patch
rename to Spigot-API-Patches/0092-EndermanEscapeEvent.patch
diff --git a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0093-Enderman.teleportRandomly.patch
similarity index 100%
rename from Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
rename to Spigot-API-Patches/0093-Enderman.teleportRandomly.patch
diff --git a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch
similarity index 100%
rename from Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
rename to Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch
diff --git a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0095-Location.isChunkLoaded-API.patch
similarity index 100%
rename from Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
rename to Spigot-API-Patches/0095-Location.isChunkLoaded-API.patch
diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0096-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-API-Patches/0096-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0097-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
rename to Spigot-API-Patches/0097-EndermanAttackPlayerEvent.patch
diff --git a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0098-Close-Plugin-Class-Loaders-on-Disable.patch
similarity index 100%
rename from Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
rename to Spigot-API-Patches/0098-Close-Plugin-Class-Loaders-on-Disable.patch
diff --git a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0099-WitchConsumePotionEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
rename to Spigot-API-Patches/0099-WitchConsumePotionEvent.patch
diff --git a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0100-WitchThrowPotionEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
rename to Spigot-API-Patches/0100-WitchThrowPotionEvent.patch
diff --git a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0101-Location.toBlockLocation-toCenterLocation.patch
similarity index 100%
rename from Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
rename to Spigot-API-Patches/0101-Location.toBlockLocation-toCenterLocation.patch
diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0102-PotionEffect-clone-methods.patch
similarity index 100%
rename from Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
rename to Spigot-API-Patches/0102-PotionEffect-clone-methods.patch
diff --git a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0103-WitchReadyPotionEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
rename to Spigot-API-Patches/0103-WitchReadyPotionEvent.patch
diff --git a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0104-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-API-Patches/0104-ItemStack-getMaxItemUseDuration.patch
diff --git a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0105-Add-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
rename to Spigot-API-Patches/0105-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
rename to Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch
diff --git a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0107-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 100%
rename from Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-API-Patches/0107-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0108-Add-getNearbyXXX-methods-to-Location.patch
similarity index 100%
rename from Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch
rename to Spigot-API-Patches/0108-Add-getNearbyXXX-methods-to-Location.patch
diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0109-PlayerReadyArrowEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
rename to Spigot-API-Patches/0109-PlayerReadyArrowEvent.patch
diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0110-Add-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
rename to Spigot-API-Patches/0110-Add-EntityKnockbackByEntityEvent.patch
diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0111-Expand-Explosions-API.patch
similarity index 100%
rename from Spigot-API-Patches/0112-Expand-Explosions-API.patch
rename to Spigot-API-Patches/0111-Expand-Explosions-API.patch
diff --git a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0112-ItemStack-API-additions-for-quantity-flags-lore.patch
similarity index 100%
rename from Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
rename to Spigot-API-Patches/0112-ItemStack-API-additions-for-quantity-flags-lore.patch
diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0114-RangedEntity-API.patch
similarity index 100%
rename from Spigot-API-Patches/0115-RangedEntity-API.patch
rename to Spigot-API-Patches/0114-RangedEntity-API.patch
diff --git a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch
similarity index 100%
rename from Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
rename to Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch
diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0116-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
rename to Spigot-API-Patches/0116-InventoryCloseEvent-Reason-API.patch
diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0117-Entity-getChunk-API.patch
similarity index 100%
rename from Spigot-API-Patches/0118-Entity-getChunk-API.patch
rename to Spigot-API-Patches/0117-Entity-getChunk-API.patch
diff --git a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0118-Add-an-asterisk-to-legacy-API-plugins.patch
similarity index 100%
rename from Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
rename to Spigot-API-Patches/0118-Add-an-asterisk-to-legacy-API-plugins.patch
diff --git a/Spigot-API-Patches/0120-EnderDragon-Events.patch b/Spigot-API-Patches/0119-EnderDragon-Events.patch
similarity index 100%
rename from Spigot-API-Patches/0120-EnderDragon-Events.patch
rename to Spigot-API-Patches/0119-EnderDragon-Events.patch
diff --git a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0120-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
rename to Spigot-API-Patches/0120-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0121-PlayerElytraBoostEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
rename to Spigot-API-Patches/0121-PlayerElytraBoostEvent.patch
diff --git a/Spigot-API-Patches/0123-EntityTransformedEvent.patch b/Spigot-API-Patches/0122-EntityTransformedEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0123-EntityTransformedEvent.patch
rename to Spigot-API-Patches/0122-EntityTransformedEvent.patch
diff --git a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0123-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-API-Patches/0123-Allow-disabling-armour-stand-ticking.patch
diff --git a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0124-SkeletonHorse-Additions.patch
similarity index 100%
rename from Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
rename to Spigot-API-Patches/0124-SkeletonHorse-Additions.patch
diff --git a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0125-Expand-Location-Manipulation-API.patch
similarity index 100%
rename from Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
rename to Spigot-API-Patches/0125-Expand-Location-Manipulation-API.patch
diff --git a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0126-Expand-ArmorStand-API.patch
similarity index 100%
rename from Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
rename to Spigot-API-Patches/0126-Expand-ArmorStand-API.patch
diff --git a/Spigot-API-Patches/0128-AnvilDamageEvent.patch b/Spigot-API-Patches/0127-AnvilDamageEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0128-AnvilDamageEvent.patch
rename to Spigot-API-Patches/0127-AnvilDamageEvent.patch
diff --git a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch
similarity index 100%
rename from Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
rename to Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch
diff --git a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0129-Add-hand-to-bucket-events.patch
similarity index 100%
rename from Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
rename to Spigot-API-Patches/0129-Add-hand-to-bucket-events.patch
diff --git a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0130-Add-TNTPrimeEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
rename to Spigot-API-Patches/0130-Add-TNTPrimeEvent.patch
diff --git a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch
similarity index 100%
rename from Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
rename to Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch
diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0132-Async-Chunks-API.patch
similarity index 100%
rename from Spigot-API-Patches/0133-Async-Chunks-API.patch
rename to Spigot-API-Patches/0132-Async-Chunks-API.patch
diff --git a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0133-Make-EnderDragon-extend-Mob.patch
similarity index 100%
rename from Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
rename to Spigot-API-Patches/0133-Make-EnderDragon-extend-Mob.patch
diff --git a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-API-Patches/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
similarity index 100%
rename from Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
rename to Spigot-API-Patches/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
similarity index 100%
rename from Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
rename to Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
diff --git a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0137-Slime-Pathfinder-Events.patch
similarity index 100%
rename from Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
rename to Spigot-API-Patches/0137-Slime-Pathfinder-Events.patch
diff --git a/Spigot-API-Patches/0139-isChunkGenerated-API.patch b/Spigot-API-Patches/0138-isChunkGenerated-API.patch
similarity index 100%
rename from Spigot-API-Patches/0139-isChunkGenerated-API.patch
rename to Spigot-API-Patches/0138-isChunkGenerated-API.patch
diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0139-Add-More-Creeper-API.patch
similarity index 100%
rename from Spigot-API-Patches/0140-Add-More-Creeper-API.patch
rename to Spigot-API-Patches/0139-Add-More-Creeper-API.patch
diff --git a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0140-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
rename to Spigot-API-Patches/0140-Add-PhantomPreSpawnEvent.patch
diff --git a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0141-Add-source-block-to-BlockPhysicsEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
rename to Spigot-API-Patches/0141-Add-source-block-to-BlockPhysicsEvent.patch
diff --git a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0142-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
rename to Spigot-API-Patches/0142-Inventory-removeItemAnySlot.patch
diff --git a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/Spigot-API-Patches/0145-Improve-death-events.patch b/Spigot-API-Patches/0144-Improve-death-events.patch
similarity index 100%
rename from Spigot-API-Patches/0145-Improve-death-events.patch
rename to Spigot-API-Patches/0144-Improve-death-events.patch
diff --git a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0145-Mob-Pathfinding-API.patch
similarity index 100%
rename from Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
rename to Spigot-API-Patches/0145-Mob-Pathfinding-API.patch
diff --git a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to Spigot-API-Patches/0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0148-Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 100%
rename from Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
rename to Spigot-API-Patches/0148-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0149-Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 100%
rename from Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
rename to Spigot-API-Patches/0149-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0150-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-API-Patches/0150-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0151-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
rename to Spigot-API-Patches/0151-PreSpawnerSpawnEvent.patch
diff --git a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0152-Remove-Precondition-on-name-for-AttributeModifier.patch
similarity index 100%
rename from Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
rename to Spigot-API-Patches/0152-Remove-Precondition-on-name-for-AttributeModifier.patch
diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0153-Material-API-additions.patch
similarity index 100%
rename from Spigot-API-Patches/0154-Material-API-additions.patch
rename to Spigot-API-Patches/0153-Material-API-additions.patch
diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0154-Add-Material-Tags.patch
similarity index 100%
rename from Spigot-API-Patches/0155-Add-Material-Tags.patch
rename to Spigot-API-Patches/0154-Add-Material-Tags.patch
diff --git a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0155-Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-API-Patches/0155-Allow-setting-the-vex-s-summoner.patch
diff --git a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0156-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-API-Patches/0156-Add-LivingEntity-getTargetEntity.patch
diff --git a/Spigot-API-Patches/0158-Add-sun-related-API.patch b/Spigot-API-Patches/0157-Add-sun-related-API.patch
similarity index 100%
rename from Spigot-API-Patches/0158-Add-sun-related-API.patch
rename to Spigot-API-Patches/0157-Add-sun-related-API.patch
diff --git a/Spigot-API-Patches/0159-Here-s-Johnny.patch b/Spigot-API-Patches/0158-Here-s-Johnny.patch
similarity index 100%
rename from Spigot-API-Patches/0159-Here-s-Johnny.patch
rename to Spigot-API-Patches/0158-Here-s-Johnny.patch
diff --git a/Spigot-API-Patches/0160-Turtle-API.patch b/Spigot-API-Patches/0159-Turtle-API.patch
similarity index 100%
rename from Spigot-API-Patches/0160-Turtle-API.patch
rename to Spigot-API-Patches/0159-Turtle-API.patch
diff --git a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0160-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 100%
rename from Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-API-Patches/0160-Implement-getters-and-setters-for-EntityItem-owner-a.patch
diff --git a/Spigot-API-Patches/0162-Add-spectator-target-events.patch b/Spigot-API-Patches/0161-Add-spectator-target-events.patch
similarity index 100%
rename from Spigot-API-Patches/0162-Add-spectator-target-events.patch
rename to Spigot-API-Patches/0161-Add-spectator-target-events.patch
diff --git a/Spigot-API-Patches/0163-Add-more-Witch-API.patch b/Spigot-API-Patches/0162-Add-more-Witch-API.patch
similarity index 100%
rename from Spigot-API-Patches/0163-Add-more-Witch-API.patch
rename to Spigot-API-Patches/0162-Add-more-Witch-API.patch
diff --git a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0163-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
rename to Spigot-API-Patches/0163-Make-the-default-permission-message-configurable.patch
diff --git a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 100%
rename from Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to Spigot-API-Patches/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch b/Spigot-API-Patches/0165-Add-more-Zombie-API.patch
similarity index 100%
rename from Spigot-API-Patches/0166-Add-more-Zombie-API.patch
rename to Spigot-API-Patches/0165-Add-more-Zombie-API.patch
diff --git a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0166-Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 100%
rename from Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
rename to Spigot-API-Patches/0166-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0167-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-API-Patches/0167-Add-PlayerConnectionCloseEvent.patch
diff --git a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-API-Patches/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/Spigot-API-Patches/0170-BlockDestroyEvent.patch b/Spigot-API-Patches/0169-BlockDestroyEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0170-BlockDestroyEvent.patch
rename to Spigot-API-Patches/0169-BlockDestroyEvent.patch
diff --git a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0170-Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 100%
rename from Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
rename to Spigot-API-Patches/0170-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0171-Add-WhitelistToggleEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
rename to Spigot-API-Patches/0171-Add-WhitelistToggleEvent.patch
diff --git a/Spigot-API-Patches/0173-Annotation-Test-changes.patch b/Spigot-API-Patches/0172-Annotation-Test-changes.patch
similarity index 100%
rename from Spigot-API-Patches/0173-Annotation-Test-changes.patch
rename to Spigot-API-Patches/0172-Annotation-Test-changes.patch
diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0173-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
rename to Spigot-API-Patches/0173-Entity-getEntitySpawnReason.patch
diff --git a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch b/Spigot-API-Patches/0174-Add-GS4-Query-event.patch
similarity index 100%
rename from Spigot-API-Patches/0175-Add-GS4-Query-event.patch
rename to Spigot-API-Patches/0174-Add-GS4-Query-event.patch
diff --git a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0175-Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch
rename to Spigot-API-Patches/0175-Add-PlayerPostRespawnEvent.patch
diff --git a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch b/Spigot-API-Patches/0176-Ignore-package-private-methods-for-nullability-annot.patch
similarity index 100%
rename from Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch
rename to Spigot-API-Patches/0176-Ignore-package-private-methods-for-nullability-annot.patch
diff --git a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0177-Flip-some-Spigot-API-null-annotations.patch
similarity index 100%
rename from Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
rename to Spigot-API-Patches/0177-Flip-some-Spigot-API-null-annotations.patch
diff --git a/Spigot-API-Patches/0179-Server-Tick-Events.patch b/Spigot-API-Patches/0178-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-API-Patches/0179-Server-Tick-Events.patch
rename to Spigot-API-Patches/0178-Server-Tick-Events.patch
diff --git a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0179-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-API-Patches/0179-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/Spigot-API-Patches/0181-Add-Heightmap-API.patch b/Spigot-API-Patches/0180-Add-Heightmap-API.patch
similarity index 100%
rename from Spigot-API-Patches/0181-Add-Heightmap-API.patch
rename to Spigot-API-Patches/0180-Add-Heightmap-API.patch
diff --git a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0181-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch
rename to Spigot-API-Patches/0181-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0182-Add-BlockSoundGroup-interface.patch
similarity index 100%
rename from Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch
rename to Spigot-API-Patches/0182-Add-BlockSoundGroup-interface.patch
diff --git a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/Spigot-API-Patches/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
similarity index 100%
rename from Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
rename to Spigot-API-Patches/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch b/Spigot-API-Patches/0184-Make-PlayerEvent-public.patch
similarity index 100%
rename from Spigot-API-Patches/0185-Make-PlayerEvent-public.patch
rename to Spigot-API-Patches/0184-Make-PlayerEvent-public.patch
diff --git a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch b/Spigot-API-Patches/0185-Increase-custom-payload-channel-message-size.patch
similarity index 100%
rename from Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch
rename to Spigot-API-Patches/0185-Increase-custom-payload-channel-message-size.patch
diff --git a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch b/Spigot-API-Patches/0186-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch
rename to Spigot-API-Patches/0186-Expose-the-internal-current-tick.patch
diff --git a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-API-Patches/0187-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-API-Patches/0187-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch b/Spigot-API-Patches/0188-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch
rename to Spigot-API-Patches/0188-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch b/Spigot-API-Patches/0189-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch
rename to Spigot-API-Patches/0189-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-API-Patches/0191-Entity-Jump-API.patch b/Spigot-API-Patches/0190-Entity-Jump-API.patch
similarity index 100%
rename from Spigot-API-Patches/0191-Entity-Jump-API.patch
rename to Spigot-API-Patches/0190-Entity-Jump-API.patch
diff --git a/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-API-Patches/0191-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-API-Patches/0191-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/Spigot-API-Patches/0193-Add-tick-times-API.patch b/Spigot-API-Patches/0192-Add-tick-times-API.patch
similarity index 100%
rename from Spigot-API-Patches/0193-Add-tick-times-API.patch
rename to Spigot-API-Patches/0192-Add-tick-times-API.patch
diff --git a/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch b/Spigot-API-Patches/0193-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch
rename to Spigot-API-Patches/0193-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/Spigot-API-Patches/0194-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
similarity index 100%
rename from Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
rename to Spigot-API-Patches/0194-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
diff --git a/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch b/Spigot-API-Patches/0195-Make-JavaPluginLoader-thread-safe.patch
similarity index 100%
rename from Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch
rename to Spigot-API-Patches/0195-Make-JavaPluginLoader-thread-safe.patch
diff --git a/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch b/Spigot-API-Patches/0196-Add-Player-Client-Options-API.patch
similarity index 100%
rename from Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch
rename to Spigot-API-Patches/0196-Add-Player-Client-Options-API.patch
diff --git a/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-API-Patches/0197-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-API-Patches/0197-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/Spigot-API-Patches/0198-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
similarity index 100%
rename from Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
rename to Spigot-API-Patches/0198-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/Spigot-API-Patches/0200-Villager-Restocks-API.patch b/Spigot-API-Patches/0199-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-API-Patches/0200-Villager-Restocks-API.patch
rename to Spigot-API-Patches/0199-Villager-Restocks-API.patch
diff --git a/Spigot-API-Patches/0201-Expose-game-version.patch b/Spigot-API-Patches/0200-Expose-game-version.patch
similarity index 100%
rename from Spigot-API-Patches/0201-Expose-game-version.patch
rename to Spigot-API-Patches/0200-Expose-game-version.patch
diff --git a/Spigot-API-Patches/0202-Add-item-slot-convenience-methods.patch b/Spigot-API-Patches/0201-Add-item-slot-convenience-methods.patch
similarity index 100%
rename from Spigot-API-Patches/0202-Add-item-slot-convenience-methods.patch
rename to Spigot-API-Patches/0201-Add-item-slot-convenience-methods.patch
diff --git a/Spigot-API-Patches/0203-Add-Mob-Goal-API.patch b/Spigot-API-Patches/0202-Add-Mob-Goal-API.patch
similarity index 97%
rename from Spigot-API-Patches/0203-Add-Mob-Goal-API.patch
rename to Spigot-API-Patches/0202-Add-Mob-Goal-API.patch
index c81376b7c..ad320d6ac 100644
--- a/Spigot-API-Patches/0203-Add-Mob-Goal-API.patch
+++ b/Spigot-API-Patches/0202-Add-Mob-Goal-API.patch
@@ -448,16 +448,3 @@ index c3fb1c27187b5283e2fd5c2b894bbc889a48544d..cc06492f46ba5776221cd2614c1dcd8f
 +    com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
      // Paper end
  }
-diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
-index 957a60167215d00e9e0edaf418736f7f24c0a04b..4fecbe941b4b89e9022ba6abbdb76539b632a49f 100644
---- a/src/main/java/org/bukkit/entity/Tameable.java
-+++ b/src/main/java/org/bukkit/entity/Tameable.java
-@@ -3,7 +3,7 @@ package org.bukkit.entity;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
- 
--public interface Tameable extends Entity {
-+public interface Tameable extends Animals { // Paper
- 
-     /**
-      * Check if this is tamed
diff --git a/Spigot-API-Patches/0204-World-view-distance-api.patch b/Spigot-API-Patches/0203-World-view-distance-api.patch
similarity index 100%
rename from Spigot-API-Patches/0204-World-view-distance-api.patch
rename to Spigot-API-Patches/0203-World-view-distance-api.patch
diff --git a/Spigot-API-Patches/0205-Add-villager-reputation-API.patch b/Spigot-API-Patches/0204-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-API-Patches/0205-Add-villager-reputation-API.patch
rename to Spigot-API-Patches/0204-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch
deleted file mode 100644
index 8818a01d3..000000000
--- a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sun, 20 Mar 2016 06:45:01 -0400
-Subject: [PATCH] Access items by EquipmentSlot
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 5873b76236436faa72a1f39a104ef64a25f36f31..ef4cd7a7b6c88552c40f2438958238fdfddf60da 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-@@ -268,4 +268,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
-     public void setBootsDropChance(float chance) {
-         throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
-     }
-+
-+    // Paper start
-+    @Override
-+    public ItemStack getItem(org.bukkit.inventory.EquipmentSlot slot) {
-+        Preconditions.checkNotNull(slot, "slot");
-+        switch (slot) {
-+            case HAND:
-+                return this.getItemInMainHand();
-+            case OFF_HAND:
-+                return this.getItemInOffHand();
-+            case HEAD:
-+                return this.getHelmet();
-+            case CHEST:
-+                return this.getChestplate();
-+            case LEGS:
-+                return this.getLeggings();
-+            case FEET:
-+                return this.getBoots();
-+        }
-+
-+        throw new UnsupportedOperationException(slot.name());
-+    }
-+
-+    @Override
-+    public void setItem(org.bukkit.inventory.EquipmentSlot slot, ItemStack stack) {
-+        Preconditions.checkNotNull(slot, "slot");
-+        switch (slot) {
-+            case HAND:
-+                this.setItemInMainHand(stack);
-+                return;
-+            case OFF_HAND:
-+                this.setItemInOffHand(stack);
-+                return;
-+            case HEAD:
-+                this.setHelmet(stack);
-+                return;
-+            case CHEST:
-+                this.setChestplate(stack);
-+                return;
-+            case LEGS:
-+                this.setLeggings(stack);
-+                return;
-+            case FEET:
-+                this.setBoots(stack);
-+                return;
-+        }
-+
-+        throw new UnsupportedOperationException(slot.name());
-+    }
-+    // Paper end
- }
diff --git a/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 100%
rename from Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0075-Configurable-Chunk-Inhabited-Time.patch
similarity index 100%
rename from Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch
rename to Spigot-Server-Patches/0075-Configurable-Chunk-Inhabited-Time.patch
diff --git a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch b/Spigot-Server-Patches/0076-EntityPathfindEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0077-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0076-EntityPathfindEvent.patch
diff --git a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0077-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0077-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0078-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch
rename to Spigot-Server-Patches/0078-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0079-Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0079-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0080-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0080-Fix-reducedDebugInfo-not-initialized-on-client.patch
diff --git a/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0081-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 100%
rename from Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0081-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 100%
rename from Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0083-Remove-Debug-checks-from-DataBits.patch
similarity index 100%
rename from Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0083-Remove-Debug-checks-from-DataBits.patch
diff --git a/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0085-Workaround-for-setting-passengers-on-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0085-Workaround-for-setting-passengers-on-players.patch
diff --git a/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0086-Remove-unused-World-Tile-Entity-List.patch
similarity index 100%
rename from Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0086-Remove-unused-World-Tile-Entity-List.patch
diff --git a/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0087-Don-t-tick-Skulls-unused-code.patch
similarity index 100%
rename from Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0087-Don-t-tick-Skulls-unused-code.patch
diff --git a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0088-Configurable-Player-Collision.patch
similarity index 100%
rename from Spigot-Server-Patches/0089-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0088-Configurable-Player-Collision.patch
diff --git a/Spigot-Server-Patches/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from Spigot-Server-Patches/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0090-Configurable-RCON-IP-address.patch
similarity index 100%
rename from Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0090-Configurable-RCON-IP-address.patch
diff --git a/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0091-Prevent-Fire-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0091-Prevent-Fire-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0092-Implement-PlayerLocaleChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0092-Implement-PlayerLocaleChangeEvent.patch
diff --git a/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0093-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0093-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0094-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0094-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0095-remove-null-possibility-for-getServer-singleton.patch
similarity index 100%
rename from Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0095-remove-null-possibility-for-getServer-singleton.patch
diff --git a/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0096-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0096-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0097-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 100%
rename from Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0097-LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0099-System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0099-System-property-for-disabling-watchdoge.patch
diff --git a/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0100-Optimize-UserCache-Thread-Safe.patch
similarity index 100%
rename from Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0100-Optimize-UserCache-Thread-Safe.patch
diff --git a/Spigot-Server-Patches/0102-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0101-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0102-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0101-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0102-Optional-TNT-doesn-t-move-in-water.patch
similarity index 100%
rename from Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0102-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0103-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 100%
rename from Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0103-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch b/Spigot-Server-Patches/0104-Add-server-name-parameter.patch
similarity index 100%
rename from Spigot-Server-Patches/0105-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0104-Add-server-name-parameter.patch
diff --git a/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0105-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0105-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0106-Fix-Double-World-Add-issues.patch
similarity index 100%
rename from Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0106-Fix-Double-World-Add-issues.patch
diff --git a/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0107-Fix-Old-Sign-Conversion.patch
similarity index 100%
rename from Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0107-Fix-Old-Sign-Conversion.patch
diff --git a/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 100%
rename from Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0109-More-informative-vehicle-moved-wrongly-message.patch
similarity index 100%
rename from Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0109-More-informative-vehicle-moved-wrongly-message.patch
diff --git a/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0110-Add-setting-for-proxy-online-mode-status.patch
similarity index 100%
rename from Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0110-Add-setting-for-proxy-online-mode-status.patch
diff --git a/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0111-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch
rename to Spigot-Server-Patches/0111-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0112-Configurable-packet-in-spam-threshold.patch
similarity index 100%
rename from Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0112-Configurable-packet-in-spam-threshold.patch
diff --git a/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0113-Configurable-flying-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0113-Configurable-flying-kick-messages.patch
diff --git a/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0114-Chunk-registration-fixes.patch
similarity index 100%
rename from Spigot-Server-Patches/0115-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0114-Chunk-registration-fixes.patch
diff --git a/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0115-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 100%
rename from Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0115-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
diff --git a/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0116-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 100%
rename from Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0116-Auto-fix-bad-Y-levels-on-player-login.patch
diff --git a/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0117-Option-to-remove-corrupt-tile-entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0117-Option-to-remove-corrupt-tile-entities.patch
diff --git a/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0118-Add-EntityZapEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0119-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0118-Add-EntityZapEvent.patch
index 68b28d0de..5e2b15d0c 100644
--- a/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0118-Add-EntityZapEvent.patch
@@ -39,10 +39,10 @@ index f72347050302e4cb99d4c9b71b7e8acab545ea59..5e3835851d8c5e804542c256a54187e4
          entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
          entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c7ad049d1214a2950bc604439b298aafab933da0..a09de165544ca3c5623d7dd735f0701612b0975b 100644
+index b04ce0ee06ec21f87d605904e602ddc8d45a2aae..d739605ded8d81632c491af92322e02b4716c0b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1052,6 +1052,14 @@ public class CraftEventFactory {
+@@ -1053,6 +1053,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0119-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0119-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
diff --git a/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0120-Cache-user-authenticator-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0120-Cache-user-authenticator-threads.patch
diff --git a/Spigot-Server-Patches/0122-Optimise-removeQueue.patch b/Spigot-Server-Patches/0121-Optimise-removeQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0122-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0121-Optimise-removeQueue.patch
diff --git a/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0122-Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0122-Allow-Reloading-of-Command-Aliases.patch
diff --git a/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0123-Add-source-to-PlayerExpChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0123-Add-source-to-PlayerExpChangeEvent.patch
index 5d9e9b7fb..2d229c591 100644
--- a/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0123-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,7 +18,7 @@ index f72bb0c13806c3fadcbbf345f3533c115a200a7f..0447800d9dc341af647a928abd8b7993
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a09de165544ca3c5623d7dd735f0701612b0975b..0ed6611ac4c4cb2fa324cd7d29107f0ff9c6a1f9 100644
+index d739605ded8d81632c491af92322e02b4716c0b1..0c79171ba166846c7136ec6e89fd2a41f99ed260 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -117,6 +117,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index a09de165544ca3c5623d7dd735f0701612b0975b..0ed6611ac4c4cb2fa324cd7d29107f0f
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -1011,6 +1012,17 @@ public class CraftEventFactory {
+@@ -1012,6 +1013,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0124-Don-t-let-fishinghooks-use-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0124-Don-t-let-fishinghooks-use-portals.patch
diff --git a/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0125-Add-ProjectileCollideEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0125-Add-ProjectileCollideEvent.patch
index a4a96b1ff..a42456458 100644
--- a/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0125-Add-ProjectileCollideEvent.patch
@@ -93,10 +93,10 @@ index 2e4c9d42677d3e48a8f8ad559a723fc4eeec07e3..724b78b5d2d7f4ce8de31c763d2d95b9
                  this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
              } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0ed6611ac4c4cb2fa324cd7d29107f0ff9c6a1f9..e6d4f7a06bf803054b14eb7af8b624175ff377a9 100644
+index 0c79171ba166846c7136ec6e89fd2a41f99ed260..48008ca8b7632a9cfbf78ee8a142af9c8e2e91b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1156,6 +1156,16 @@ public class CraftEventFactory {
+@@ -1157,6 +1157,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0126-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0126-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0127-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 100%
rename from Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0127-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0128-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0128-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0129-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0129-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0130-Optimize-ItemStack.isEmpty.patch
similarity index 100%
rename from Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0130-Optimize-ItemStack.isEmpty.patch
diff --git a/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0131-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0131-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0132-Properly-fix-item-duplication-bug.patch
similarity index 100%
rename from Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0132-Properly-fix-item-duplication-bug.patch
diff --git a/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0133-String-based-Action-Bar-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0133-String-based-Action-Bar-API.patch
diff --git a/Spigot-Server-Patches/0135-Firework-API-s.patch b/Spigot-Server-Patches/0134-Firework-API-s.patch
similarity index 100%
rename from Spigot-Server-Patches/0135-Firework-API-s.patch
rename to Spigot-Server-Patches/0134-Firework-API-s.patch
diff --git a/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0135-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0135-PlayerTeleportEndGatewayEvent.patch
diff --git a/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0136-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0136-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0137-Enforce-Sync-Player-Saves.patch
similarity index 100%
rename from Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0137-Enforce-Sync-Player-Saves.patch
diff --git a/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0138-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 100%
rename from Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0138-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0139-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0139-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0140-Cap-Entity-Collisions.patch
similarity index 100%
rename from Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0140-Cap-Entity-Collisions.patch
diff --git a/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0141-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0141-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0142-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 100%
rename from Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0142-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0143-Do-not-let-armorstands-drown.patch
similarity index 100%
rename from Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0143-Do-not-let-armorstands-drown.patch
diff --git a/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0144-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0144-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0145-Add-system-property-to-disable-book-size-limits.patch
similarity index 100%
rename from Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0145-Add-system-property-to-disable-book-size-limits.patch
diff --git a/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0146-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 100%
rename from Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0146-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0147-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0147-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0148-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0148-Use-TerminalConsoleAppender-for-console-improvements.patch
diff --git a/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0149-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0149-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/Spigot-Server-Patches/0151-Item-canEntityPickup.patch b/Spigot-Server-Patches/0150-Item-canEntityPickup.patch
similarity index 100%
rename from Spigot-Server-Patches/0151-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0150-Item-canEntityPickup.patch
diff --git a/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0151-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0151-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0152-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0152-PlayerAttemptPickupItemEvent.patch
diff --git a/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0153-Add-UnknownCommandEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0153-Add-UnknownCommandEvent.patch
diff --git a/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0154-Basic-PlayerProfile-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0154-Basic-PlayerProfile-API.patch
diff --git a/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0155-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0155-Shoulder-Entities-Release-API.patch
diff --git a/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0156-Profile-Lookup-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0157-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0156-Profile-Lookup-Events.patch
diff --git a/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0157-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0157-Block-player-logins-during-server-shutdown.patch
diff --git a/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0158-Entity-fromMobSpawner.patch
similarity index 100%
rename from Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0158-Entity-fromMobSpawner.patch
diff --git a/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0159-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0159-Improve-the-Saddle-API-for-Horses.patch
diff --git a/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0160-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0160-Implement-ensureServerConversions-API.patch
diff --git a/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0161-Implement-getI18NDisplayName.patch
similarity index 100%
rename from Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0161-Implement-getI18NDisplayName.patch
diff --git a/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0162-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0162-ProfileWhitelistVerifyEvent.patch
diff --git a/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0163-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0163-Fix-this-stupid-bullshit.patch
diff --git a/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0164-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0164-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0165-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0165-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 100%
rename from Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0167-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 100%
rename from Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0167-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0168-LivingEntity-setKiller.patch
similarity index 100%
rename from Spigot-Server-Patches/0169-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0168-LivingEntity-setKiller.patch
diff --git a/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0169-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 100%
rename from Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0169-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
diff --git a/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0170-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 100%
rename from Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0170-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0171-Include-Log4J2-SLF4J-implementation.patch
similarity index 100%
rename from Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0171-Include-Log4J2-SLF4J-implementation.patch
diff --git a/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0172-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 100%
rename from Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0172-Disable-logger-prefix-for-various-plugins-bypassing-.patch
diff --git a/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0173-Add-PlayerJumpEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0173-Add-PlayerJumpEvent.patch
diff --git a/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0174-handle-PacketPlayInKeepAlive-async.patch
similarity index 100%
rename from Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0174-handle-PacketPlayInKeepAlive-async.patch
diff --git a/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0175-Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0175-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0176-revert-serverside-behavior-of-keepalives.patch
similarity index 100%
rename from Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0176-revert-serverside-behavior-of-keepalives.patch
diff --git a/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0177-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0177-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0178-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 95%
rename from Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0178-Option-for-maximum-exp-value-when-merging-orbs.patch
index 0f78966b2..0cdf0fc35 100644
--- a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0178-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -20,10 +20,10 @@ index 39ab5457569684bc66cd67f5f9d2505ef9f304ab..d2582d981f859b55ba5086540963c01e
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e6d4f7a06bf803054b14eb7af8b624175ff377a9..ce44dc4292dbd55bae189267d610e2bcd8af25fa 100644
+index 48008ca8b7632a9cfbf78ee8a142af9c8e2e91b6..90349d76a77a13094ca6476cc0dafaf526187946 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -549,16 +549,32 @@ public class CraftEventFactory {
+@@ -550,16 +550,32 @@ public class CraftEventFactory {
              EntityExperienceOrb xp = (EntityExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {
diff --git a/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0179-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0179-Add-PlayerArmorChangeEvent.patch
diff --git a/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0180-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0180-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0181-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0181-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0182-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0182-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0183-AsyncTabCompleteEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0183-AsyncTabCompleteEvent.patch
diff --git a/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0184-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 100%
rename from Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0184-Avoid-NPE-in-PathfinderGoalTempt.patch
diff --git a/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0185-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0185-PlayerPickupExperienceEvent.patch
diff --git a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0186-ExperienceOrbMergeEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0186-ExperienceOrbMergeEvent.patch
index 2fb7f0294..fc73d734f 100644
--- a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0186-ExperienceOrbMergeEvent.patch
@@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ce44dc4292dbd55bae189267d610e2bcd8af25fa..f059e502e47e96e27514127ff1e56a85944a8b43 100644
+index 90349d76a77a13094ca6476cc0dafaf526187946..43965bea87e5884fa0f6b7838abbade08ce5c536 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -559,7 +559,7 @@ public class CraftEventFactory {
+@@ -560,7 +560,7 @@ public class CraftEventFactory {
                      if (e instanceof EntityExperienceOrb) {
                          EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
                          // Paper start
diff --git a/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0187-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0187-Ability-to-apply-mending-to-XP-API.patch
diff --git a/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0188-Make-max-squid-spawn-height-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0188-Make-max-squid-spawn-height-configurable.patch
diff --git a/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0189-PreCreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0189-PreCreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0190-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0190-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0191-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0191-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0192-Fill-Profile-Property-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0192-Fill-Profile-Property-Events.patch
diff --git a/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0193-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0193-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0194-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0194-Add-ArmorStand-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0195-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0195-Extend-Player-Interact-cancellation.patch
diff --git a/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0196-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0196-Tameable-getOwnerUniqueId-API.patch
diff --git a/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0197-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0197-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0198-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 100%
rename from Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0198-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
diff --git a/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0200-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0200-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0201-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0201-Implement-extended-PaperServerListPingEvent.patch
diff --git a/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0202-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0202-Improved-Async-Task-Scheduler.patch
diff --git a/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0203-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0203-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0204-Player.setPlayerProfile-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0204-Player.setPlayerProfile-API.patch
diff --git a/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0205-Fix-Dragon-Server-Crashes.patch
similarity index 100%
rename from Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0205-Fix-Dragon-Server-Crashes.patch
diff --git a/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0206-getPlayerUniqueId-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0206-getPlayerUniqueId-API.patch
diff --git a/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0207-Make-player-data-saving-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0207-Make-player-data-saving-configurable.patch
diff --git a/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0208-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0208-Make-legacy-ping-handler-more-reliable.patch
diff --git a/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0209-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0209-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0210-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0210-Flag-to-disable-the-channel-limit.patch
diff --git a/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0211-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0211-Add-method-to-open-already-placed-sign.patch
diff --git a/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0212-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0212-Configurable-sprint-interruption-on-attack.patch
diff --git a/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0213-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0213-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0214-EndermanEscapeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0215-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0214-EndermanEscapeEvent.patch
diff --git a/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0215-Enderman.teleportRandomly.patch
similarity index 100%
rename from Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0215-Enderman.teleportRandomly.patch
diff --git a/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0216-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0216-Block-Enderpearl-Travel-Exploit.patch
diff --git a/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0217-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0217-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0218-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0218-EndermanAttackPlayerEvent.patch
diff --git a/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0219-WitchConsumePotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0219-WitchConsumePotionEvent.patch
diff --git a/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0220-WitchThrowPotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0220-WitchThrowPotionEvent.patch
diff --git a/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0221-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0221-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0222-WitchReadyPotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0222-WitchReadyPotionEvent.patch
diff --git a/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0223-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0223-ItemStack-getMaxItemUseDuration.patch
diff --git a/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0224-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0224-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0225-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0225-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0226-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0226-Fix-CraftEntity-hashCode.patch
diff --git a/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0227-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0227-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0228-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0228-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0229-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0229-Make-shield-blocking-delay-configurable.patch
diff --git a/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0230-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 98%
rename from Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0230-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 6b88969e4..62612213b 100644
--- a/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0230-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -72,7 +72,7 @@ index 7be41c8698e86727978db7d72b3dd3fbfe6b7272..60a47bccca5bc77039c0bec94eb329b3
                  event.getProjectile().remove();
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f059e502e47e96e27514127ff1e56a85944a8b43..7593159fd6536468febae2ea92d31f7d76af09ba 100644
+index 43965bea87e5884fa0f6b7838abbade08ce5c536..3a897cf5903539e1099f1a9ec98f1e157437fee0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -52,6 +52,7 @@ import net.minecraft.server.GeneratorAccess;
@@ -83,7 +83,7 @@ index f059e502e47e96e27514127ff1e56a85944a8b43..7593159fd6536468febae2ea92d31f7d
  import net.minecraft.server.ItemActionContext;
  import net.minecraft.server.ItemStack;
  import net.minecraft.server.Items;
-@@ -477,16 +478,16 @@ public class CraftEventFactory {
+@@ -478,16 +479,16 @@ public class CraftEventFactory {
      /**
       * EntityShootBowEvent
       */
diff --git a/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0231-PlayerReadyArrowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0231-PlayerReadyArrowEvent.patch
diff --git a/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0232-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 100%
rename from Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0232-Fire-EntityShootBowEvent-for-Illusioner.patch
diff --git a/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0233-Implement-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0233-Implement-EntityKnockbackByEntityEvent.patch
diff --git a/Spigot-Server-Patches/0235-Expand-Explosions-API.patch b/Spigot-Server-Patches/0234-Expand-Explosions-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0235-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0234-Expand-Explosions-API.patch
diff --git a/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0235-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0235-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/Spigot-Server-Patches/0237-RangedEntity-API.patch b/Spigot-Server-Patches/0236-RangedEntity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0237-RangedEntity-API.patch
rename to Spigot-Server-Patches/0236-RangedEntity-API.patch
diff --git a/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0237-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0237-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0238-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0238-Implement-World.getEntity-UUID-API.patch
diff --git a/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0239-InventoryCloseEvent-Reason-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0239-InventoryCloseEvent-Reason-API.patch
index d28889283..033bb63e6 100644
--- a/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0239-InventoryCloseEvent-Reason-API.patch
@@ -168,10 +168,10 @@ index c69b3b33d82bac830ea55d30961017339af6aa7e..ffbf2b983bb91c873f403b411a05c563
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7593159fd6536468febae2ea92d31f7d76af09ba..fc3d9efd84fbe696852216f09500dc4082f49493 100644
+index 3a897cf5903539e1099f1a9ec98f1e157437fee0..6ca6ba46d0dd511072f518baa3aae6dc8281ef66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1300,8 +1300,19 @@ public class CraftEventFactory {
+@@ -1301,8 +1301,19 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0240-Configurable-Bed-Search-Radius.patch
similarity index 100%
rename from Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0240-Configurable-Bed-Search-Radius.patch
diff --git a/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0241-Vex-getSummoner-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0242-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0241-Vex-getSummoner-API.patch
diff --git a/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0242-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0242-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0243-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 100%
rename from Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0243-Don-t-change-the-Entity-Random-seed-for-squids.patch
diff --git a/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0244-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 100%
rename from Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0244-Re-add-vanilla-entity-warnings-for-duplicates.patch
diff --git a/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0245-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0245-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0246-Use-asynchronous-Log4j-2-loggers.patch
similarity index 100%
rename from Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0246-Use-asynchronous-Log4j-2-loggers.patch
diff --git a/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0247-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0247-add-more-information-to-Entity.toString.patch
diff --git a/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0248-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0248-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/Spigot-Server-Patches/0250-EnderDragon-Events.patch b/Spigot-Server-Patches/0249-EnderDragon-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0250-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0249-EnderDragon-Events.patch
diff --git a/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0250-PlayerElytraBoostEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0250-PlayerElytraBoostEvent.patch
diff --git a/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0251-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0251-Speedup-BlockPos-by-fixing-inlining.patch
diff --git a/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0252-Optimize-RegistryID.c.patch
similarity index 100%
rename from Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0252-Optimize-RegistryID.c.patch
diff --git a/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0253-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0253-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0254-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0254-Vanished-players-don-t-have-rights.patch
index 91cf84f0b..f994d811e 100644
--- a/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0254-Vanished-players-don-t-have-rights.patch
@@ -148,10 +148,10 @@ index 2261c42ab69e260d3533cdff1149b83acea8ccb4..378ac5ae86e337f27975bc7935c4f25f
      public boolean p_() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fc3d9efd84fbe696852216f09500dc4082f49493..ee0e3717186c683a97987181dd869e0a4278b9c1 100644
+index 6ca6ba46d0dd511072f518baa3aae6dc8281ef66..0125bf43e3383fddf7c36d831d19cca3f1ee3fae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1178,6 +1178,14 @@ public class CraftEventFactory {
+@@ -1179,6 +1179,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0255-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 100%
rename from Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0255-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
diff --git a/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0256-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 100%
rename from Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0256-Add-some-Debug-to-Chunk-Entity-slices.patch
diff --git a/Spigot-Server-Patches/0258-EntityTransformedEvent.patch b/Spigot-Server-Patches/0257-EntityTransformedEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0258-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0257-EntityTransformedEvent.patch
index 4a815dc9f..5b5b04366 100644
--- a/Spigot-Server-Patches/0258-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0257-EntityTransformedEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 19c12728dac6652f0b11fd62505795531ad5abd2..3706c31aad786237d924a0a3c55151aeebc4bff0 100644
+index 1d96ecb2fda1b567866f620b183a5811f75fa7f2..8b199971bd67a196168afb2e63d4c72919fec8d2 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-@@ -116,6 +116,7 @@ public class EntityMushroomCow extends EntityCow {
+@@ -112,6 +112,7 @@ public class EntityMushroomCow extends EntityCow {
                      if (CraftEventFactory.callEntityTransformEvent(this, entitycow, EntityTransformEvent.TransformReason.SHEARED).isCancelled()) {
                          return false;
                      }
diff --git a/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0258-SkeletonHorse-Additions.patch
similarity index 100%
rename from Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0258-SkeletonHorse-Additions.patch
diff --git a/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0259-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0259-Prevent-Saving-Bad-entities-to-chunks.patch
diff --git a/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0260-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0260-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0261-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 100%
rename from Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0261-Ignore-Dead-Entities-in-entityList-iteration.patch
diff --git a/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0262-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0262-Implement-Expanded-ArmorStand-API.patch
diff --git a/Spigot-Server-Patches/0264-AnvilDamageEvent.patch b/Spigot-Server-Patches/0263-AnvilDamageEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0264-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0263-AnvilDamageEvent.patch
diff --git a/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0264-Add-TNTPrimeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0264-Add-TNTPrimeEvent.patch
diff --git a/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0265-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0265-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0266-Add-hand-to-bucket-events.patch
similarity index 97%
rename from Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0266-Add-hand-to-bucket-events.patch
index 56cf5fa36..6ef868cfa 100644
--- a/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0266-Add-hand-to-bucket-events.patch
@@ -69,10 +69,10 @@ index 7c5c0498435e3fae6a7997e34f197d402daa3bd8..ffe4b9eb868ecd9582ba1d3fc3aef0f8
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ee0e3717186c683a97987181dd869e0a4278b9c1..5088257e11cbcd4789c813b7924644920c61e4ed 100644
+index 0125bf43e3383fddf7c36d831d19cca3f1ee3fae..4329780e9de3337fd8fcca78b1ed8804e4687552 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -380,6 +380,20 @@ public class CraftEventFactory {
+@@ -381,6 +381,20 @@ public class CraftEventFactory {
      }
  
      private static PlayerEvent getPlayerBucketEvent(boolean isFilling, World world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {
@@ -93,7 +93,7 @@ index ee0e3717186c683a97987181dd869e0a4278b9c1..5088257e11cbcd4789c813b792464492
          Player player = (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item);
          Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem());
-@@ -392,10 +406,10 @@ public class CraftEventFactory {
+@@ -393,10 +407,10 @@ public class CraftEventFactory {
  
          PlayerEvent event;
          if (isFilling) {
diff --git a/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0267-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0267-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0268-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0268-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0269-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0269-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0270-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0270-Make-EnderDragon-implement-Mob.patch
diff --git a/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0271-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0271-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0272-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0272-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0273-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0273-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0274-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0274-Allow-disabling-armour-stand-ticking.patch
diff --git a/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0275-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0275-Optimize-BlockPosition-helper-methods.patch
diff --git a/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0276-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 100%
rename from Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0276-Send-nearby-packets-from-world-player-list-not-serve.patch
diff --git a/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0277-Restore-vanlla-default-mob-spawn-range.patch
similarity index 100%
rename from Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0277-Restore-vanlla-default-mob-spawn-range.patch
diff --git a/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0278-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0278-Optimize-CraftBlockData-Creation.patch
diff --git a/Spigot-Server-Patches/0280-Fix-MC-124320.patch b/Spigot-Server-Patches/0279-Fix-MC-124320.patch
similarity index 100%
rename from Spigot-Server-Patches/0280-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0279-Fix-MC-124320.patch
diff --git a/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0280-Slime-Pathfinder-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0280-Slime-Pathfinder-Events.patch
diff --git a/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0281-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0281-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0282-Optimize-RegistryMaterials.patch
similarity index 100%
rename from Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0282-Optimize-RegistryMaterials.patch
diff --git a/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0283-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0283-Add-PhantomPreSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0284-Add-More-Creeper-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0285-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0284-Add-More-Creeper-API.patch
diff --git a/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0285-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0285-Inventory-removeItemAnySlot.patch
diff --git a/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0286-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0286-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0287-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0287-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0288-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0288-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/Spigot-Server-Patches/0290-Improve-death-events.patch b/Spigot-Server-Patches/0289-Improve-death-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0290-Improve-death-events.patch
rename to Spigot-Server-Patches/0289-Improve-death-events.patch
index 61549a2c7..4d1d24fde 100644
--- a/Spigot-Server-Patches/0290-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0289-Improve-death-events.patch
@@ -378,10 +378,10 @@ index a874ae6758e95c782bfb3d931bf8306997aa3a70..a8f46ceb4b5a545bc4dd8d1e7d943823
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5088257e11cbcd4789c813b7924644920c61e4ed..fcf2b190aaf7a9b7b4e34102f98e1ba7f428e868 100644
+index 4329780e9de3337fd8fcca78b1ed8804e4687552..91cfc6966e19a8d3d3b2cafdb0464162c9a94de5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -756,9 +756,16 @@ public class CraftEventFactory {
+@@ -757,9 +757,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -398,7 +398,7 @@ index 5088257e11cbcd4789c813b7924644920c61e4ed..fcf2b190aaf7a9b7b4e34102f98e1ba7
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -774,8 +781,15 @@ public class CraftEventFactory {
+@@ -775,8 +782,15 @@ public class CraftEventFactory {
          CraftPlayer entity = victim.getBukkitEntity();
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
          event.setKeepInventory(keepInventory);
@@ -414,7 +414,7 @@ index 5088257e11cbcd4789c813b7924644920c61e4ed..fcf2b190aaf7a9b7b4e34102f98e1ba7
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -792,6 +806,31 @@ public class CraftEventFactory {
+@@ -793,6 +807,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0290-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0290-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0291-Mob-Pathfinding-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0291-Mob-Pathfinding-API.patch
diff --git a/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0292-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0292-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0293-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0293-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0294-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0294-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0295-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0295-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0296-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0296-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0297-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0297-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0298-Support-Overriding-World-Seeds.patch
similarity index 100%
rename from Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0298-Support-Overriding-World-Seeds.patch
diff --git a/Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0299-Optimize-Server-World-Map.patch
similarity index 100%
rename from Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0299-Optimize-Server-World-Map.patch
diff --git a/Spigot-Server-Patches/0301-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0300-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0301-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0300-PreSpawnerSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0301-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0301-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0302-Avoid-dimension-id-collisions.patch
similarity index 100%
rename from Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0302-Avoid-dimension-id-collisions.patch
diff --git a/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0303-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0303-Honor-EntityAgeable.ageLock.patch
diff --git a/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0304-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0304-Configurable-connection-throttle-kick-message.patch
diff --git a/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0305-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0305-Hook-into-CB-plugin-rewrites.patch
diff --git a/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0306-Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0306-Allow-setting-the-vex-s-summoner.patch
diff --git a/Spigot-Server-Patches/0308-Add-sun-related-API.patch b/Spigot-Server-Patches/0307-Add-sun-related-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0308-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0307-Add-sun-related-API.patch
diff --git a/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0308-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0308-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/Spigot-Server-Patches/0310-Here-s-Johnny.patch b/Spigot-Server-Patches/0309-Here-s-Johnny.patch
similarity index 100%
rename from Spigot-Server-Patches/0310-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0309-Here-s-Johnny.patch
diff --git a/Spigot-Server-Patches/0311-Turtle-API.patch b/Spigot-Server-Patches/0310-Turtle-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0311-Turtle-API.patch
rename to Spigot-Server-Patches/0310-Turtle-API.patch
diff --git a/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0311-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0311-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0312-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0312-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0313-Call-player-spectator-target-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0313-Call-player-spectator-target-events.patch
diff --git a/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0314-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0314-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/Spigot-Server-Patches/0316-Add-more-Witch-API.patch b/Spigot-Server-Patches/0315-Add-more-Witch-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0316-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0315-Add-more-Witch-API.patch
diff --git a/Spigot-Server-Patches/0317-Fix-MC-93764.patch b/Spigot-Server-Patches/0316-Fix-MC-93764.patch
similarity index 100%
rename from Spigot-Server-Patches/0317-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0316-Fix-MC-93764.patch
diff --git a/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0317-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0317-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0318-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0318-Reset-players-airTicks-on-respawn.patch
diff --git a/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0319-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0319-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0320-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 100%
rename from Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0320-Use-more-reasonable-thread-count-default-for-bootstr.patch
diff --git a/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0321-Optimize-World-Time-Updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0321-Optimize-World-Time-Updates.patch
diff --git a/Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0322-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0322-Restore-custom-InventoryHolder-support.patch
diff --git a/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0323-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0323-Use-Vanilla-Minecart-Speeds.patch
diff --git a/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0324-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0324-Fix-SpongeAbsortEvent-handling.patch
diff --git a/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0325-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0325-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0326-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0326-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0327-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0327-force-entity-dismount-during-teleportation.patch
diff --git a/Spigot-Server-Patches/0329-Book-Size-Limits.patch b/Spigot-Server-Patches/0328-Book-Size-Limits.patch
similarity index 100%
rename from Spigot-Server-Patches/0329-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0328-Book-Size-Limits.patch
diff --git a/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0329-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0329-Make-the-default-permission-message-configurable.patch
diff --git a/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0330-Add-more-Zombie-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0331-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0330-Add-more-Zombie-API.patch
diff --git a/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0331-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0331-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0332-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0332-Handle-Large-Packets-disconnecting-client.patch
diff --git a/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0333-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 100%
rename from Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0333-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
diff --git a/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0334-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0334-Add-PlayerConnectionCloseEvent.patch
diff --git a/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0335-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0335-Prevent-Enderman-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0336-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0336-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0337-Fix-PlayerEditBookEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0337-Fix-PlayerEditBookEvent.patch
diff --git a/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0338-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0338-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0339-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0339-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0340-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0340-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/Spigot-Server-Patches/0342-BlockDestroyEvent.patch b/Spigot-Server-Patches/0341-BlockDestroyEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0342-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0341-BlockDestroyEvent.patch
diff --git a/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0342-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0342-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0343-Fix-sign-edit-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0343-Fix-sign-edit-memory-leak.patch
diff --git a/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0344-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0344-Limit-Client-Sign-length-more.patch
diff --git a/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0345-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0345-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0346-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to Spigot-Server-Patches/0346-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0347-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to Spigot-Server-Patches/0347-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch
diff --git a/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch
diff --git a/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch
similarity index 100%
rename from Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch
diff --git a/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch
diff --git a/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 100%
rename from Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch
diff --git a/Spigot-Server-Patches/0361-Server-Tick-Events.patch b/Spigot-Server-Patches/0360-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0361-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0360-Server-Tick-Events.patch
diff --git a/Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/Spigot-Server-Patches/0364-Add-Heightmap-API.patch b/Spigot-Server-Patches/0363-Add-Heightmap-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0364-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0363-Add-Heightmap-API.patch
diff --git a/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0365-Per-Player-View-Distance-API-placeholders.patch
similarity index 100%
rename from Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0365-Per-Player-View-Distance-API-placeholders.patch
diff --git a/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch
diff --git a/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch
diff --git a/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch
similarity index 100%
rename from Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
rename to Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch
diff --git a/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 100%
rename from Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
diff --git a/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch
similarity index 100%
rename from Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch
diff --git a/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch
diff --git a/Spigot-Server-Patches/0378-Chunk-debug-command.patch b/Spigot-Server-Patches/0377-Chunk-debug-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0378-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0377-Chunk-debug-command.patch
diff --git a/Spigot-Server-Patches/0379-incremental-chunk-saving.patch b/Spigot-Server-Patches/0378-incremental-chunk-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0379-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0378-incremental-chunk-saving.patch
diff --git a/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch
diff --git a/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch
diff --git a/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
similarity index 100%
rename from Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
rename to Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
diff --git a/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
rename to Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
diff --git a/Spigot-Server-Patches/0385-Anti-Xray.patch b/Spigot-Server-Patches/0384-Anti-Xray.patch
similarity index 100%
rename from Spigot-Server-Patches/0385-Anti-Xray.patch
rename to Spigot-Server-Patches/0384-Anti-Xray.patch
diff --git a/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch
diff --git a/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 100%
rename from Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch
diff --git a/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0388-offset-item-frame-ticking.patch
diff --git a/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch
similarity index 100%
rename from Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch
diff --git a/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/Spigot-Server-Patches/0393-Reduce-sync-loads.patch b/Spigot-Server-Patches/0392-Reduce-sync-loads.patch
similarity index 100%
rename from Spigot-Server-Patches/0393-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0392-Reduce-sync-loads.patch
diff --git a/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch
diff --git a/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/Spigot-Server-Patches/0396-Fix-MC-158900.patch b/Spigot-Server-Patches/0395-Fix-MC-158900.patch
similarity index 100%
rename from Spigot-Server-Patches/0396-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0395-Fix-MC-158900.patch
diff --git a/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch
diff --git a/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch
similarity index 100%
rename from Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
rename to Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch
diff --git a/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch
diff --git a/Spigot-Server-Patches/0401-Generator-Settings.patch b/Spigot-Server-Patches/0400-Generator-Settings.patch
similarity index 100%
rename from Spigot-Server-Patches/0401-Generator-Settings.patch
rename to Spigot-Server-Patches/0400-Generator-Settings.patch
diff --git a/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
similarity index 100%
rename from Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
rename to Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
diff --git a/Spigot-Server-Patches/0403-Fix-MC-161754.patch b/Spigot-Server-Patches/0402-Fix-MC-161754.patch
similarity index 100%
rename from Spigot-Server-Patches/0403-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0402-Fix-MC-161754.patch
diff --git a/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch
diff --git a/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch
diff --git a/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch
diff --git a/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch
similarity index 100%
rename from Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
rename to Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch
diff --git a/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/Spigot-Server-Patches/0415-Optimize-Hoppers.patch b/Spigot-Server-Patches/0414-Optimize-Hoppers.patch
similarity index 100%
rename from Spigot-Server-Patches/0415-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0414-Optimize-Hoppers.patch
diff --git a/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch
diff --git a/Spigot-Server-Patches/0422-Lag-compensate-eating.patch b/Spigot-Server-Patches/0421-Lag-compensate-eating.patch
similarity index 100%
rename from Spigot-Server-Patches/0422-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0421-Lag-compensate-eating.patch
diff --git a/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch
diff --git a/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch
diff --git a/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch
similarity index 100%
rename from Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
rename to Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch
diff --git a/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch
diff --git a/Spigot-Server-Patches/0430-Seed-based-feature-search.patch b/Spigot-Server-Patches/0429-Seed-based-feature-search.patch
similarity index 100%
rename from Spigot-Server-Patches/0430-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0429-Seed-based-feature-search.patch
diff --git a/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch
similarity index 100%
rename from Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
rename to Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch
diff --git a/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch
diff --git a/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch
diff --git a/Spigot-Server-Patches/0437-Entity-Jump-API.patch b/Spigot-Server-Patches/0436-Entity-Jump-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0437-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0436-Entity-Jump-API.patch
diff --git a/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch
diff --git a/Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch b/Spigot-Server-Patches/0439-Backport-fix-for-MC-167561.patch
similarity index 100%
rename from Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
rename to Spigot-Server-Patches/0439-Backport-fix-for-MC-167561.patch
diff --git a/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 89%
rename from Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch
index e92e110b5..5233db340 100644
--- a/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,10 +5,10 @@ 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 fcf2b190aaf7a9b7b4e34102f98e1ba7f428e868..c3f7e4612109f92ed789021b5acd1af8791d1666 100644
+index 91cfc6966e19a8d3d3b2cafdb0464162c9a94de5..08471184b04690653761a17d79941cd4ae8b1f81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -303,13 +303,18 @@ public class CraftEventFactory {
+@@ -304,13 +304,18 @@ public class CraftEventFactory {
          }
  
          org.bukkit.inventory.ItemStack item;
diff --git a/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch
diff --git a/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch
diff --git a/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch
diff --git a/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch
diff --git a/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0447-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0447-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0448-Ensure-Entity-is-never-double-registered.patch
similarity index 100%
rename from Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0448-Ensure-Entity-is-never-double-registered.patch
diff --git a/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0449-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0449-Fix-unregistering-entities-from-unloading-chunks.patch
diff --git a/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0450-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0450-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0451-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0451-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0452-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0452-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch b/Spigot-Server-Patches/0453-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
similarity index 100%
rename from Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
rename to Spigot-Server-Patches/0453-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
diff --git a/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0454-Don-t-tick-dead-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0454-Don-t-tick-dead-players.patch
diff --git a/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0455-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0455-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0456-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0456-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch b/Spigot-Server-Patches/0457-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
rename to Spigot-Server-Patches/0457-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
diff --git a/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0458-Increase-Light-Queue-Size.patch
similarity index 100%
rename from Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0458-Increase-Light-Queue-Size.patch
diff --git a/Spigot-Server-Patches/0460-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0459-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 100%
rename from Spigot-Server-Patches/0460-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0459-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
diff --git a/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0460-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0460-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0461-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0461-Add-tick-times-API-and-mspt-command.patch
diff --git a/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0462-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0462-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch b/Spigot-Server-Patches/0463-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
similarity index 100%
rename from Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
rename to Spigot-Server-Patches/0463-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
diff --git a/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0464-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0464-Remove-streams-from-Mob-AI-System.patch
diff --git a/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0465-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0465-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
diff --git a/Spigot-Server-Patches/0467-Async-command-map-building.patch b/Spigot-Server-Patches/0466-Async-command-map-building.patch
similarity index 100%
rename from Spigot-Server-Patches/0467-Async-command-map-building.patch
rename to Spigot-Server-Patches/0466-Async-command-map-building.patch
diff --git a/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch b/Spigot-Server-Patches/0467-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
rename to Spigot-Server-Patches/0467-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
diff --git a/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0468-Optimize-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0469-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0468-Optimize-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch b/Spigot-Server-Patches/0469-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
similarity index 100%
rename from Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
rename to Spigot-Server-Patches/0469-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
diff --git a/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0470-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0470-Reduce-Either-Optional-allocation.patch
diff --git a/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0471-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0471-Remove-streams-from-PairedQueue.patch
diff --git a/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch b/Spigot-Server-Patches/0472-Remove-streams-from-MinecraftKey.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch
rename to Spigot-Server-Patches/0472-Remove-streams-from-MinecraftKey.patch
diff --git a/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0473-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0473-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0474-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0474-Prevent-opening-inventories-when-frozen.patch
diff --git a/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0475-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0475-Optimise-ArraySetSorted-removeIf.patch
diff --git a/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0476-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0476-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch b/Spigot-Server-Patches/0477-Optimise-entity-hard-collision-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch
rename to Spigot-Server-Patches/0477-Optimise-entity-hard-collision-checking.patch
diff --git a/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0478-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0478-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
diff --git a/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0479-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0479-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0480-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0480-Implement-Player-Client-Options-API.patch
diff --git a/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0481-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0481-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0482-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0482-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0483-Broadcast-join-message-to-console.patch
similarity index 100%
rename from Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0483-Broadcast-join-message-to-console.patch
diff --git a/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0484-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0484-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0485-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0485-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0486-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0486-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch b/Spigot-Server-Patches/0487-Allow-sleeping-players-to-float.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch
rename to Spigot-Server-Patches/0487-Allow-sleeping-players-to-float.patch
diff --git a/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0488-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0488-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0489-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0489-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0490-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0490-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0491-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0491-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0492-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 97%
rename from Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0492-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index b41ecacf4..9bef1f165 100644
--- a/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/Spigot-Server-Patches/0492-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -79,10 +79,10 @@ index 8ad131e4fc20efc61b938a5f6ab64379da23bf0d..d35a0b2d94e4f52c257375c35f55b5a4
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c3f7e4612109f92ed789021b5acd1af8791d1666..73b271f6f3e68c08020bc9eb9185f7c07f8973bf 100644
+index 08471184b04690653761a17d79941cd4ae8b1f81..ce8d7877adcc4635ebf2f5743c8b02aa95691102 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -776,7 +776,8 @@ public class CraftEventFactory {
+@@ -777,7 +777,8 @@ public class CraftEventFactory {
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
              if (stack == null || stack.getType() == Material.AIR || stack.getAmount() == 0) continue;
  
diff --git a/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0493-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0493-Implement-Brigadier-Mojang-API.patch
diff --git a/Spigot-Server-Patches/0495-Villager-Restocks-API.patch b/Spigot-Server-Patches/0494-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0494-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0495-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0495-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/Spigot-Server-Patches/0497-Expose-game-version.patch b/Spigot-Server-Patches/0496-Expose-game-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Expose-game-version.patch
rename to Spigot-Server-Patches/0496-Expose-game-version.patch
diff --git a/Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch b/Spigot-Server-Patches/0497-Sync-position-on-teleportation.patch
similarity index 100%
rename from Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch
rename to Spigot-Server-Patches/0497-Sync-position-on-teleportation.patch
diff --git a/Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0498-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0498-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch b/Spigot-Server-Patches/0499-Cleanup-Region-Files-Direct-Memory-on-close.patch
similarity index 100%
rename from Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch
rename to Spigot-Server-Patches/0499-Cleanup-Region-Files-Direct-Memory-on-close.patch
diff --git a/Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0500-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0500-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0501-Implement-Mob-Goal-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0501-Implement-Mob-Goal-API.patch
diff --git a/Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch b/Spigot-Server-Patches/0502-Optimize-entity-list-iteration-requiring-entities-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch
rename to Spigot-Server-Patches/0502-Optimize-entity-list-iteration-requiring-entities-be.patch
diff --git a/Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0503-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0503-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0504-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0504-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0505-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0505-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0507-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0506-No-Tick-view-distance-implementation.patch
similarity index 100%
rename from Spigot-Server-Patches/0507-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0506-No-Tick-view-distance-implementation.patch
diff --git a/Spigot-Server-Patches/0508-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0507-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0507-Add-villager-reputation-API.patch
diff --git a/work/Bukkit b/work/Bukkit
index b999860d4..da9ef3c55 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b999860d432f4ba1bc70c6b5a18918fd43716165
+Subproject commit da9ef3c55fa3bce91f7fdcd77d50171be7297d7d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 77fd87e4d..933e9094b 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 77fd87e4d053a82b1a733a773b235c25c2a6c6a7
+Subproject commit 933e9094bfef3b0758f62342f06163bbba1bb6a1