From ea855e2b46277fab767ec62248a57e5aa5c6e7a8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 20 Mar 2019 01:46:00 +0000
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Developers!: You will need to clean up your work/Minecraft/1.13.2 folder
for this

Also, restore a patch that was dropped in the last upstream

Bukkit Changes:
279eeab3 Fix command description not being set
96e2bb18 Remove debug print from SyntheticEventTest

CraftBukkit Changes:
d3ed1516 Fix dangerously threaded beacons
217a293d Don't relocate joptsimple to allow --help to work.
1be05a21 Prepare for imminent Java 12 release
a49270b2 Mappings Update
5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports

Spigot Changes:
e6eb36f2 Rebuild patches
---
 ...Add-getNearbyXXX-methods-to-Location.patch | 276 ++++++++++++++++++
 ...patch => 0111-PlayerReadyArrowEvent.patch} |   2 +-
 ...12-Add-EntityKnockbackByEntityEvent.patch} |   2 +-
 ...patch => 0113-Expand-Explosions-API.patch} |  16 +-
 ...I-additions-for-quantity-flags-lore.patch} |   2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   2 +-
 ...-API.patch => 0116-RangedEntity-API.patch} |   2 +-
 ...> 0117-Add-World.getEntity-UUID-API.patch} |   2 +-
 ...0118-InventoryCloseEvent-Reason-API.patch} |   2 +-
 ...I.patch => 0119-Entity-getChunk-API.patch} |   2 +-
 ...d-an-asterisk-to-legacy-API-plugins.patch} |   2 +-
 ...ts.patch => 0121-EnderDragon-Events.patch} |   2 +-
 ...=> 0122-PlayerLaunchProjectileEvent.patch} |   2 +-
 ...atch => 0123-PlayerElytraBoostEvent.patch} |   2 +-
 ...atch => 0124-EntityTransformedEvent.patch} |   2 +-
 ...llow-disabling-armour-stand-ticking.patch} |   2 +-
 ...tch => 0126-SkeletonHorse-Additions.patch} |   2 +-
 ...27-Expand-Location-Manipulation-API.patch} |   6 +-
 ...patch => 0128-Expand-ArmorStand-API.patch} |   2 +-
 ...vent.patch => 0129-AnvilDamageEvent.patch} |   2 +-
 ...eadlock-risk-in-firing-async-events.patch} |   2 +-
 ...h => 0131-Add-hand-to-bucket-events.patch} |   2 +-
 ...ent.patch => 0132-Add-TNTPrimeEvent.patch} |   2 +-
 ...ide-Chunk-Coordinates-as-a-Long-API.patch} |   2 +-
 ...-API.patch => 0134-Async-Chunks-API.patch} |   2 +-
 ...=> 0135-Make-EnderDragon-extend-Mob.patch} |   2 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |   2 +-
 ...ots-for-Timings-Tile-Entity-reports.patch} |   2 +-
 ...locks-to-be-accessed-via-a-long-key.patch} |   6 +-
 ...tch => 0139-Slime-Pathfinder-Events.patch} |   2 +-
 ....patch => 0140-isChunkGenerated-API.patch} |   6 +-
 ....patch => 0141-Add-More-Creeper-API.patch} |   2 +-
 ...ch => 0142-Add-PhantomPreSpawnEvent.patch} |   2 +-
 ...d-source-block-to-BlockPhysicsEvent.patch} |   2 +-
 ...=> 0144-Inventory-removeItemAnySlot.patch} |   2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |   2 +-
 ....patch => 0146-Improve-death-events.patch} |   2 +-
 ...I.patch => 0147-Mob-Pathfinding-API.patch} |   2 +-
 ...anPlaceOn-and-CanDestroy-NBT-values.patch} |   2 +-
 ...urrency-Improvements-to-Permissions.patch} |   2 +-
 ...Add-ItemStackRecipeChoice-Draft-API.patch} |   2 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |   2 +-
 ....patch => 0152-PreSpawnerSpawnEvent.patch} |   2 +-
 ...ition-on-name-for-AttributeModifier.patch} |   2 +-
 ...atch => 0154-Material-API-additions.patch} |   2 +-
 ...ags.patch => 0155-Add-Material-Tags.patch} |   2 +-
 ...56-Allow-setting-the-vex-s-summoner.patch} |   2 +-
 ...57-Add-LivingEntity-getTargetEntity.patch} |   2 +-
 ...I.patch => 0158-Add-sun-related-API.patch} |   2 +-
 ...-Johnny.patch => 0159-Here-s-Johnny.patch} |   2 +-
 ...Turtle-API.patch => 0160-Turtle-API.patch} |   2 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |   2 +-
 ...=> 0162-Add-spectator-target-events.patch} |   2 +-
 ...PI.patch => 0163-Add-more-Witch-API.patch} |   2 +-
 ...ult-permission-message-configurable.patch} |   4 +-
 ...ion-supression-of-EntityDismount-Ve.patch} |   2 +-
 ...I.patch => 0166-Add-more-Zombie-API.patch} |   2 +-
 ...served-channel-check-to-be-sensible.patch} |   2 +-
 ...0168-Add-PlayerConnectionCloseEvent.patch} |   2 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |   2 +-
 ...ent.patch => 0170-BlockDestroyEvent.patch} |   2 +-
 ...ItemStack-Recipe-API-helper-methods.patch} |   2 +-
 ...ch => 0172-Add-WhitelistToggleEvent.patch} |   2 +-
 ...tch => 0173-Annotation-Test-changes.patch} |   2 +-
 Spigot-Server-Patches/0001-POM-Changes.patch  |  24 +-
 Spigot-Server-Patches/0009-Timings-v2.patch   |  22 +-
 ...44-Ensure-commands-are-not-ran-async.patch |  10 +-
 .../0060-Complete-resource-pack-API.patch     |  10 +-
 ...9-Do-not-load-chunks-for-Pathfinding.patch |  10 +-
 ...0091-Add-PlayerUseUnknownEntityEvent.patch |  10 +-
 ...nilla-per-world-scoreboard-coloring-.patch |   8 +-
 ...-to-configure-frosted_ice-properties.patch |  16 +-
 ...132-Fix-AIOOBE-in-inventory-handling.patch |   8 +-
 ...onfigurable-packet-in-spam-threshold.patch |  10 +-
 ...58-Properly-fix-item-duplication-bug.patch |   6 +-
 .../0167-Fix-block-break-desync.patch         |   8 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |   4 +-
 .../0171-Shame-on-you-Mojang.patch            |  38 ---
 ...> 0172-Do-not-let-armorstands-drown.patch} |   8 +-
 ...e-async-calls-to-restart-the-server.patch} |   6 +-
 ...roperty-to-disable-book-size-limits.patch} |   4 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |  10 +-
 ...-option-to-prevent-player-names-fro.patch} |   8 +-
 ...leAppender-for-console-improvements.patch} |  32 +-
 ...rable-option-to-disable-creeper-lin.patch} |   4 +-
 ....patch => 0179-Item-canEntityPickup.patch} |   8 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |   6 +-
 ...> 0181-PlayerAttemptPickupItemEvent.patch} |   6 +-
 ...tch => 0182-Add-UnknownCommandEvent.patch} |   6 +-
 ...tch => 0183-Basic-PlayerProfile-API.patch} |  22 +-
 ... 0184-Shoulder-Entities-Release-API.patch} |   2 +-
 ...patch => 0185-Profile-Lookup-Events.patch} |   4 +-
 ...layer-logins-during-server-shutdown.patch} |   4 +-
 ...patch => 0187-Entity-fromMobSpawner.patch} |  10 +-
 ...0188-Fix-Anvil-Level-sync-to-client.patch} |   8 +-
 ...ages-for-getTileEntity-in-order-to-.patch} |   6 +-
 ...0-Improve-the-Saddle-API-for-Horses.patch} |   4 +-
 ...plement-ensureServerConversions-API.patch} |   4 +-
 ...> 0192-Implement-getI18NDisplayName.patch} |   4 +-
 ...ving-disabled-before-unloading-all-.patch} |   4 +-
 ...=> 0194-ProfileWhitelistVerifyEvent.patch} |   6 +-
 ...ch => 0195-Fix-this-stupid-bullshit.patch} |   6 +-
 ...wns-should-honor-nametags-and-leash.patch} |   6 +-
 ...mer-when-spawner-event-is-cancelled.patch} |   4 +-
 ...8-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |   6 +-
 ...a-custom-authentication-servers-dow.patch} |   6 +-
 ...atch => 0200-LivingEntity-setKiller.patch} |   4 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |   8 +-
 ...-prefixes-using-Log4J-configuration.patch} |   6 +-
 ...Include-Log4J2-SLF4J-implementation.patch} |   6 +-
 ...efix-for-various-plugins-bypassing-.patch} |   4 +-
 ...t.patch => 0205-Add-PlayerJumpEvent.patch} |   4 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |   8 +-
 ...t-protocol-version-and-virtual-host.patch} |  14 +-
 ...t-serverside-behavior-of-keepalives.patch} |   6 +-
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |   4 +-
 ...Effects-only-to-players-who-can-see.patch} |   8 +-
 ...maximum-exp-value-when-merging-orbs.patch} |   8 +-
 ... => 0212-Add-PlayerArmorChangeEvent.patch} |   4 +-
 ...om-being-processed-when-the-player-.patch} |   4 +-
 ...-implementations-for-captured-block.patch} |   6 +-
 ...get-a-BlockState-without-a-snapshot.patch} |   6 +-
 ...patch => 0216-AsyncTabCompleteEvent.patch} |   8 +-
 ...17-Avoid-NPE-in-PathfinderGoalTempt.patch} |   6 +-
 ...=> 0218-PlayerPickupExperienceEvent.patch} |   4 +-
 ...tch => 0219-ExperienceOrbMergeEvent.patch} |   6 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |  10 +-
 ...rable-Chunks-Sends-per-Tick-setting.patch} |   4 +-
 ...onfigurable-Max-Chunk-Gens-per-Tick.patch} |   4 +-
 ...max-squid-spawn-height-configurable.patch} |   6 +-
 ...patch => 0224-PreCreatureSpawnEvent.patch} |   6 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |   6 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |   8 +-
 ...> 0227-Fill-Profile-Property-Events.patch} |   4 +-
 ...layerAdvancementCriterionGrantEvent.patch} |   4 +-
 ...ch => 0229-Add-ArmorStand-Item-Meta.patch} |  14 +-
 ...Extend-Player-Interact-cancellation.patch} |   6 +-
 ... 0231-Tameable-getOwnerUniqueId-API.patch} |   4 +-
 ...-crits-helps-mitigate-hacked-client.patch} |   6 +-
 ...ing-location-from-InventoryEnderChe.patch} |   4 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  22 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |   4 +-
 ...t-extended-PaperServerListPingEvent.patch} |   6 +-
 ... 0237-Improved-Async-Task-Scheduler.patch} |   4 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |   4 +-
 ...-PortalCreateEvent-for-exit-portals.patch} |   6 +-
 ...=> 0240-Player.setPlayerProfile-API.patch} |  10 +-
 ...h => 0241-Fix-Dragon-Server-Crashes.patch} |   4 +-
 ...patch => 0242-getPlayerUniqueId-API.patch} |   6 +-
 ...ake-player-data-saving-configurable.patch} |   8 +-
 ...e-legacy-ping-handler-more-reliable.patch} |   6 +-
 ...erverListPingEvent-for-legacy-pings.patch} |   4 +-
 ...6-Flag-to-disable-the-channel-limit.patch} |   6 +-
 ...-method-to-open-already-placed-sign.patch} |   6 +-
 ...oad-version-history-at-server-start.patch} |   6 +-
 ...rable-sprint-interruption-on-attack.patch} |   6 +-
 ...allowed-colored-signs-to-be-created.patch} |   8 +-
 ...t.patch => 0251-EndermanEscapeEvent.patch} |   4 +-
 ...h => 0252-Enderman.teleportRandomly.patch} |   4 +-
 ...253-Block-Enderpearl-Travel-Exploit.patch} |   6 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |   8 +-
 ...h => 0255-EndermanAttackPlayerEvent.patch} |   4 +-
 ...tch => 0256-WitchConsumePotionEvent.patch} |   4 +-
 ...patch => 0257-WitchThrowPotionEvent.patch} |   6 +-
 ...tem-entities-with-World.spawnEntity.patch} |   4 +-
 ...ages-loading-chunks-for-door-checks.patch} |   6 +-
 ...patch => 0260-WitchReadyPotionEvent.patch} |   6 +-
 ...261-ItemStack-getMaxItemUseDuration.patch} |   6 +-
 ...ement-EntityTeleportEndGatewayEvent.patch} |   6 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |   6 +-
 ...move-entities-on-dimension-teleport.patch} |   8 +-
 ...ch => 0265-Fix-CraftEntity-hashCode.patch} |   6 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |   6 +-
 ...ls-when-failing-to-save-player-data.patch} |   6 +-
 ...-shield-blocking-delay-configurable.patch} |   6 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |   4 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  10 +-
 ...patch => 0271-PlayerReadyArrowEvent.patch} |   6 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |   6 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |   6 +-
 ...patch => 0274-Expand-Explosions-API.patch} |   4 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   6 +-
 ...-API.patch => 0276-RangedEntity-API.patch} |   4 +-
 ...o-disable-ender-dragon-legacy-check.patch} |   4 +-
 ...-Implement-World.getEntity-UUID-API.patch} |   4 +-
 ...0279-InventoryCloseEvent-Reason-API.patch} |   6 +-
 ...ps-for-Entity-TileEntity-Current-Ch.patch} |   6 +-
 ...0281-Configurable-Bed-Search-Radius.patch} |   4 +-
 ...I.patch => 0282-Vex-getSummoner-API.patch} |   6 +-
 ...ventory-when-cancelling-PlayerInter.patch} |   8 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |   4 +-
 ...illa-entity-warnings-for-duplicates.patch} |   6 +-
 ...pawn-if-entity-is-in-a-chunk-schedu.patch} |   6 +-
 ...-if-stack-size-above-max-stack-size.patch} |   6 +-
 ...88-Use-asynchronous-Log4j-2-loggers.patch} |   6 +-
 ...more-information-to-Entity.toString.patch} |   6 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} |  10 +-
 ...ts.patch => 0291-EnderDragon-Events.patch} |   4 +-
 ...atch => 0292-PlayerElytraBoostEvent.patch} |   4 +-
 ...=> 0293-PlayerLaunchProjectileEvent.patch} |   4 +-
 ... 0294-Duplicate-UUID-Resolve-Option.patch} |  14 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |   6 +-
 ...tch => 0296-Don-t-save-Proto-Chunks.patch} |   4 +-
 ...patch => 0297-Optimize-RegistryID.c.patch} |   4 +-
 ...-armor-stands-from-doing-entity-loo.patch} |   6 +-
 ...-Vanished-players-don-t-have-rights.patch} |  10 +-
 ...anytime-entities-change-to-guarante.patch} |   4 +-
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |   8 +-
 ... => 0302-Optimize-Region-File-Cache.patch} |   4 +-
 ...atch => 0303-EntityTransformedEvent.patch} |  12 +-
 ...tch => 0304-SkeletonHorse-Additions.patch} |   4 +-
 ...event-Saving-Bad-entities-to-chunks.patch} |   4 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |   4 +-
 ...ocess-chunk-removal-in-removeEntity.patch} |   6 +-
 ...ad-Entities-in-entityList-iteration.patch} |   8 +-
 ...-use-a-versioned-world-folder-for-t.patch} |   6 +-
 ...10-MC-111480-Start-Entity-ID-s-at-1.patch} |   6 +-
 ...1-Implement-Expanded-ArmorStand-API.patch} |   4 +-
 ...vent.patch => 0312-AnvilDamageEvent.patch} |   4 +-
 ...ld-EntityHuman-Lookup-Optimizations.patch} |   6 +-
 ...ent.patch => 0314-Add-TNTPrimeEvent.patch} |   4 +-
 ...d-make-tab-spam-limits-configurable.patch} |   8 +-
 ...ortation-adjustment-math-more-accur.patch} |   4 +-
 ...h => 0317-Add-hand-to-bucket-events.patch} |  10 +-
 ...-Experience-should-save-as-Integers.patch} |   4 +-
 ...h => 0319-Entity-add-to-world-fixes.patch} |  10 +-
 ...ent-rendering-skulls-from-same-user.patch} |   6 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  10 +-
 ...0322-Make-EnderDragon-implement-Mob.patch} |   4 +-
 ...ect-and-repair-corrupt-Region-Files.patch} |   6 +-
 ...4-Use-ConcurrentHashMap-in-JsonList.patch} |   4 +-
 ...5-Use-a-Queue-for-Queueing-Commands.patch} |   6 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |   4 +-
 ...llow-disabling-armour-stand-ticking.patch} |   4 +-
 ...timize-BlockPosition-helper-methods.patch} |   6 +-
 ...ts-from-world-player-list-not-serve.patch} |  12 +-
 ...0330-Cache-World-Entity-Type-counts.patch} |   8 +-
 ...tore-vanlla-default-mob-spawn-range.patch} |   4 +-
 ...pers.patch => 0332-Optimize-Hoppers.patch} |  14 +-
 ...33-Optimize-CraftBlockData-Creation.patch} |   6 +-
 ...-124320.patch => 0334-Fix-MC-124320.patch} |   6 +-
 ...tch => 0335-Slime-Pathfinder-Events.patch} |   4 +-
 ...7-Anti-Xray.patch => 0336-Anti-Xray.patch} |   8 +-
 ...e-speed-for-water-flowing-over-lava.patch} |   4 +-
 ... => 0338-Optimize-RegistryMaterials.patch} |   4 +-
 ...ch => 0339-Add-PhantomPreSpawnEvent.patch} |   4 +-
 ....patch => 0340-Add-More-Creeper-API.patch} |   4 +-
 ...=> 0341-Inventory-removeItemAnySlot.patch} |   4 +-
 ...ptimize-getChunkIfLoaded-type-calls.patch} |   6 +-
 ...oadChunk-int-int-false-load-unconve.patch} |   2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |   4 +-
 ...-attack-cooldown-methods-for-Player.patch} |   2 +-
 ....patch => 0346-Improve-death-events.patch} |   6 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |   2 +-
 ...I.patch => 0348-Mob-Pathfinding-API.patch} |   2 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |   4 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |   2 +-
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |   4 +-
 ...ning-from-loading-generating-chunks.patch} |   2 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   2 +-
 ...Optimize-and-Fix-ExpiringMap-Issues.patch} |   2 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |   2 +-
 ...0356-Support-Overriding-World-Seeds.patch} |   2 +-
 ...h => 0357-Optimize-Server-World-Map.patch} |   2 +-
 ....patch => 0358-PreSpawnerSpawnEvent.patch} |   2 +-
 ...rseException-in-Entity-and-TE-names.patch} |   4 +-
 ... 0360-Avoid-dimension-id-collisions.patch} |   2 +-
 ...=> 0361-Honor-EntityAgeable.ageLock.patch} |   2 +-
 ...-Async-Chunk-Loading-and-Generation.patch} |   6 +-
 ...-Dimension-NBT-field-in-Entity-data.patch} |   4 +-
 ... 0364-Optimize-Light-Recalculations.patch} |   4 +-
 ...-entity-loss-due-to-unloaded-chunks.patch} |   4 +-
 ...-recheck-type-after-setting-a-block.patch} |   2 +-
 ...> 0367-Fix-Sending-Chunks-to-Client.patch} |   2 +-
 ...le-connection-throttle-kick-message.patch} |   2 +-
 ...Fix-FileIOThread-concurrency-issues.patch} |   2 +-
 ...> 0370-Hook-into-CB-plugin-rewrites.patch} |   2 +-
 ...71-Allow-setting-the-vex-s-summoner.patch} |   2 +-
 ...72-Add-LivingEntity-getTargetEntity.patch} |   6 +-
 ...I.patch => 0373-Add-sun-related-API.patch} |   4 +-
 ...wned-for-Villager-Aggression-Config.patch} |   2 +-
 ...-Johnny.patch => 0375-Here-s-Johnny.patch} |   2 +-
 ...Turtle-API.patch => 0376-Turtle-API.patch} |   2 +-
 ...it-lightning-strike-effect-distance.patch} |   2 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |   2 +-
 ...her-worlds-for-shooter-of-projectil.patch} |   2 +-
 ...Call-player-spectator-target-events.patch} |   2 +-
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   2 +-
 ...PI.patch => 0382-Add-more-Witch-API.patch} |   2 +-
 ...MC-93764.patch => 0383-Fix-MC-93764.patch} |   2 +-
 ...vent-players-from-moving-into-unloa.patch} |   4 +-
 ...5-Reset-players-airTicks-on-respawn.patch} |   4 +-
 ...-area-unicode-characters-from-signs.patch} |   2 +-
 ...after-profile-lookups-if-not-needed.patch} |   2 +-
 ...le-thread-count-default-for-bootstr.patch} |   2 +-
 ...Use-EntityTypes-for-living-entities.patch} |   2 +-
 ...id-item-for-enchantment-checks-on-b.patch} |   2 +-
 ...=> 0391-Optimize-World-Time-Updates.patch} |   2 +-
 ...tore-custom-InventoryHolder-support.patch} |   2 +-
 ...=> 0393-Use-Vanilla-Minecart-Speeds.patch} |   2 +-
 ...0394-Fix-SpongeAbsortEvent-handling.patch} |   2 +-
 ...-allow-digging-into-unloaded-chunks.patch} |   6 +-
 ...=> 0396-Optimize-redstone-algorithm.patch} |   6 +-
 ...ntity-dismount-during-teleportation.patch} |   6 +-
 ...mits.patch => 0398-Book-Size-Limits.patch} |   4 +-
 ...ult-permission-message-configurable.patch} |   2 +-
 ...I.patch => 0400-Add-more-Zombie-API.patch} |   2 +-
 ...t-which-we-ll-consider-an-attackabl.patch} |   4 +-
 ...revent-rayTrace-from-loading-chunks.patch} |   4 +-
 ...-Large-Packets-disconnecting-client.patch} |   2 +-
 ...world-storage-in-CraftOfflinePlayer.patch} |   2 +-
 ...0405-Add-PlayerConnectionCloseEvent.patch} |   2 +-
 ...revent-Enderman-from-loading-chunks.patch} |   2 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |   2 +-
 ...tch => 0408-Fix-PlayerEditBookEvent.patch} |   4 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |   2 +-
 ...nRetractEvent-for-all-empty-pistons.patch} |   2 +-
 ...remove-from-being-called-on-Players.patch} |   2 +-
 ...12-Allow-Saving-of-Oversized-Chunks.patch} |   2 +-
 ...ent.patch => 0413-BlockDestroyEvent.patch} |   4 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |   2 +-
 ...h => 0415-Fix-sign-edit-memory-leak.patch} |   6 +-
 ... 0416-Limit-Client-Sign-length-more.patch} |   6 +-
 ...onvertSigns-boolean-every-sign-save.patch} |   2 +-
 ...Signs-in-Chunks-creating-too-large-.patch} |   2 +-
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |   2 +-
 ...t-tick-at-start-of-drowning-process.patch} |   2 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |   2 +-
 work/BuildData                                |   2 +-
 work/Bukkit                                   |   2 +-
 work/CraftBukkit                              |   2 +-
 work/Spigot                                   |   2 +-
 332 files changed, 1073 insertions(+), 843 deletions(-)
 create mode 100644 Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
 rename Spigot-API-Patches/{0110-PlayerReadyArrowEvent.patch => 0111-PlayerReadyArrowEvent.patch} (98%)
 rename Spigot-API-Patches/{0111-Add-EntityKnockbackByEntityEvent.patch => 0112-Add-EntityKnockbackByEntityEvent.patch} (97%)
 rename Spigot-API-Patches/{0112-Expand-Explosions-API.patch => 0113-Expand-Explosions-API.patch} (97%)
 rename Spigot-API-Patches/{0113-ItemStack-API-additions-for-quantity-flags-lore.patch => 0114-ItemStack-API-additions-for-quantity-flags-lore.patch} (98%)
 rename Spigot-API-Patches/{0114-LivingEntity-Hand-Raised-Item-Use-API.patch => 0115-LivingEntity-Hand-Raised-Item-Use-API.patch} (96%)
 rename Spigot-API-Patches/{0115-RangedEntity-API.patch => 0116-RangedEntity-API.patch} (98%)
 rename Spigot-API-Patches/{0116-Add-World.getEntity-UUID-API.patch => 0117-Add-World.getEntity-UUID-API.patch} (93%)
 rename Spigot-API-Patches/{0117-InventoryCloseEvent-Reason-API.patch => 0118-InventoryCloseEvent-Reason-API.patch} (97%)
 rename Spigot-API-Patches/{0118-Entity-getChunk-API.patch => 0119-Entity-getChunk-API.patch} (94%)
 rename Spigot-API-Patches/{0119-Add-an-asterisk-to-legacy-API-plugins.patch => 0120-Add-an-asterisk-to-legacy-API-plugins.patch} (97%)
 rename Spigot-API-Patches/{0120-EnderDragon-Events.patch => 0121-EnderDragon-Events.patch} (99%)
 rename Spigot-API-Patches/{0121-PlayerLaunchProjectileEvent.patch => 0122-PlayerLaunchProjectileEvent.patch} (97%)
 rename Spigot-API-Patches/{0122-PlayerElytraBoostEvent.patch => 0123-PlayerElytraBoostEvent.patch} (97%)
 rename Spigot-API-Patches/{0123-EntityTransformedEvent.patch => 0124-EntityTransformedEvent.patch} (97%)
 rename Spigot-API-Patches/{0124-Allow-disabling-armour-stand-ticking.patch => 0125-Allow-disabling-armour-stand-ticking.patch} (94%)
 rename Spigot-API-Patches/{0125-SkeletonHorse-Additions.patch => 0126-SkeletonHorse-Additions.patch} (97%)
 rename Spigot-API-Patches/{0126-Expand-Location-Manipulation-API.patch => 0127-Expand-Location-Manipulation-API.patch} (93%)
 rename Spigot-API-Patches/{0127-Expand-ArmorStand-API.patch => 0128-Expand-ArmorStand-API.patch} (98%)
 rename Spigot-API-Patches/{0128-AnvilDamageEvent.patch => 0129-AnvilDamageEvent.patch} (98%)
 rename Spigot-API-Patches/{0129-Remove-deadlock-risk-in-firing-async-events.patch => 0130-Remove-deadlock-risk-in-firing-async-events.patch} (98%)
 rename Spigot-API-Patches/{0130-Add-hand-to-bucket-events.patch => 0131-Add-hand-to-bucket-events.patch} (98%)
 rename Spigot-API-Patches/{0131-Add-TNTPrimeEvent.patch => 0132-Add-TNTPrimeEvent.patch} (98%)
 rename Spigot-API-Patches/{0132-Provide-Chunk-Coordinates-as-a-Long-API.patch => 0133-Provide-Chunk-Coordinates-as-a-Long-API.patch} (97%)
 rename Spigot-API-Patches/{0133-Async-Chunks-API.patch => 0134-Async-Chunks-API.patch} (99%)
 rename Spigot-API-Patches/{0134-Make-EnderDragon-extend-Mob.patch => 0135-Make-EnderDragon-extend-Mob.patch} (92%)
 rename Spigot-API-Patches/{0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (94%)
 rename Spigot-API-Patches/{0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch => 0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch} (93%)
 rename Spigot-API-Patches/{0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch => 0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch} (96%)
 rename Spigot-API-Patches/{0138-Slime-Pathfinder-Events.patch => 0139-Slime-Pathfinder-Events.patch} (99%)
 rename Spigot-API-Patches/{0139-isChunkGenerated-API.patch => 0140-isChunkGenerated-API.patch} (92%)
 rename Spigot-API-Patches/{0140-Add-More-Creeper-API.patch => 0141-Add-More-Creeper-API.patch} (97%)
 rename Spigot-API-Patches/{0141-Add-PhantomPreSpawnEvent.patch => 0142-Add-PhantomPreSpawnEvent.patch} (97%)
 rename Spigot-API-Patches/{0142-Add-source-block-to-BlockPhysicsEvent.patch => 0143-Add-source-block-to-BlockPhysicsEvent.patch} (94%)
 rename Spigot-API-Patches/{0143-Inventory-removeItemAnySlot.patch => 0144-Inventory-removeItemAnySlot.patch} (96%)
 rename Spigot-API-Patches/{0144-Add-ray-tracing-methods-to-LivingEntity.patch => 0145-Add-ray-tracing-methods-to-LivingEntity.patch} (98%)
 rename Spigot-API-Patches/{0145-Improve-death-events.patch => 0146-Improve-death-events.patch} (99%)
 rename Spigot-API-Patches/{0146-Mob-Pathfinding-API.patch => 0147-Mob-Pathfinding-API.patch} (99%)
 rename Spigot-API-Patches/{0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (99%)
 rename Spigot-API-Patches/{0148-Performance-Concurrency-Improvements-to-Permissions.patch => 0149-Performance-Concurrency-Improvements-to-Permissions.patch} (98%)
 rename Spigot-API-Patches/{0149-Add-ItemStackRecipeChoice-Draft-API.patch => 0150-Add-ItemStackRecipeChoice-Draft-API.patch} (96%)
 rename Spigot-API-Patches/{0150-Implement-furnace-cook-speed-multiplier-API.patch => 0151-Implement-furnace-cook-speed-multiplier-API.patch} (95%)
 rename Spigot-API-Patches/{0151-PreSpawnerSpawnEvent.patch => 0152-PreSpawnerSpawnEvent.patch} (96%)
 rename Spigot-API-Patches/{0152-Remove-Precondition-on-name-for-AttributeModifier.patch => 0153-Remove-Precondition-on-name-for-AttributeModifier.patch} (94%)
 rename Spigot-API-Patches/{0153-Material-API-additions.patch => 0154-Material-API-additions.patch} (94%)
 rename Spigot-API-Patches/{0154-Add-Material-Tags.patch => 0155-Add-Material-Tags.patch} (99%)
 rename Spigot-API-Patches/{0155-Allow-setting-the-vex-s-summoner.patch => 0156-Allow-setting-the-vex-s-summoner.patch} (93%)
 rename Spigot-API-Patches/{0156-Add-LivingEntity-getTargetEntity.patch => 0157-Add-LivingEntity-getTargetEntity.patch} (98%)
 rename Spigot-API-Patches/{0157-Add-sun-related-API.patch => 0158-Add-sun-related-API.patch} (95%)
 rename Spigot-API-Patches/{0158-Here-s-Johnny.patch => 0159-Here-s-Johnny.patch} (96%)
 rename Spigot-API-Patches/{0159-Turtle-API.patch => 0160-Turtle-API.patch} (99%)
 rename Spigot-API-Patches/{0160-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (96%)
 rename Spigot-API-Patches/{0161-Add-spectator-target-events.patch => 0162-Add-spectator-target-events.patch} (98%)
 rename Spigot-API-Patches/{0162-Add-more-Witch-API.patch => 0163-Add-more-Witch-API.patch} (95%)
 rename Spigot-API-Patches/{0163-Make-the-default-permission-message-configurable.patch => 0164-Make-the-default-permission-message-configurable.patch} (95%)
 rename Spigot-API-Patches/{0164-Support-cancellation-supression-of-EntityDismount-Ve.patch => 0165-Support-cancellation-supression-of-EntityDismount-Ve.patch} (98%)
 rename Spigot-API-Patches/{0165-Add-more-Zombie-API.patch => 0166-Add-more-Zombie-API.patch} (96%)
 rename Spigot-API-Patches/{0166-Change-the-reserved-channel-check-to-be-sensible.patch => 0167-Change-the-reserved-channel-check-to-be-sensible.patch} (96%)
 rename Spigot-API-Patches/{0167-Add-PlayerConnectionCloseEvent.patch => 0168-Add-PlayerConnectionCloseEvent.patch} (98%)
 rename Spigot-API-Patches/{0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (97%)
 rename Spigot-API-Patches/{0169-BlockDestroyEvent.patch => 0170-BlockDestroyEvent.patch} (98%)
 rename Spigot-API-Patches/{0170-Add-ItemStack-Recipe-API-helper-methods.patch => 0171-Add-ItemStack-Recipe-API-helper-methods.patch} (97%)
 rename Spigot-API-Patches/{0171-Add-WhitelistToggleEvent.patch => 0172-Add-WhitelistToggleEvent.patch} (95%)
 rename Spigot-API-Patches/{0172-Annotation-Test-changes.patch => 0173-Annotation-Test-changes.patch} (94%)
 rename Spigot-Server-Patches/{0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0171-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (94%)
 delete mode 100644 Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch
 rename Spigot-Server-Patches/{0173-Do-not-let-armorstands-drown.patch => 0172-Do-not-let-armorstands-drown.patch} (93%)
 rename Spigot-Server-Patches/{0174-Properly-handle-async-calls-to-restart-the-server.patch => 0173-Properly-handle-async-calls-to-restart-the-server.patch} (99%)
 rename Spigot-Server-Patches/{0175-Add-system-property-to-disable-book-size-limits.patch => 0174-Add-system-property-to-disable-book-size-limits.patch} (97%)
 rename Spigot-Server-Patches/{0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (93%)
 rename Spigot-Server-Patches/{0177-Add-configuration-option-to-prevent-player-names-fro.patch => 0176-Add-configuration-option-to-prevent-player-names-fro.patch} (91%)
 rename Spigot-Server-Patches/{0178-Use-TerminalConsoleAppender-for-console-improvements.patch => 0177-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0179-provide-a-configurable-option-to-disable-creeper-lin.patch => 0178-provide-a-configurable-option-to-disable-creeper-lin.patch} (96%)
 rename Spigot-Server-Patches/{0180-Item-canEntityPickup.patch => 0179-Item-canEntityPickup.patch} (94%)
 rename Spigot-Server-Patches/{0181-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0180-PlayerPickupItemEvent-setFlyAtPlayer.patch} (95%)
 rename Spigot-Server-Patches/{0182-PlayerAttemptPickupItemEvent.patch => 0181-PlayerAttemptPickupItemEvent.patch} (94%)
 rename Spigot-Server-Patches/{0183-Add-UnknownCommandEvent.patch => 0182-Add-UnknownCommandEvent.patch} (93%)
 rename Spigot-Server-Patches/{0184-Basic-PlayerProfile-API.patch => 0183-Basic-PlayerProfile-API.patch} (98%)
 rename Spigot-Server-Patches/{0185-Shoulder-Entities-Release-API.patch => 0184-Shoulder-Entities-Release-API.patch} (98%)
 rename Spigot-Server-Patches/{0186-Profile-Lookup-Events.patch => 0185-Profile-Lookup-Events.patch} (98%)
 rename Spigot-Server-Patches/{0187-Block-player-logins-during-server-shutdown.patch => 0186-Block-player-logins-during-server-shutdown.patch} (93%)
 rename Spigot-Server-Patches/{0188-Entity-fromMobSpawner.patch => 0187-Entity-fromMobSpawner.patch} (94%)
 rename Spigot-Server-Patches/{0189-Fix-Anvil-Level-sync-to-client.patch => 0188-Fix-Anvil-Level-sync-to-client.patch} (93%)
 rename Spigot-Server-Patches/{0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0189-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (90%)
 rename Spigot-Server-Patches/{0191-Improve-the-Saddle-API-for-Horses.patch => 0190-Improve-the-Saddle-API-for-Horses.patch} (97%)
 rename Spigot-Server-Patches/{0192-Implement-ensureServerConversions-API.patch => 0191-Implement-ensureServerConversions-API.patch} (93%)
 rename Spigot-Server-Patches/{0193-Implement-getI18NDisplayName.patch => 0192-Implement-getI18NDisplayName.patch} (96%)
 rename Spigot-Server-Patches/{0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0193-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (93%)
 rename Spigot-Server-Patches/{0195-ProfileWhitelistVerifyEvent.patch => 0194-ProfileWhitelistVerifyEvent.patch} (96%)
 rename Spigot-Server-Patches/{0196-Fix-this-stupid-bullshit.patch => 0195-Fix-this-stupid-bullshit.patch} (93%)
 rename Spigot-Server-Patches/{0197-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0196-Ocelot-despawns-should-honor-nametags-and-leash.patch} (88%)
 rename Spigot-Server-Patches/{0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0197-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (94%)
 rename Spigot-Server-Patches/{0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0198-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (91%)
 rename Spigot-Server-Patches/{0200-Allow-specifying-a-custom-authentication-servers-dow.patch => 0199-Allow-specifying-a-custom-authentication-servers-dow.patch} (95%)
 rename Spigot-Server-Patches/{0201-LivingEntity-setKiller.patch => 0200-LivingEntity-setKiller.patch} (94%)
 rename Spigot-Server-Patches/{0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0201-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0203-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0202-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 rename Spigot-Server-Patches/{0204-Include-Log4J2-SLF4J-implementation.patch => 0203-Include-Log4J2-SLF4J-implementation.patch} (86%)
 rename Spigot-Server-Patches/{0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0204-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (96%)
 rename Spigot-Server-Patches/{0206-Add-PlayerJumpEvent.patch => 0205-Add-PlayerJumpEvent.patch} (97%)
 rename Spigot-Server-Patches/{0207-handle-PacketPlayInKeepAlive-async.patch => 0206-handle-PacketPlayInKeepAlive-async.patch} (92%)
 rename Spigot-Server-Patches/{0208-Expose-client-protocol-version-and-virtual-host.patch => 0207-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename Spigot-Server-Patches/{0209-revert-serverside-behavior-of-keepalives.patch => 0208-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0209-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (94%)
 rename Spigot-Server-Patches/{0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0210-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (97%)
 rename Spigot-Server-Patches/{0212-Option-for-maximum-exp-value-when-merging-orbs.patch => 0211-Option-for-maximum-exp-value-when-merging-orbs.patch} (95%)
 rename Spigot-Server-Patches/{0213-Add-PlayerArmorChangeEvent.patch => 0212-Add-PlayerArmorChangeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0214-Prevent-logins-from-being-processed-when-the-player-.patch => 0213-Prevent-logins-from-being-processed-when-the-player-.patch} (93%)
 rename Spigot-Server-Patches/{0215-use-CB-BlockState-implementations-for-captured-block.patch => 0214-use-CB-BlockState-implementations-for-captured-block.patch} (94%)
 rename Spigot-Server-Patches/{0216-API-to-get-a-BlockState-without-a-snapshot.patch => 0215-API-to-get-a-BlockState-without-a-snapshot.patch} (98%)
 rename Spigot-Server-Patches/{0217-AsyncTabCompleteEvent.patch => 0216-AsyncTabCompleteEvent.patch} (98%)
 rename Spigot-Server-Patches/{0218-Avoid-NPE-in-PathfinderGoalTempt.patch => 0217-Avoid-NPE-in-PathfinderGoalTempt.patch} (88%)
 rename Spigot-Server-Patches/{0219-PlayerPickupExperienceEvent.patch => 0218-PlayerPickupExperienceEvent.patch} (94%)
 rename Spigot-Server-Patches/{0220-ExperienceOrbMergeEvent.patch => 0219-ExperienceOrbMergeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0221-Ability-to-apply-mending-to-XP-API.patch => 0220-Ability-to-apply-mending-to-XP-API.patch} (95%)
 rename Spigot-Server-Patches/{0222-Configurable-Chunks-Sends-per-Tick-setting.patch => 0221-Configurable-Chunks-Sends-per-Tick-setting.patch} (96%)
 rename Spigot-Server-Patches/{0223-Configurable-Max-Chunk-Gens-per-Tick.patch => 0222-Configurable-Max-Chunk-Gens-per-Tick.patch} (98%)
 rename Spigot-Server-Patches/{0224-Make-max-squid-spawn-height-configurable.patch => 0223-Make-max-squid-spawn-height-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0225-PreCreatureSpawnEvent.patch => 0224-PreCreatureSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0226-PlayerNaturallySpawnCreaturesEvent.patch => 0225-PlayerNaturallySpawnCreaturesEvent.patch} (93%)
 rename Spigot-Server-Patches/{0227-Add-setPlayerProfile-API-for-Skulls.patch => 0226-Add-setPlayerProfile-API-for-Skulls.patch} (95%)
 rename Spigot-Server-Patches/{0228-Fill-Profile-Property-Events.patch => 0227-Fill-Profile-Property-Events.patch} (96%)
 rename Spigot-Server-Patches/{0229-PlayerAdvancementCriterionGrantEvent.patch => 0228-PlayerAdvancementCriterionGrantEvent.patch} (93%)
 rename Spigot-Server-Patches/{0230-Add-ArmorStand-Item-Meta.patch => 0229-Add-ArmorStand-Item-Meta.patch} (98%)
 rename Spigot-Server-Patches/{0231-Extend-Player-Interact-cancellation.patch => 0230-Extend-Player-Interact-cancellation.patch} (97%)
 rename Spigot-Server-Patches/{0232-Tameable-getOwnerUniqueId-API.patch => 0231-Tameable-getOwnerUniqueId-API.patch} (95%)
 rename Spigot-Server-Patches/{0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (94%)
 rename Spigot-Server-Patches/{0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0233-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (94%)
 rename Spigot-Server-Patches/{0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0234-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (59%)
 rename Spigot-Server-Patches/{0236-Disable-Explicit-Network-Manager-Flushing.patch => 0235-Disable-Explicit-Network-Manager-Flushing.patch} (95%)
 rename Spigot-Server-Patches/{0237-Implement-extended-PaperServerListPingEvent.patch => 0236-Implement-extended-PaperServerListPingEvent.patch} (99%)
 rename Spigot-Server-Patches/{0238-Improved-Async-Task-Scheduler.patch => 0237-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0238-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (97%)
 rename Spigot-Server-Patches/{0240-Call-PortalCreateEvent-for-exit-portals.patch => 0239-Call-PortalCreateEvent-for-exit-portals.patch} (98%)
 rename Spigot-Server-Patches/{0241-Player.setPlayerProfile-API.patch => 0240-Player.setPlayerProfile-API.patch} (97%)
 rename Spigot-Server-Patches/{0242-Fix-Dragon-Server-Crashes.patch => 0241-Fix-Dragon-Server-Crashes.patch} (94%)
 rename Spigot-Server-Patches/{0243-getPlayerUniqueId-API.patch => 0242-getPlayerUniqueId-API.patch} (94%)
 rename Spigot-Server-Patches/{0244-Make-player-data-saving-configurable.patch => 0243-Make-player-data-saving-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0245-Make-legacy-ping-handler-more-reliable.patch => 0244-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0246-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0245-Call-PaperServerListPingEvent-for-legacy-pings.patch} (99%)
 rename Spigot-Server-Patches/{0247-Flag-to-disable-the-channel-limit.patch => 0246-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0248-Add-method-to-open-already-placed-sign.patch => 0247-Add-method-to-open-already-placed-sign.patch} (92%)
 rename Spigot-Server-Patches/{0249-Load-version-history-at-server-start.patch => 0248-Load-version-history-at-server-start.patch} (88%)
 rename Spigot-Server-Patches/{0250-Configurable-sprint-interruption-on-attack.patch => 0249-Configurable-sprint-interruption-on-attack.patch} (94%)
 rename Spigot-Server-Patches/{0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0250-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (86%)
 rename Spigot-Server-Patches/{0252-EndermanEscapeEvent.patch => 0251-EndermanEscapeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0253-Enderman.teleportRandomly.patch => 0252-Enderman.teleportRandomly.patch} (95%)
 rename Spigot-Server-Patches/{0254-Block-Enderpearl-Travel-Exploit.patch => 0253-Block-Enderpearl-Travel-Exploit.patch} (95%)
 rename Spigot-Server-Patches/{0255-Expand-World.spawnParticle-API-and-add-Builder.patch => 0254-Expand-World.spawnParticle-API-and-add-Builder.patch} (96%)
 rename Spigot-Server-Patches/{0256-EndermanAttackPlayerEvent.patch => 0255-EndermanAttackPlayerEvent.patch} (95%)
 rename Spigot-Server-Patches/{0257-WitchConsumePotionEvent.patch => 0256-WitchConsumePotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0258-WitchThrowPotionEvent.patch => 0257-WitchThrowPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0258-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (94%)
 rename Spigot-Server-Patches/{0260-Configurable-Villages-loading-chunks-for-door-checks.patch => 0259-Configurable-Villages-loading-chunks-for-door-checks.patch} (98%)
 rename Spigot-Server-Patches/{0261-WitchReadyPotionEvent.patch => 0260-WitchReadyPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0262-ItemStack-getMaxItemUseDuration.patch => 0261-ItemStack-getMaxItemUseDuration.patch} (93%)
 rename Spigot-Server-Patches/{0263-Implement-EntityTeleportEndGatewayEvent.patch => 0262-Implement-EntityTeleportEndGatewayEvent.patch} (94%)
 rename Spigot-Server-Patches/{0264-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0263-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (93%)
 rename Spigot-Server-Patches/{0265-Properly-remove-entities-on-dimension-teleport.patch => 0264-Properly-remove-entities-on-dimension-teleport.patch} (94%)
 rename Spigot-Server-Patches/{0266-Fix-CraftEntity-hashCode.patch => 0265-Fix-CraftEntity-hashCode.patch} (94%)
 rename Spigot-Server-Patches/{0267-Configurable-Alternative-LootPool-Luck-Formula.patch => 0266-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename Spigot-Server-Patches/{0268-Print-Error-details-when-failing-to-save-player-data.patch => 0267-Print-Error-details-when-failing-to-save-player-data.patch} (88%)
 rename Spigot-Server-Patches/{0269-Make-shield-blocking-delay-configurable.patch => 0268-Make-shield-blocking-delay-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0270-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0269-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (95%)
 rename Spigot-Server-Patches/{0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0270-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (96%)
 rename Spigot-Server-Patches/{0272-PlayerReadyArrowEvent.patch => 0271-PlayerReadyArrowEvent.patch} (97%)
 rename Spigot-Server-Patches/{0273-Fire-EntityShootBowEvent-for-Illusioner.patch => 0272-Fire-EntityShootBowEvent-for-Illusioner.patch} (93%)
 rename Spigot-Server-Patches/{0274-Implement-EntityKnockbackByEntityEvent.patch => 0273-Implement-EntityKnockbackByEntityEvent.patch} (94%)
 rename Spigot-Server-Patches/{0275-Expand-Explosions-API.patch => 0274-Expand-Explosions-API.patch} (94%)
 rename Spigot-Server-Patches/{0276-LivingEntity-Hand-Raised-Item-Use-API.patch => 0275-LivingEntity-Hand-Raised-Item-Use-API.patch} (95%)
 rename Spigot-Server-Patches/{0277-RangedEntity-API.patch => 0276-RangedEntity-API.patch} (99%)
 rename Spigot-Server-Patches/{0278-Add-config-to-disable-ender-dragon-legacy-check.patch => 0277-Add-config-to-disable-ender-dragon-legacy-check.patch} (97%)
 rename Spigot-Server-Patches/{0279-Implement-World.getEntity-UUID-API.patch => 0278-Implement-World.getEntity-UUID-API.patch} (92%)
 rename Spigot-Server-Patches/{0280-InventoryCloseEvent-Reason-API.patch => 0279-InventoryCloseEvent-Reason-API.patch} (98%)
 rename Spigot-Server-Patches/{0281-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0280-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (97%)
 rename Spigot-Server-Patches/{0282-Configurable-Bed-Search-Radius.patch => 0281-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0283-Vex-getSummoner-API.patch => 0282-Vex-getSummoner-API.patch} (94%)
 rename Spigot-Server-Patches/{0284-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0283-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (88%)
 rename Spigot-Server-Patches/{0285-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0284-Don-t-change-the-Entity-Random-seed-for-squids.patch} (91%)
 rename Spigot-Server-Patches/{0286-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0285-Re-add-vanilla-entity-warnings-for-duplicates.patch} (92%)
 rename Spigot-Server-Patches/{0287-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch => 0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch} (92%)
 rename Spigot-Server-Patches/{0288-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0287-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (89%)
 rename Spigot-Server-Patches/{0289-Use-asynchronous-Log4j-2-loggers.patch => 0288-Use-asynchronous-Log4j-2-loggers.patch} (90%)
 rename Spigot-Server-Patches/{0290-add-more-information-to-Entity.toString.patch => 0289-add-more-information-to-Entity.toString.patch} (92%)
 rename Spigot-Server-Patches/{0291-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0290-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0292-EnderDragon-Events.patch => 0291-EnderDragon-Events.patch} (98%)
 rename Spigot-Server-Patches/{0293-PlayerElytraBoostEvent.patch => 0292-PlayerElytraBoostEvent.patch} (96%)
 rename Spigot-Server-Patches/{0294-PlayerLaunchProjectileEvent.patch => 0293-PlayerLaunchProjectileEvent.patch} (99%)
 rename Spigot-Server-Patches/{0295-Duplicate-UUID-Resolve-Option.patch => 0294-Duplicate-UUID-Resolve-Option.patch} (97%)
 rename Spigot-Server-Patches/{0296-Speedup-BlockPos-by-fixing-inlining.patch => 0295-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0297-Don-t-save-Proto-Chunks.patch => 0296-Don-t-save-Proto-Chunks.patch} (96%)
 rename Spigot-Server-Patches/{0298-Optimize-RegistryID.c.patch => 0297-Optimize-RegistryID.c.patch} (96%)
 rename Spigot-Server-Patches/{0299-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (94%)
 rename Spigot-Server-Patches/{0300-Vanished-players-don-t-have-rights.patch => 0299-Vanished-players-don-t-have-rights.patch} (96%)
 rename Spigot-Server-Patches/{0301-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0300-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (93%)
 rename Spigot-Server-Patches/{0302-Add-some-Debug-to-Chunk-Entity-slices.patch => 0301-Add-some-Debug-to-Chunk-Entity-slices.patch} (95%)
 rename Spigot-Server-Patches/{0303-Optimize-Region-File-Cache.patch => 0302-Optimize-Region-File-Cache.patch} (97%)
 rename Spigot-Server-Patches/{0304-EntityTransformedEvent.patch => 0303-EntityTransformedEvent.patch} (95%)
 rename Spigot-Server-Patches/{0305-SkeletonHorse-Additions.patch => 0304-SkeletonHorse-Additions.patch} (97%)
 rename Spigot-Server-Patches/{0306-Prevent-Saving-Bad-entities-to-chunks.patch => 0305-Prevent-Saving-Bad-entities-to-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0307-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0306-Don-t-call-getItemMeta-on-hasItemMeta.patch} (98%)
 rename Spigot-Server-Patches/{0308-Always-process-chunk-removal-in-removeEntity.patch => 0307-Always-process-chunk-removal-in-removeEntity.patch} (93%)
 rename Spigot-Server-Patches/{0309-Ignore-Dead-Entities-in-entityList-iteration.patch => 0308-Ignore-Dead-Entities-in-entityList-iteration.patch} (97%)
 rename Spigot-Server-Patches/{0310-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0309-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (99%)
 rename Spigot-Server-Patches/{0311-MC-111480-Start-Entity-ID-s-at-1.patch => 0310-MC-111480-Start-Entity-ID-s-at-1.patch} (91%)
 rename Spigot-Server-Patches/{0312-Implement-Expanded-ArmorStand-API.patch => 0311-Implement-Expanded-ArmorStand-API.patch} (98%)
 rename Spigot-Server-Patches/{0313-AnvilDamageEvent.patch => 0312-AnvilDamageEvent.patch} (96%)
 rename Spigot-Server-Patches/{0314-World-EntityHuman-Lookup-Optimizations.patch => 0313-World-EntityHuman-Lookup-Optimizations.patch} (97%)
 rename Spigot-Server-Patches/{0315-Add-TNTPrimeEvent.patch => 0314-Add-TNTPrimeEvent.patch} (99%)
 rename Spigot-Server-Patches/{0316-Break-up-and-make-tab-spam-limits-configurable.patch => 0315-Break-up-and-make-tab-spam-limits-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0317-Make-portal-teleportation-adjustment-math-more-accur.patch => 0316-Make-portal-teleportation-adjustment-math-more-accur.patch} (98%)
 rename Spigot-Server-Patches/{0318-Add-hand-to-bucket-events.patch => 0317-Add-hand-to-bucket-events.patch} (98%)
 rename Spigot-Server-Patches/{0319-MC-135506-Experience-should-save-as-Integers.patch => 0318-MC-135506-Experience-should-save-as-Integers.patch} (94%)
 rename Spigot-Server-Patches/{0320-Entity-add-to-world-fixes.patch => 0319-Entity-add-to-world-fixes.patch} (96%)
 rename Spigot-Server-Patches/{0321-Fix-client-rendering-skulls-from-same-user.patch => 0320-Fix-client-rendering-skulls-from-same-user.patch} (98%)
 rename Spigot-Server-Patches/{0322-Add-Early-Warning-Feature-to-WatchDog.patch => 0321-Add-Early-Warning-Feature-to-WatchDog.patch} (98%)
 rename Spigot-Server-Patches/{0323-Make-EnderDragon-implement-Mob.patch => 0322-Make-EnderDragon-implement-Mob.patch} (95%)
 rename Spigot-Server-Patches/{0324-Detect-and-repair-corrupt-Region-Files.patch => 0323-Detect-and-repair-corrupt-Region-Files.patch} (98%)
 rename Spigot-Server-Patches/{0325-Use-ConcurrentHashMap-in-JsonList.patch => 0324-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename Spigot-Server-Patches/{0326-Use-a-Queue-for-Queueing-Commands.patch => 0325-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0327-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0326-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (94%)
 rename Spigot-Server-Patches/{0328-Allow-disabling-armour-stand-ticking.patch => 0327-Allow-disabling-armour-stand-ticking.patch} (99%)
 rename Spigot-Server-Patches/{0329-Optimize-BlockPosition-helper-methods.patch => 0328-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename Spigot-Server-Patches/{0330-Send-nearby-packets-from-world-player-list-not-serve.patch => 0329-Send-nearby-packets-from-world-player-list-not-serve.patch} (97%)
 rename Spigot-Server-Patches/{0331-Cache-World-Entity-Type-counts.patch => 0330-Cache-World-Entity-Type-counts.patch} (98%)
 rename Spigot-Server-Patches/{0332-Restore-vanlla-default-mob-spawn-range.patch => 0331-Restore-vanlla-default-mob-spawn-range.patch} (91%)
 rename Spigot-Server-Patches/{0333-Optimize-Hoppers.patch => 0332-Optimize-Hoppers.patch} (98%)
 rename Spigot-Server-Patches/{0334-Optimize-CraftBlockData-Creation.patch => 0333-Optimize-CraftBlockData-Creation.patch} (96%)
 rename Spigot-Server-Patches/{0335-Fix-MC-124320.patch => 0334-Fix-MC-124320.patch} (96%)
 rename Spigot-Server-Patches/{0336-Slime-Pathfinder-Events.patch => 0335-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0337-Anti-Xray.patch => 0336-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0338-Configurable-speed-for-water-flowing-over-lava.patch => 0337-Configurable-speed-for-water-flowing-over-lava.patch} (97%)
 rename Spigot-Server-Patches/{0339-Optimize-RegistryMaterials.patch => 0338-Optimize-RegistryMaterials.patch} (95%)
 rename Spigot-Server-Patches/{0340-Add-PhantomPreSpawnEvent.patch => 0339-Add-PhantomPreSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0341-Add-More-Creeper-API.patch => 0340-Add-More-Creeper-API.patch} (97%)
 rename Spigot-Server-Patches/{0342-Inventory-removeItemAnySlot.patch => 0341-Inventory-removeItemAnySlot.patch} (97%)
 rename Spigot-Server-Patches/{0343-Optimize-getChunkIfLoaded-type-calls.patch => 0342-Optimize-getChunkIfLoaded-type-calls.patch} (97%)
 rename Spigot-Server-Patches/{0344-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0343-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (93%)
 rename Spigot-Server-Patches/{0345-Add-ray-tracing-methods-to-LivingEntity.patch => 0344-Add-ray-tracing-methods-to-LivingEntity.patch} (97%)
 rename Spigot-Server-Patches/{0346-Expose-attack-cooldown-methods-for-Player.patch => 0345-Expose-attack-cooldown-methods-for-Player.patch} (96%)
 rename Spigot-Server-Patches/{0347-Improve-death-events.patch => 0346-Improve-death-events.patch} (99%)
 rename Spigot-Server-Patches/{0348-Allow-chests-to-be-placed-with-NBT-data.patch => 0347-Allow-chests-to-be-placed-with-NBT-data.patch} (96%)
 rename Spigot-Server-Patches/{0349-Mob-Pathfinding-API.patch => 0348-Mob-Pathfinding-API.patch} (99%)
 rename Spigot-Server-Patches/{0350-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0349-Prevent-chunk-loading-from-Fluid-Flowing.patch} (97%)
 rename Spigot-Server-Patches/{0351-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0350-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0352-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0351-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0353-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0352-Prevent-mob-spawning-from-loading-generating-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0354-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0353-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (97%)
 rename Spigot-Server-Patches/{0355-Optimize-and-Fix-ExpiringMap-Issues.patch => 0354-Optimize-and-Fix-ExpiringMap-Issues.patch} (99%)
 rename Spigot-Server-Patches/{0356-Implement-furnace-cook-speed-multiplier-API.patch => 0355-Implement-furnace-cook-speed-multiplier-API.patch} (98%)
 rename Spigot-Server-Patches/{0357-Support-Overriding-World-Seeds.patch => 0356-Support-Overriding-World-Seeds.patch} (98%)
 rename Spigot-Server-Patches/{0358-Optimize-Server-World-Map.patch => 0357-Optimize-Server-World-Map.patch} (99%)
 rename Spigot-Server-Patches/{0359-PreSpawnerSpawnEvent.patch => 0358-PreSpawnerSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0360-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0359-Catch-JsonParseException-in-Entity-and-TE-names.patch} (98%)
 rename Spigot-Server-Patches/{0361-Avoid-dimension-id-collisions.patch => 0360-Avoid-dimension-id-collisions.patch} (94%)
 rename Spigot-Server-Patches/{0362-Honor-EntityAgeable.ageLock.patch => 0361-Honor-EntityAgeable.ageLock.patch} (91%)
 rename Spigot-Server-Patches/{0363-Async-Chunk-Loading-and-Generation.patch => 0362-Async-Chunk-Loading-and-Generation.patch} (99%)
 rename Spigot-Server-Patches/{0364-Ignore-Dimension-NBT-field-in-Entity-data.patch => 0363-Ignore-Dimension-NBT-field-in-Entity-data.patch} (93%)
 rename Spigot-Server-Patches/{0365-Optimize-Light-Recalculations.patch => 0364-Optimize-Light-Recalculations.patch} (97%)
 rename Spigot-Server-Patches/{0366-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0365-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0367-Don-t-recheck-type-after-setting-a-block.patch => 0366-Don-t-recheck-type-after-setting-a-block.patch} (95%)
 rename Spigot-Server-Patches/{0368-Fix-Sending-Chunks-to-Client.patch => 0367-Fix-Sending-Chunks-to-Client.patch} (97%)
 rename Spigot-Server-Patches/{0369-Configurable-connection-throttle-kick-message.patch => 0368-Configurable-connection-throttle-kick-message.patch} (97%)
 rename Spigot-Server-Patches/{0370-Fix-FileIOThread-concurrency-issues.patch => 0369-Fix-FileIOThread-concurrency-issues.patch} (96%)
 rename Spigot-Server-Patches/{0371-Hook-into-CB-plugin-rewrites.patch => 0370-Hook-into-CB-plugin-rewrites.patch} (99%)
 rename Spigot-Server-Patches/{0372-Allow-setting-the-vex-s-summoner.patch => 0371-Allow-setting-the-vex-s-summoner.patch} (95%)
 rename Spigot-Server-Patches/{0373-Add-LivingEntity-getTargetEntity.patch => 0372-Add-LivingEntity-getTargetEntity.patch} (98%)
 rename Spigot-Server-Patches/{0374-Add-sun-related-API.patch => 0373-Add-sun-related-API.patch} (96%)
 rename Spigot-Server-Patches/{0375-Check-Drowned-for-Villager-Aggression-Config.patch => 0374-Check-Drowned-for-Villager-Aggression-Config.patch} (95%)
 rename Spigot-Server-Patches/{0376-Here-s-Johnny.patch => 0375-Here-s-Johnny.patch} (96%)
 rename Spigot-Server-Patches/{0377-Turtle-API.patch => 0376-Turtle-API.patch} (99%)
 rename Spigot-Server-Patches/{0378-Limit-lightning-strike-effect-distance.patch => 0377-Limit-lightning-strike-effect-distance.patch} (98%)
 rename Spigot-Server-Patches/{0379-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0378-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (97%)
 rename Spigot-Server-Patches/{0380-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0379-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (96%)
 rename Spigot-Server-Patches/{0381-Call-player-spectator-target-events.patch => 0380-Call-player-spectator-target-events.patch} (98%)
 rename Spigot-Server-Patches/{0382-Add-Velocity-IP-Forwarding-Support.patch => 0381-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename Spigot-Server-Patches/{0383-Add-more-Witch-API.patch => 0382-Add-more-Witch-API.patch} (99%)
 rename Spigot-Server-Patches/{0384-Fix-MC-93764.patch => 0383-Fix-MC-93764.patch} (91%)
 rename Spigot-Server-Patches/{0385-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0384-Add-option-to-prevent-players-from-moving-into-unloa.patch} (97%)
 rename Spigot-Server-Patches/{0386-Reset-players-airTicks-on-respawn.patch => 0385-Reset-players-airTicks-on-respawn.patch} (92%)
 rename Spigot-Server-Patches/{0387-Strip-private-area-unicode-characters-from-signs.patch => 0386-Strip-private-area-unicode-characters-from-signs.patch} (98%)
 rename Spigot-Server-Patches/{0388-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0387-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (96%)
 rename Spigot-Server-Patches/{0389-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0388-Use-more-reasonable-thread-count-default-for-bootstr.patch} (94%)
 rename Spigot-Server-Patches/{0390-Use-EntityTypes-for-living-entities.patch => 0389-Use-EntityTypes-for-living-entities.patch} (99%)
 rename Spigot-Server-Patches/{0391-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0390-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (96%)
 rename Spigot-Server-Patches/{0392-Optimize-World-Time-Updates.patch => 0391-Optimize-World-Time-Updates.patch} (97%)
 rename Spigot-Server-Patches/{0393-Restore-custom-InventoryHolder-support.patch => 0392-Restore-custom-InventoryHolder-support.patch} (96%)
 rename Spigot-Server-Patches/{0394-Use-Vanilla-Minecart-Speeds.patch => 0393-Use-Vanilla-Minecart-Speeds.patch} (94%)
 rename Spigot-Server-Patches/{0395-Fix-SpongeAbsortEvent-handling.patch => 0394-Fix-SpongeAbsortEvent-handling.patch} (96%)
 rename Spigot-Server-Patches/{0396-Don-t-allow-digging-into-unloaded-chunks.patch => 0395-Don-t-allow-digging-into-unloaded-chunks.patch} (87%)
 rename Spigot-Server-Patches/{0397-Optimize-redstone-algorithm.patch => 0396-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0398-force-entity-dismount-during-teleportation.patch => 0397-force-entity-dismount-during-teleportation.patch} (97%)
 rename Spigot-Server-Patches/{0399-Book-Size-Limits.patch => 0398-Book-Size-Limits.patch} (97%)
 rename Spigot-Server-Patches/{0400-Make-the-default-permission-message-configurable.patch => 0399-Make-the-default-permission-message-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0401-Add-more-Zombie-API.patch => 0400-Add-more-Zombie-API.patch} (98%)
 rename Spigot-Server-Patches/{0402-limit-the-range-at-which-we-ll-consider-an-attackabl.patch => 0401-limit-the-range-at-which-we-ll-consider-an-attackabl.patch} (94%)
 rename Spigot-Server-Patches/{0403-Prevent-rayTrace-from-loading-chunks.patch => 0402-Prevent-rayTrace-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0404-Handle-Large-Packets-disconnecting-client.patch => 0403-Handle-Large-Packets-disconnecting-client.patch} (98%)
 rename Spigot-Server-Patches/{0405-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0404-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (97%)
 rename Spigot-Server-Patches/{0406-Add-PlayerConnectionCloseEvent.patch => 0405-Add-PlayerConnectionCloseEvent.patch} (98%)
 rename Spigot-Server-Patches/{0407-Prevent-Enderman-from-loading-chunks.patch => 0406-Prevent-Enderman-from-loading-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0408-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (99%)
 rename Spigot-Server-Patches/{0409-Fix-PlayerEditBookEvent.patch => 0408-Fix-PlayerEditBookEvent.patch} (95%)
 rename Spigot-Server-Patches/{0410-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0409-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (93%)
 rename Spigot-Server-Patches/{0411-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0410-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (97%)
 rename Spigot-Server-Patches/{0412-Block-Entity-remove-from-being-called-on-Players.patch => 0411-Block-Entity-remove-from-being-called-on-Players.patch} (95%)
 rename Spigot-Server-Patches/{0413-Allow-Saving-of-Oversized-Chunks.patch => 0412-Allow-Saving-of-Oversized-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0414-BlockDestroyEvent.patch => 0413-BlockDestroyEvent.patch} (95%)
 rename Spigot-Server-Patches/{0415-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0414-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (98%)
 rename Spigot-Server-Patches/{0416-Fix-sign-edit-memory-leak.patch => 0415-Fix-sign-edit-memory-leak.patch} (93%)
 rename Spigot-Server-Patches/{0417-Limit-Client-Sign-length-more.patch => 0416-Limit-Client-Sign-length-more.patch} (94%)
 rename Spigot-Server-Patches/{0418-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0417-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (95%)
 rename Spigot-Server-Patches/{0419-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0418-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (98%)
 rename Spigot-Server-Patches/{0420-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0419-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (97%)
 rename Spigot-Server-Patches/{0421-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0420-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (93%)
 rename Spigot-Server-Patches/{0422-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0421-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (91%)

diff --git a/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
new file mode 100644
index 0000000000..25188c6715
--- /dev/null
+++ b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
@@ -0,0 +1,276 @@
+From 3d1f2e17aa510ecd93069a5adc6ad19795c73797 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Mon, 18 Jun 2018 00:41:46 -0500
+Subject: [PATCH] Add "getNearbyXXX" methods to Location
+
+
+diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
+index 3387fb477..768af6b15 100644
+--- a/src/main/java/org/bukkit/Location.java
++++ b/src/main/java/org/bukkit/Location.java
+@@ -10,6 +10,15 @@ import org.bukkit.util.Vector;
+ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
+ 
++// Paper start
++import java.util.Collection;
++import java.util.Collections;
++import java.util.function.Predicate;
++import org.bukkit.entity.Entity;
++import org.bukkit.entity.LivingEntity;
++import org.bukkit.entity.Player;
++// Paper end
++
+ /**
+  * Represents a 3-dimensional position in a world.
+  * <br>
+@@ -531,6 +540,246 @@ public class Location implements Cloneable, ConfigurationSerializable {
+         centerLoc.setZ(getBlockZ() + 0.5);
+         return centerLoc;
+     }
++
++    /**
++     * Returns a list of entities within a bounding box centered around a Location.
++     *
++     * Some implementations may impose artificial restrictions on the size of the search bounding box.
++     *
++     * @param x 1/2 the size of the box along x axis
++     * @param y 1/2 the size of the box along y axis
++     * @param z 1/2 the size of the box along z axis
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Entity> getNearbyEntities(double x, double y, double z) {
++        if (world == null) {
++            throw new IllegalArgumentException("Location has no world");
++        }
++        return world.getNearbyEntities(this, x, y, z);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param radius X Radius
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double radius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, radius, radius, radius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xzRadius X/Z Radius
++     * @param yRadius Y Radius
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double xzRadius, double yRadius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xzRadius, yRadius, xzRadius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z radius
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double xRadius, double yRadius, double zRadius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xRadius, yRadius, zRadius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param radius Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double radius, @Nullable Predicate<LivingEntity> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, radius, radius, radius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xzRadius X/Z Radius
++     * @param yRadius Y Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double xzRadius, double yRadius, @Nullable Predicate<LivingEntity> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xzRadius, yRadius, xzRadius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double xRadius, double yRadius, double zRadius, @Nullable Predicate<LivingEntity> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xRadius, yRadius, zRadius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param radius X/Y/Z Radius
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double radius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, radius, radius, radius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xzRadius X/Z Radius
++     * @param yRadius Y Radius
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double xzRadius, double yRadius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xzRadius, yRadius, xzRadius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z Radius
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double xRadius, double yRadius, double zRadius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xRadius, yRadius, zRadius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param radius X/Y/Z Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double radius, @Nullable Predicate<Player> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, radius, radius, radius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xzRadius X/Z Radius
++     * @param yRadius Y Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double xzRadius, double yRadius, @Nullable Predicate<Player> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xzRadius, yRadius, xzRadius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double xRadius, double yRadius, double zRadius, @Nullable Predicate<Player> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xRadius, yRadius, zRadius, predicate);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
++     * @param clazz Type to filter by
++     * @param radius X/Y/Z radius to search within
++     * @param <T> the entity type
++     * @return the collection of entities of type clazz near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double radius) {
++        return getNearbyEntitiesByType(clazz, radius, radius, radius, null);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius, with x and x radius matching (bounding box)
++     * @param clazz Type to filter by
++     * @param xzRadius X/Z radius to search within
++     * @param yRadius Y radius to search within
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xzRadius, double yRadius) {
++        return getNearbyEntitiesByType(clazz, xzRadius, yRadius, xzRadius, null);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
++     * @param clazz Type to filter by
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z Radius
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xRadius, double yRadius, double zRadius) {
++        return getNearbyEntitiesByType(clazz, xRadius, yRadius, zRadius, null);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
++     * @param clazz Type to filter by
++     * @param radius X/Y/Z radius to search within
++     * @param predicate a predicate used to filter results
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double radius, @Nullable Predicate<T> predicate) {
++        return getNearbyEntitiesByType(clazz, radius, radius, radius, predicate);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius, with x and x radius matching (bounding box)
++     * @param clazz Type to filter by
++     * @param xzRadius X/Z radius to search within
++     * @param yRadius Y radius to search within
++     * @param predicate a predicate used to filter results
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xzRadius, double yRadius, @Nullable Predicate<T> predicate) {
++        return getNearbyEntitiesByType(clazz, xzRadius, yRadius, xzRadius, predicate);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
++     * @param clazz Type to filter by
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z Radius
++     * @param predicate a predicate used to filter results
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends Entity> clazz, double xRadius, double yRadius, double zRadius, @Nullable Predicate<T> predicate) {
++        if (world == null) {
++            throw new IllegalArgumentException("Location has no world");
++        }
++        return world.getNearbyEntitiesByType(clazz, this, xRadius, yRadius, zRadius, predicate);
++    }
+     // Paper end
+     @Override
+     public boolean equals(Object obj) {
+-- 
+2.21.0
+
diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
rename to Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch
index 660209ad8b..16beeac2a7 100644
--- a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
+++ b/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 7d9404735f62f21ff8abdfd04ff311e83f8f4450 Mon Sep 17 00:00:00 2001
+From 3cda6a60572fc259cad45a8139459d64f5e612de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:09:27 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
rename to Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch
index 0f95130b3c..d3b67f5404 100644
--- a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From acf227fce14d905b08ae26e7dc84a1b5b1d058ce Mon Sep 17 00:00:00 2001
+From e511b78eb2bf54d781d89bcfb556bf3c152242ac Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:40:39 +0200
 Subject: [PATCH] Add EntityKnockbackByEntityEvent
diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0113-Expand-Explosions-API.patch
similarity index 97%
rename from Spigot-API-Patches/0112-Expand-Explosions-API.patch
rename to Spigot-API-Patches/0113-Expand-Explosions-API.patch
index 1cb604344d..d4593a6e8f 100644
--- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/0113-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 131511b623888266c1f263c0a85cd91ab890dff9 Mon Sep 17 00:00:00 2001
+From 9724f0d2d9d912f2d6c523950ddb5257b4e793df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 3387fb477..56be7e5fa 100644
+index 768af6b15..e57e22a21 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -5,6 +5,7 @@ import java.util.Map;
@@ -17,11 +17,10 @@ index 3387fb477..56be7e5fa 100644
  import org.bukkit.util.NumberConversions;
  import org.bukkit.util.Vector;
  import org.jetbrains.annotations.NotNull;
-@@ -531,6 +532,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
-         centerLoc.setZ(getBlockZ() + 0.5);
+@@ -541,6 +542,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
          return centerLoc;
      }
-+
+ 
 +    /**
 +     * Creates explosion at this location with given power
 +     *
@@ -102,9 +101,10 @@ index 3387fb477..56be7e5fa 100644
 +    public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
 +        return world.createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
 +    }
-     // Paper end
-     @Override
-     public boolean equals(Object obj) {
++
+     /**
+      * Returns a list of entities within a bounding box centered around a Location.
+      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
 index bec405feb..dcc47cde5 100644
 --- a/src/main/java/org/bukkit/World.java
diff --git a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
similarity index 98%
rename from Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
rename to Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
index 0c671c0f4f..a61eba50cd 100644
--- a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -1,4 +1,4 @@
-From 639b480d0adabe542928fc67eb429075a4165e3d Mon Sep 17 00:00:00 2001
+From 4d3cc2c3c2ad606f01cea7d7be635e7ef1dd9e4a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 22 Jun 2018 22:59:18 -0400
 Subject: [PATCH] ItemStack API additions for quantity/flags/lore
diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 96%
rename from Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
index 8ad2f7303a..00debe461f 100644
--- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 73b751f99086d330a0ae7ee23ef86bc7285ce418 Mon Sep 17 00:00:00 2001
+From f2d5cff8c7433166cab3ee3e4558b43f7ac9ded1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0116-RangedEntity-API.patch
similarity index 98%
rename from Spigot-API-Patches/0115-RangedEntity-API.patch
rename to Spigot-API-Patches/0116-RangedEntity-API.patch
index bff91dbdd2..7a62114d68 100644
--- a/Spigot-API-Patches/0115-RangedEntity-API.patch
+++ b/Spigot-API-Patches/0116-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 1714ba00b49694e8134e075d1efcc2258213de83 Mon Sep 17 00:00:00 2001
+From 4edc97bf2dd769c484114310a58e1588666e9a12 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 21:34:40 -0400
 Subject: [PATCH] RangedEntity API
diff --git a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
similarity index 93%
rename from Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
rename to Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
index 388355a6ff..46c046f89e 100644
--- a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
@@ -1,4 +1,4 @@
-From 19a954d1f19d9c3d5211d42c13b11991e61f5359 Mon Sep 17 00:00:00 2001
+From 99845fa0f02668b5e2832bf55b82ad4ac15a7fe0 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
similarity index 97%
rename from Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
rename to Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
index b51eeff739..1d8a4ba3be 100644
--- a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 67edac3ee5ed7a4ccc201a7fa1ce0380146edc36 Mon Sep 17 00:00:00 2001
+From 6e0d5f987f21ccf9cb93bb8fafaece4a7e066736 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:52:52 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0119-Entity-getChunk-API.patch
similarity index 94%
rename from Spigot-API-Patches/0118-Entity-getChunk-API.patch
rename to Spigot-API-Patches/0119-Entity-getChunk-API.patch
index 2ba5aeef82..684593e5b1 100644
--- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/0119-Entity-getChunk-API.patch
@@ -1,4 +1,4 @@
-From d25016411d092dd36d7e807178a41c8234563559 Mon Sep 17 00:00:00 2001
+From dc0c46f1dc30775f7790fca15bfcf4ec99f40fc2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
diff --git a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch
similarity index 97%
rename from Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
rename to Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch
index 9adc7aea1f..57049c6017 100644
--- a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -1,4 +1,4 @@
-From 839637a0c0acddcbe5b6089b22ca43c304297616 Mon Sep 17 00:00:00 2001
+From 607c463ca170254672f70fd10b81157db6b8b114 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 19 Jul 2018 15:07:02 -0500
 Subject: [PATCH] Add an asterisk to legacy API plugins
diff --git a/Spigot-API-Patches/0120-EnderDragon-Events.patch b/Spigot-API-Patches/0121-EnderDragon-Events.patch
similarity index 99%
rename from Spigot-API-Patches/0120-EnderDragon-Events.patch
rename to Spigot-API-Patches/0121-EnderDragon-Events.patch
index 701a6d6496..07b4525e80 100644
--- a/Spigot-API-Patches/0120-EnderDragon-Events.patch
+++ b/Spigot-API-Patches/0121-EnderDragon-Events.patch
@@ -1,4 +1,4 @@
-From 3277130260cb38dff43dc2bd7729a7853200b224 Mon Sep 17 00:00:00 2001
+From ca66c23763bf5a5e99d61b42651f0070e61b931d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:05 -0500
 Subject: [PATCH] EnderDragon Events
diff --git a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
rename to Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch
index 35855aada1..d7908ed395 100644
--- a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From 41a26a4f7bcee9d007e63faf6b8eddcea3ddb64d Mon Sep 17 00:00:00 2001
+From 6739996e04cca7984ebc73aedb8b09594575bee3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:10:50 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
diff --git a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
rename to Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch
index 9c7c76c0c0..54cc279da8 100644
--- a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
+++ b/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch
@@ -1,4 +1,4 @@
-From 512606bd2ea928ab0c900d85440f8107a17fa26f Mon Sep 17 00:00:00 2001
+From e499534f205a08bf1a17dcde59e8b0339d4c1b27 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:53 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
diff --git a/Spigot-API-Patches/0123-EntityTransformedEvent.patch b/Spigot-API-Patches/0124-EntityTransformedEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0123-EntityTransformedEvent.patch
rename to Spigot-API-Patches/0124-EntityTransformedEvent.patch
index d1e126daee..bf9515f12e 100644
--- a/Spigot-API-Patches/0123-EntityTransformedEvent.patch
+++ b/Spigot-API-Patches/0124-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From 5b2eff30f6fc1cf8f9794b1599d1d92eb76928d6 Mon Sep 17 00:00:00 2001
+From 7d3567b6c8679fa401dd7a9a51f1d538b956e539 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:28:53 -0400
 Subject: [PATCH] EntityTransformedEvent
diff --git a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch
similarity index 94%
rename from Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch
index e6b6ed0fb8..594965c10c 100644
--- a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From 0a6c99111a7f7d1073d78c96d66f43c7505ccc83 Mon Sep 17 00:00:00 2001
+From 33a1ab867848b574a4304c81f15f9d352c2b60cc Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:03 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch
similarity index 97%
rename from Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
rename to Spigot-API-Patches/0126-SkeletonHorse-Additions.patch
index 9cc45ed3df..8b34f69068 100644
--- a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
+++ b/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch
@@ -1,4 +1,4 @@
-From d430d9a48360b597f8c3ce6acd840c1f3cc04222 Mon Sep 17 00:00:00 2001
+From ea94db0d6ee4a6a60472c9445d53004b075f60ad Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:17 -0500
 Subject: [PATCH] SkeletonHorse Additions
diff --git a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch
similarity index 93%
rename from Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
rename to Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch
index 8cecc91dba..acde25a6be 100644
--- a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
+++ b/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch
@@ -1,4 +1,4 @@
-From d21ab857b2c8d97c44dd5cacab462cbb0f1ac3a8 Mon Sep 17 00:00:00 2001
+From 82398c9e4afd78705fc7d325811865fc13522765 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 25 Jul 2018 01:36:07 -0400
 Subject: [PATCH] Expand Location Manipulation API
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Location Manipulation API
 Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 56be7e5fa..d38f15142 100644
+index e57e22a21..84b7d93cf 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -510,6 +510,54 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -519,6 +519,54 @@ public class Location implements Cloneable, ConfigurationSerializable {
      public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
  
      // Paper start
diff --git a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch
similarity index 98%
rename from Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
rename to Spigot-API-Patches/0128-Expand-ArmorStand-API.patch
index 49561539a7..13851c51fc 100644
--- a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
+++ b/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 468efde93189317e2ae14ff0990e974b6b733f92 Mon Sep 17 00:00:00 2001
+From 84ef806009cf85bcfd9231c9f87535f98dee2d74 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:22:44 -0400
 Subject: [PATCH] Expand ArmorStand API
diff --git a/Spigot-API-Patches/0128-AnvilDamageEvent.patch b/Spigot-API-Patches/0129-AnvilDamageEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0128-AnvilDamageEvent.patch
rename to Spigot-API-Patches/0129-AnvilDamageEvent.patch
index 94596282a4..b62f840783 100644
--- a/Spigot-API-Patches/0128-AnvilDamageEvent.patch
+++ b/Spigot-API-Patches/0129-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From 8636d3804c388b59ab54bf2274e1db7c6ae2b578 Mon Sep 17 00:00:00 2001
+From ab42858dbd563351bcf17054a6bb46b72892a821 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:36:55 -0500
 Subject: [PATCH] AnvilDamageEvent
diff --git a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
similarity index 98%
rename from Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
rename to Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
index ee460e676b..c0b07bee89 100644
--- a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
@@ -1,4 +1,4 @@
-From 195b69c9c15d04fa20cddb7bff3f4e1e0e883389 Mon Sep 17 00:00:00 2001
+From 0c86016a1fb9b9fe7f97b02ce776db7f308c5381 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 00:32:05 -0400
 Subject: [PATCH] Remove deadlock risk in firing async events
diff --git a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch
similarity index 98%
rename from Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
rename to Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch
index 05309688e1..e5514ec830 100644
--- a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
+++ b/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 9e361e0c92767cb7d2ad6bb92c87aa209063aaa6 Mon Sep 17 00:00:00 2001
+From b1f618ac17c88f9368f8946b906791dc9d62d62d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:20 -0500
 Subject: [PATCH] Add hand to bucket events
diff --git a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
rename to Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch
index 50d348b074..76f28a9516 100644
--- a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
+++ b/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From b92f5c6e30580f47d938aa5e66fa862eb7d84a76 Mon Sep 17 00:00:00 2001
+From 45165a47c5ca5524f6990174947c219226c1aa90 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 15 Jul 2018 22:17:55 +0300
 Subject: [PATCH] Add TNTPrimeEvent
diff --git a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
similarity index 97%
rename from Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
rename to Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 241008d5ff..74da9686a7 100644
--- a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -1,4 +1,4 @@
-From 4b32b217a7ca97b0e6510757c7ab3608edb82ecb Mon Sep 17 00:00:00 2001
+From 447eebd1b98c8302e223ba21f6a5390fc1ac4491 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 4 Aug 2018 19:37:35 -0400
 Subject: [PATCH] Provide Chunk Coordinates as a Long API
diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0134-Async-Chunks-API.patch
similarity index 99%
rename from Spigot-API-Patches/0133-Async-Chunks-API.patch
rename to Spigot-API-Patches/0134-Async-Chunks-API.patch
index c28e73a1c2..94f6c723b3 100644
--- a/Spigot-API-Patches/0133-Async-Chunks-API.patch
+++ b/Spigot-API-Patches/0134-Async-Chunks-API.patch
@@ -1,4 +1,4 @@
-From 81d02f48b1966b4ca49a858fa20de8a8b9f15c0e Mon Sep 17 00:00:00 2001
+From e0bd691e726a2082f30e462d6afb9e3004c1bc56 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
diff --git a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch
similarity index 92%
rename from Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
rename to Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch
index 1d3a58ce15..427764387b 100644
--- a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
+++ b/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch
@@ -1,4 +1,4 @@
-From 8950d1f9eb04a8dd6dacd77d32c47c26cba3fcbc Mon Sep 17 00:00:00 2001
+From 0b4c65cdc26ae34774ce159206165ec61a519cff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:08:34 -0400
 Subject: [PATCH] Make EnderDragon extend Mob
diff --git a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 94%
rename from Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index fbf216ae79..401f6976d2 100644
--- a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,4 +1,4 @@
-From 97a4ab01edbd67988b59a667d7faf3e15c12b532 Mon Sep 17 00:00:00 2001
+From 4f5dd88993320659d89a19cf35369636b0e3debe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:04:58 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
diff --git a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
similarity index 93%
rename from Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
rename to Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
index b1da3344e5..992a1b311f 100644
--- a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
@@ -1,4 +1,4 @@
-From 8561919e77b65a9c40210e7ecf497f5b30e031b3 Mon Sep 17 00:00:00 2001
+From 9b0f9c9ee09a34ffae2c2a19e184e5a4a81ecace Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:19:37 -0400
 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports
diff --git a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
similarity index 96%
rename from Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
rename to Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index cf03ca5964..aa4b9746d8 100644
--- a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -1,4 +1,4 @@
-From ac906f73eee22d9eb85008691f819c1e9e0d7bc3 Mon Sep 17 00:00:00 2001
+From d9d41debeb4d52f921e1751ed7f401aeba037dbd Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Aug 2018 21:42:10 -0700
 Subject: [PATCH] Allow Blocks to be accessed via a long key
@@ -18,10 +18,10 @@ Y range: [0, 1023]
 X, Z range: [-67 108 864, 67 108 863]
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index d38f15142..d3cff9de8 100644
+index 84b7d93cf..334e31350 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -569,6 +569,18 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -578,6 +578,18 @@ public class Location implements Cloneable, ConfigurationSerializable {
          blockLoc.setZ(getBlockZ());
          return blockLoc;
      }
diff --git a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch
similarity index 99%
rename from Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
rename to Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch
index 8618443ca2..348db54aac 100644
--- a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
+++ b/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From d8ce298f5b4e64dcf643b8c080c6e47d73c52113 Mon Sep 17 00:00:00 2001
+From d9ac230cc79f6ee8b01f988d6bbe07edf16b31db Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:27 -0500
 Subject: [PATCH] Slime Pathfinder Events
diff --git a/Spigot-API-Patches/0139-isChunkGenerated-API.patch b/Spigot-API-Patches/0140-isChunkGenerated-API.patch
similarity index 92%
rename from Spigot-API-Patches/0139-isChunkGenerated-API.patch
rename to Spigot-API-Patches/0140-isChunkGenerated-API.patch
index c08c2a3c2f..e28add102e 100644
--- a/Spigot-API-Patches/0139-isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/0140-isChunkGenerated-API.patch
@@ -1,11 +1,11 @@
-From c8396200e161a36ea877c2f6a355145a24f9b0b0 Mon Sep 17 00:00:00 2001
+From e69f6fd86a2a77175c639ee9438deccd46f0f2c5 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index d3cff9de8..0966f5e03 100644
+index 334e31350..57ce443a5 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -1,5 +1,6 @@
@@ -15,7 +15,7 @@ index d3cff9de8..0966f5e03 100644
  import java.util.HashMap;
  import java.util.Map;
  
-@@ -510,6 +511,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -519,6 +520,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
      public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
  
      // Paper start
diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0141-Add-More-Creeper-API.patch
similarity index 97%
rename from Spigot-API-Patches/0140-Add-More-Creeper-API.patch
rename to Spigot-API-Patches/0141-Add-More-Creeper-API.patch
index c51a476d6a..fb46210b99 100644
--- a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
+++ b/Spigot-API-Patches/0141-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From ff30ce1b5f7f61dfc6ad8e26fac0459dc0f7d8b7 Mon Sep 17 00:00:00 2001
+From f16fe791645fb69068ef0d3cf540a6106aa47e1e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:16 -0500
 Subject: [PATCH] Add More Creeper API
diff --git a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
rename to Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch
index ce8e2f7c2a..3b7ac71093 100644
--- a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 0061310b705004c430c5723f9a44bcf4b25ef811 Mon Sep 17 00:00:00 2001
+From c2f4f4916892115c29f047a6f294c0103d83cdaa Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:42 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
diff --git a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch
similarity index 94%
rename from Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
rename to Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch
index 9bad8c8a1b..173f856fd8 100644
--- a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch
@@ -1,4 +1,4 @@
-From f8d3b059dcc85e1cb314e19265591247f9f2eb2f Mon Sep 17 00:00:00 2001
+From c273ba5e5fbb6580371f21b58d31659fa105de33 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Thu, 23 Aug 2018 16:14:25 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent
diff --git a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch
similarity index 96%
rename from Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
rename to Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch
index 21d6568c32..145abfc676 100644
--- a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
+++ b/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch
@@ -1,4 +1,4 @@
-From fa6299812f51c7522de971796540aab08c18866a Mon Sep 17 00:00:00 2001
+From e50186ec5e456237ac93fed193aeb097f3960ab8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:06 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
diff --git a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 98%
rename from Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch
index 347468a402..6e45fe96a0 100644
--- a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From e7f98812bb8a4822ac885809ae7daaae761c1c01 Mon Sep 17 00:00:00 2001
+From 7f59337d09a8d3aa24f52603aa0b5d05cfb4dd6a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:13:53 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/Spigot-API-Patches/0145-Improve-death-events.patch b/Spigot-API-Patches/0146-Improve-death-events.patch
similarity index 99%
rename from Spigot-API-Patches/0145-Improve-death-events.patch
rename to Spigot-API-Patches/0146-Improve-death-events.patch
index fd69da2e63..a66e29f462 100644
--- a/Spigot-API-Patches/0145-Improve-death-events.patch
+++ b/Spigot-API-Patches/0146-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 135e46030a87ff3a31b86466e0c12ee0a44dc651 Mon Sep 17 00:00:00 2001
+From 0930e5799eef85630a49e526a2bf1942571a96ea Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:32:28 +0100
 Subject: [PATCH] Improve death events
diff --git a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0147-Mob-Pathfinding-API.patch
similarity index 99%
rename from Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
rename to Spigot-API-Patches/0147-Mob-Pathfinding-API.patch
index f73fcdeef7..7c980bef21 100644
--- a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
+++ b/Spigot-API-Patches/0147-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From c2924c0e572c8bc3f43828719a939aae0ebdc586 Mon Sep 17 00:00:00 2001
+From b1cb593f47c8e02a87189db2ac57ca0eb2886a1a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 12:39:06 -0400
 Subject: [PATCH] Mob Pathfinding API
diff --git a/Spigot-API-Patches/0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 99%
rename from Spigot-API-Patches/0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 3082c891ff..6d10a867cd 100644
--- a/Spigot-API-Patches/0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -1,4 +1,4 @@
-From bbec13144bdd56b0f6e6eec27c9c5dfc1a16b993 Mon Sep 17 00:00:00 2001
+From 177fd27d66c07d01d4826bfb5cc9dd992e21b887 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:35 +0300
 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
diff --git a/Spigot-API-Patches/0148-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 98%
rename from Spigot-API-Patches/0148-Performance-Concurrency-Improvements-to-Permissions.patch
rename to Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
index ef63091045..71bcf680f5 100644
--- a/Spigot-API-Patches/0148-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
@@ -1,4 +1,4 @@
-From 70bd0d4e37da61457d7cf5e738c86df89660c2c7 Mon Sep 17 00:00:00 2001
+From 875d7e1da48a97e3d239c85b153b5db4f8bc4296 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 20:51:50 -0400
 Subject: [PATCH] Performance & Concurrency Improvements to Permissions
diff --git a/Spigot-API-Patches/0149-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 96%
rename from Spigot-API-Patches/0149-Add-ItemStackRecipeChoice-Draft-API.patch
rename to Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
index a34cacfcb7..24f493d2fc 100644
--- a/Spigot-API-Patches/0149-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
@@ -1,4 +1,4 @@
-From 28da2c2e4131200abea38d1655801de42bff18ed Mon Sep 17 00:00:00 2001
+From b7cbdf7b28497f69afaf63fdae60c903231d2855 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 21:39:26 -0400
 Subject: [PATCH] Add ItemStackRecipeChoice Draft API
diff --git a/Spigot-API-Patches/0150-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 95%
rename from Spigot-API-Patches/0150-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
index 426dd78fe8..a7006f92de 100644
--- a/Spigot-API-Patches/0150-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 4894cb1a997439c5dedc66114a55483e169ecd6e Mon Sep 17 00:00:00 2001
+From 8b72b61b5b8b87c1c2bf8c1099edc27f893db680 Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:01 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
diff --git a/Spigot-API-Patches/0151-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
similarity index 96%
rename from Spigot-API-Patches/0151-PreSpawnerSpawnEvent.patch
rename to Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
index 7c5950c30c..8a82e91fb0 100644
--- a/Spigot-API-Patches/0151-PreSpawnerSpawnEvent.patch
+++ b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From c0ac9162f275d12dc0fcd47237528f9b124917a9 Mon Sep 17 00:00:00 2001
+From 9d711bd307bd1b1f02458a5af2f5513f396e630c Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:50:10 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
diff --git a/Spigot-API-Patches/0152-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
similarity index 94%
rename from Spigot-API-Patches/0152-Remove-Precondition-on-name-for-AttributeModifier.patch
rename to Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
index 5b33203664..6aa587e098 100644
--- a/Spigot-API-Patches/0152-Remove-Precondition-on-name-for-AttributeModifier.patch
+++ b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
@@ -1,4 +1,4 @@
-From 7c6a5a037b4afb0148ae12995168cf93a4ef452c Mon Sep 17 00:00:00 2001
+From e6fe9e0337266d2cfcae640d7ee44f840f4305bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 22 Sep 2018 18:41:01 -0400
 Subject: [PATCH] Remove Precondition on name for AttributeModifier
diff --git a/Spigot-API-Patches/0153-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch
similarity index 94%
rename from Spigot-API-Patches/0153-Material-API-additions.patch
rename to Spigot-API-Patches/0154-Material-API-additions.patch
index b8aa334a81..3f219fb314 100644
--- a/Spigot-API-Patches/0153-Material-API-additions.patch
+++ b/Spigot-API-Patches/0154-Material-API-additions.patch
@@ -1,4 +1,4 @@
-From 515426e99ead7041a586709f651b989c9a2c0c61 Mon Sep 17 00:00:00 2001
+From d4d37f326a358195017d5c6cb1b72631cfeb1dfe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Oct 2018 21:14:29 -0400
 Subject: [PATCH] Material API additions
diff --git a/Spigot-API-Patches/0154-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch
similarity index 99%
rename from Spigot-API-Patches/0154-Add-Material-Tags.patch
rename to Spigot-API-Patches/0155-Add-Material-Tags.patch
index 7f088abc1e..4c60265988 100644
--- a/Spigot-API-Patches/0154-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch
@@ -1,4 +1,4 @@
-From bbddcaa72ff76ccf45773d20438a0c9982205e9c Mon Sep 17 00:00:00 2001
+From 990878599bcd6903ac503c61a7ad30242dad92ec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 17 Jul 2018 01:27:15 -0400
 Subject: [PATCH] Add Material Tags
diff --git a/Spigot-API-Patches/0155-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
similarity index 93%
rename from Spigot-API-Patches/0155-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
index 156bb47e3b..4a12b028cc 100644
--- a/Spigot-API-Patches/0155-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
@@ -1,4 +1,4 @@
-From 09b1a9e70d255773b6a9f16d41b15f1a4256a596 Mon Sep 17 00:00:00 2001
+From 2ab267b8452cec910e100702428427af8bc1a020 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:09 -0500
 Subject: [PATCH] Allow setting the vex's summoner
diff --git a/Spigot-API-Patches/0156-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
similarity index 98%
rename from Spigot-API-Patches/0156-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
index 14840030e1..a1ac224bf9 100644
--- a/Spigot-API-Patches/0156-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From 6fa603fb50284943a6142bb69261ad2c830ec573 Mon Sep 17 00:00:00 2001
+From 651f32be8d3fc9ddc408dcccfe8d888692ccd2cf Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:32:53 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
diff --git a/Spigot-API-Patches/0157-Add-sun-related-API.patch b/Spigot-API-Patches/0158-Add-sun-related-API.patch
similarity index 95%
rename from Spigot-API-Patches/0157-Add-sun-related-API.patch
rename to Spigot-API-Patches/0158-Add-sun-related-API.patch
index 11580bafd9..72822eb75c 100644
--- a/Spigot-API-Patches/0157-Add-sun-related-API.patch
+++ b/Spigot-API-Patches/0158-Add-sun-related-API.patch
@@ -1,4 +1,4 @@
-From e335fe35e65c3d2a72b29e1b289261bbaebf205f Mon Sep 17 00:00:00 2001
+From c6e637e02b40c9f3f776f69f381303f107e69b28 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API
diff --git a/Spigot-API-Patches/0158-Here-s-Johnny.patch b/Spigot-API-Patches/0159-Here-s-Johnny.patch
similarity index 96%
rename from Spigot-API-Patches/0158-Here-s-Johnny.patch
rename to Spigot-API-Patches/0159-Here-s-Johnny.patch
index a96974e6c2..d28bd3d3a6 100644
--- a/Spigot-API-Patches/0158-Here-s-Johnny.patch
+++ b/Spigot-API-Patches/0159-Here-s-Johnny.patch
@@ -1,4 +1,4 @@
-From 3b65f3403373f14a5e09ef83dc71bdf9ed3b634b Mon Sep 17 00:00:00 2001
+From 28375eab2740571d7b9ab080ff28d55cf88c05b0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:16 -0500
 Subject: [PATCH] Here's Johnny!
diff --git a/Spigot-API-Patches/0159-Turtle-API.patch b/Spigot-API-Patches/0160-Turtle-API.patch
similarity index 99%
rename from Spigot-API-Patches/0159-Turtle-API.patch
rename to Spigot-API-Patches/0160-Turtle-API.patch
index e3c2d98c25..91285703ef 100644
--- a/Spigot-API-Patches/0159-Turtle-API.patch
+++ b/Spigot-API-Patches/0160-Turtle-API.patch
@@ -1,4 +1,4 @@
-From 6db595ca8a00176a0c80b9099899814b82387532 Mon Sep 17 00:00:00 2001
+From 93d7e253dd01d49f7dfdf75cc569fe077a335b6b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 28 Sep 2018 17:08:09 -0500
 Subject: [PATCH] Turtle API
diff --git a/Spigot-API-Patches/0160-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 96%
rename from Spigot-API-Patches/0160-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 0b0275aa39..7b1b362254 100644
--- a/Spigot-API-Patches/0160-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 780eced4ecaac2ce7ce8917c2ee853267a7cf5ab Mon Sep 17 00:00:00 2001
+From 3f5b8f92e4b73c627c658d72067ff46ae36f0015 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:13 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
diff --git a/Spigot-API-Patches/0161-Add-spectator-target-events.patch b/Spigot-API-Patches/0162-Add-spectator-target-events.patch
similarity index 98%
rename from Spigot-API-Patches/0161-Add-spectator-target-events.patch
rename to Spigot-API-Patches/0162-Add-spectator-target-events.patch
index aa00ffd4f6..94dd0ef29d 100644
--- a/Spigot-API-Patches/0161-Add-spectator-target-events.patch
+++ b/Spigot-API-Patches/0162-Add-spectator-target-events.patch
@@ -1,4 +1,4 @@
-From e8268de43dc2e72d6643eb0ba83d6e625e0f6c32 Mon Sep 17 00:00:00 2001
+From bf13bc9b676e4081be6052781074e45aabd3f4ef Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:30:56 -0500
 Subject: [PATCH] Add spectator target events
diff --git a/Spigot-API-Patches/0162-Add-more-Witch-API.patch b/Spigot-API-Patches/0163-Add-more-Witch-API.patch
similarity index 95%
rename from Spigot-API-Patches/0162-Add-more-Witch-API.patch
rename to Spigot-API-Patches/0163-Add-more-Witch-API.patch
index 02f086d575..a4c58fad99 100644
--- a/Spigot-API-Patches/0162-Add-more-Witch-API.patch
+++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch
@@ -1,4 +1,4 @@
-From 3365caed03fea3f98a35b79d1a6bf10b23f652dc Mon Sep 17 00:00:00 2001
+From 068856b69122e8ab43569374510bc6e600b0f93e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 03:47:26 -0500
 Subject: [PATCH] Add more Witch API
diff --git a/Spigot-API-Patches/0163-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
similarity index 95%
rename from Spigot-API-Patches/0163-Make-the-default-permission-message-configurable.patch
rename to Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
index a82786ba67..a6076cbfbc 100644
--- a/Spigot-API-Patches/0163-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
@@ -1,4 +1,4 @@
-From d719713cdce6b07c8370daba53b6d8d7f1558722 Mon Sep 17 00:00:00 2001
+From b7cacf36728e66ddc98dcf78bd25bca50f64c54c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:44:54 +0000
 Subject: [PATCH] Make the default permission message configurable
@@ -43,7 +43,7 @@ index 1df58f72a..66d22ba79 100644
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 01ea1ca67..de016865f 100644
+index c2c19ed42..f0222fc27 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -187,7 +187,7 @@ public abstract class Command {
diff --git a/Spigot-API-Patches/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 98%
rename from Spigot-API-Patches/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
index eecc8841ef..5217c6e06c 100644
--- a/Spigot-API-Patches/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -1,4 +1,4 @@
-From 4e2017501e66dc245fbf331a39e74e195f1ca38a Mon Sep 17 00:00:00 2001
+From e97571dcd023a7f76827b4bc9180cc4fe5af2a41 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 15:53:43 +0000
 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit
diff --git a/Spigot-API-Patches/0165-Add-more-Zombie-API.patch b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch
similarity index 96%
rename from Spigot-API-Patches/0165-Add-more-Zombie-API.patch
rename to Spigot-API-Patches/0166-Add-more-Zombie-API.patch
index eafb1bbe5b..c359b2db24 100644
--- a/Spigot-API-Patches/0165-Add-more-Zombie-API.patch
+++ b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch
@@ -1,4 +1,4 @@
-From cf45e86b812cf3bd808c94d8c44bfc5e7497c2ea Mon Sep 17 00:00:00 2001
+From fdbcb1a6bb278f25aaa97c8c6f313710727ec608 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:51 -0500
 Subject: [PATCH] Add more Zombie API
diff --git a/Spigot-API-Patches/0166-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 96%
rename from Spigot-API-Patches/0166-Change-the-reserved-channel-check-to-be-sensible.patch
rename to Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
index 5fdde57bc8..1b6d278b38 100644
--- a/Spigot-API-Patches/0166-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
@@ -1,4 +1,4 @@
-From af85993179d88c676d2fa478cd9c4756947700cd Mon Sep 17 00:00:00 2001
+From c1b1907746b894381dc0eace9190858895d9555f Mon Sep 17 00:00:00 2001
 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 Date: Tue, 23 Oct 2018 19:32:55 +0300
 Subject: [PATCH] Change the reserved channel check to be sensible
diff --git a/Spigot-API-Patches/0167-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0167-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
index 520c0f3803..de4e6118a1 100644
--- a/Spigot-API-Patches/0167-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From a6886e4d276b22e0ec55a6550ca6a853371df5e1 Mon Sep 17 00:00:00 2001
+From dafaf73dbb7c18f78952f41aea292a09461cea3c Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:06 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
diff --git a/Spigot-API-Patches/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 97%
rename from Spigot-API-Patches/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 7e4d37f0ef..ac96246d9f 100644
--- a/Spigot-API-Patches/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From d1d6e116f40122181478b2577a8de5f1e484a344 Mon Sep 17 00:00:00 2001
+From b4adc58e8917f706d5c28c3b4eaae7f125ccd697 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:31:12 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
diff --git a/Spigot-API-Patches/0169-BlockDestroyEvent.patch b/Spigot-API-Patches/0170-BlockDestroyEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0169-BlockDestroyEvent.patch
rename to Spigot-API-Patches/0170-BlockDestroyEvent.patch
index b020b1d9ff..4308d142a0 100644
--- a/Spigot-API-Patches/0169-BlockDestroyEvent.patch
+++ b/Spigot-API-Patches/0170-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From e0e3f70a6b3bd804ad5eee80d9cd98bd68c04e10 Mon Sep 17 00:00:00 2001
+From b8447c34438a04b863e11cfa7a0ddf0524eca24f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:19:33 -0500
 Subject: [PATCH] BlockDestroyEvent
diff --git a/Spigot-API-Patches/0170-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 97%
rename from Spigot-API-Patches/0170-Add-ItemStack-Recipe-API-helper-methods.patch
rename to Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
index 4e9a8655c7..25e43aa172 100644
--- a/Spigot-API-Patches/0170-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
@@ -1,4 +1,4 @@
-From 6f20f63b0dbe9562c28f5332c0e8920e476b1bea Mon Sep 17 00:00:00 2001
+From a8e16dac9cc63a3b497e841bab9ed83577784e9d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 28 Jan 2014 19:13:57 -0500
 Subject: [PATCH] Add ItemStack Recipe API helper methods
diff --git a/Spigot-API-Patches/0171-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0171-Add-WhitelistToggleEvent.patch
rename to Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
index 955c892b12..2fc4394dd8 100644
--- a/Spigot-API-Patches/0171-Add-WhitelistToggleEvent.patch
+++ b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
@@ -1,4 +1,4 @@
-From 99653d40030fd8ca61c0d491e1ff7cc256b39fea Mon Sep 17 00:00:00 2001
+From 5c5bc97af3a51e5f7352c07da4bf85e1a1127f0b Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:04:43 +0200
 Subject: [PATCH] Add WhitelistToggleEvent
diff --git a/Spigot-API-Patches/0172-Annotation-Test-changes.patch b/Spigot-API-Patches/0173-Annotation-Test-changes.patch
similarity index 94%
rename from Spigot-API-Patches/0172-Annotation-Test-changes.patch
rename to Spigot-API-Patches/0173-Annotation-Test-changes.patch
index b73c6f08d3..ed404fdb23 100644
--- a/Spigot-API-Patches/0172-Annotation-Test-changes.patch
+++ b/Spigot-API-Patches/0173-Annotation-Test-changes.patch
@@ -1,4 +1,4 @@
-From 7666930425ecce25ad85f2a146efbf0db678c9e6 Mon Sep 17 00:00:00 2001
+From 320ed49d6420508ef894ccf099fa98d8b1681e40 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 17 Mar 2019 23:04:30 +0000
 Subject: [PATCH] Annotation Test changes
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index f976a30eb3..aed7f13ac6 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 042b8359f3b5546618766bf2cb49b606c189964b Mon Sep 17 00:00:00 2001
+From c65245a02ee7ec018df04e2545eba8212237ee1a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index a985cf0c..3791b728 100644
+index 23ab857e0..51cefc0a1 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -110,23 +110,15 @@ index a985cf0c..3791b728 100644
                              <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
-@@ -183,20 +172,23 @@
+@@ -183,6 +172,7 @@
                              <goal>shade</goal>
                          </goals>
                          <configuration>
 +                            <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
                              <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
                              <relocations>
--                                <relocation>
--                                    <pattern>joptsimple</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
--                                </relocation>
-+                                <!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 -->
-+                                <!--<relocation>-->
-+                                    <!--<pattern>joptsimple</pattern>-->
-+                                    <!--<shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>-->
-+                                <!--</relocation>-->
-                                 <relocation>
+                                 <!-- Cannot be relocated as it breaks translation property keys -->
+@@ -196,10 +186,11 @@
                                      <pattern>jline</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
                                  </relocation>
@@ -142,7 +134,7 @@ index a985cf0c..3791b728 100644
                                  <relocation>
                                      <pattern>org.bukkit.craftbukkit</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
-@@ -222,10 +214,6 @@
+@@ -225,10 +216,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.8.0</version>
@@ -154,7 +146,7 @@ index a985cf0c..3791b728 100644
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 93046379..674096ca 100644
+index 93046379d..674096cab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
@@ -167,5 +159,5 @@ index 93046379..674096ca 100644
  
          if (stream != null) {
 -- 
-2.20.1.windows.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 425c54e399..4526d06bde 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 16adea3781a6e944aed12e5110fcc19c2900a401 Mon Sep 17 00:00:00 2001
+From c4854e60305b3205de80651deb632f7a99dcd8ac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -297,7 +297,7 @@ index c4c1877d5..1256a0d58 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index c09961be9..dbf1089ba 100644
+index e89ba3e41..1dc13fcc3 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -22,6 +22,15 @@ public class Block implements IMaterial {
@@ -538,7 +538,7 @@ index ad9c00bc8..4e9ef43b4 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index faf4d0c0d..e329c2f48 100644
+index 3b8d09953..3f13aaa52 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -27,7 +27,8 @@ import org.bukkit.command.CommandSender;
@@ -577,7 +577,7 @@ index faf4d0c0d..e329c2f48 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 745b652a5..ccacc6e4f 100644
+index 011c7af21..b092b0fa2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -929,7 +929,7 @@ index c24f4a8fe..e01222ad2 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a2ec56bc9..da0d0cc10 100644
+index d97cc4f72..1c90c9d7a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -956,7 +956,7 @@ index a2ec56bc9..da0d0cc10 100644
  
      }
  
-@@ -1617,7 +1616,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1601,7 +1600,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -965,7 +965,7 @@ index a2ec56bc9..da0d0cc10 100644
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1628,7 +1627,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1612,7 +1611,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -974,7 +974,7 @@ index a2ec56bc9..da0d0cc10 100644
              return;
          }
  
-@@ -1641,7 +1640,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1625,7 +1624,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
@@ -1106,7 +1106,7 @@ index c69209497..68ac014aa 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9865f7f7a..a1c5375a5 100644
+index 9d5b3958b..ad792af2b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1567,7 +1567,7 @@ index 413dd35f0..52a8c48fa 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 753704c87..ca3393ef8 100644
+index 6a9957325..5b89da26c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1808,5 +1808,5 @@ index c1071c92e..a99c0cea0 100644
      }
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
index 65dbb6e93c..7f065ed0d6 100644
--- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 18827b7724628d83581906f398c7b311cd031417 Mon Sep 17 00:00:00 2001
+From 50c27b3dd87070cac07f40031b0178ab9a3d7b79 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d2970c086..00bd32e6c 100644
+index 1c90c9d7a..b57f48035 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1548,6 +1548,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1532,6 +1532,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index d2970c086..00bd32e6c 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a6d729180..b713bd2e9 100644
+index 76fb12630..4a53095a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -701,6 +701,29 @@ public final class CraftServer implements Server {
@@ -118,5 +118,5 @@ index f4e088c13..944151d14 100644
          {
              String[] split = restartScript.split( " " );
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
index bc3afb2246..8d8d7d1295 100644
--- a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 9b28a61c8f4582b4f8b024e877b09194a42429de Mon Sep 17 00:00:00 2001
+From b2e44e33ca2732e58ad8b3a8e0d9e0d7e1608f74 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f543532f89..91eb73b734 100644
+index b57f48035..f944eff87 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1317,7 +1317,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1301,7 +1301,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
@@ -22,7 +22,7 @@ index f543532f89..91eb73b734 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8f8f03977c..43824f9633 100644
+index 94770aaf7..a3e521cb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -126,6 +126,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -70,5 +70,5 @@ index 8f8f03977c..43824f9633 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch
index 49b6a0c089..b78a2737cc 100644
--- a/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch
+++ b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 19ecf92a02579bb9c9518f7a192ca00d7d0c3afe Mon Sep 17 00:00:00 2001
+From e243b9109433eae11aa5d0ba4c3aecb1fccf3976 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for Pathfinding
@@ -82,7 +82,7 @@ index 36d7e1d96..d722c8513 100644
          this.c.c();
          this.d = MathHelper.d(entityinsentient.width + 1.0F);
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index d4eb7f862..3b5ace88d 100644
+index eec891647..e45bdb581 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -327,7 +327,8 @@ public class PathfinderNormal extends PathfinderAbstract {
@@ -99,8 +99,8 @@ index d4eb7f862..3b5ace88d 100644
                  for (int l = -1; l <= 1; ++l) {
                      for (int i1 = -1; i1 <= 1; ++i1) {
                          if (l != 0 || i1 != 0) {
--                            Block block = iblockaccess.getType(blockposition_b.c(l + i, j, i1 + k)).getBlock();
-+                            Block block = world.getBlockIfLoaded(blockposition_b.c(l + i, j, i1 + k)); // Paper
+-                            Block block = iblockaccess.getType(blockposition_pooledblockposition.c(l + i, j, i1 + k)).getBlock();
++                            Block block = world.getBlockIfLoaded(blockposition_pooledblockposition.c(l + i, j, i1 + k)); // Paper
  
 -                            if (block == Blocks.CACTUS) {
 +                            if (block == null) pathtype = PathType.BLOCKED; // Paper
@@ -119,5 +119,5 @@ index d4eb7f862..3b5ace88d 100644
          Material material = iblockdata.getMaterial();
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
index fb2f8732a5..9a36155572 100644
--- a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,11 +1,11 @@
-From 03c6a56ae1da43798b2e2bb1048672986c13e9da Mon Sep 17 00:00:00 2001
+From b90ee7c51e4b323e8c206bf7006f36484f8cfa9c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index 77440ac81f..8711462e16 100644
+index 77440ac81..8711462e1 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,10 +18,10 @@ index 77440ac81f..8711462e16 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3493bf945f..43b08096d6 100644
+index f944eff87..72c06cdb8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1889,6 +1889,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1873,6 +1873,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index 3493bf945f..43b08096d6 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index d1f92b448c..8de7668a0d 100644
--- a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 302be0291f7c03f6d2c9749946213c3d9c9a2685 Mon Sep 17 00:00:00 2001
+From fc795917307bbed324521bca9996db6dcbfc7976 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -26,10 +26,10 @@ index 276dd98fd..973ea8bca 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 44474a7d6..97e39050a 100644
+index 72c06cdb8..5516726e8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1626,7 +1626,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1610,7 +1610,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
@@ -61,5 +61,5 @@ index 6e62ea90d..523694899 100644
          worldserver = server.getWorldServer(entityplayer.dimension);  // CraftBukkit - Update in case join event changed it
          playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
index eb337498d3..b41b894cba 100644
--- a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From c606b70b6aba86512d4fbeb55cf80b4041f448ca Mon Sep 17 00:00:00 2001
+From 8555700222db1b2ae1797468e723cecf28b80d3a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
@@ -24,7 +24,7 @@ index 973ea8bca..7c7d5595a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 7cac7cc90..792a69ad5 100644
+index f99046b9b..2c881be1e 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -12,6 +12,7 @@ public class BlockIceFrost extends BlockIce {
@@ -33,14 +33,14 @@ index 7cac7cc90..792a69ad5 100644
      public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Random random) {
 +        if (!world.paperConfig.frostedIceEnabled) return; // Paper - add ability to disable frosted ice
          if ((random.nextInt(3) == 0 || this.a(world, blockposition, 4)) && world.getLightLevel(blockposition) > 11 - (Integer) iblockdata.get(BlockIceFrost.a) - iblockdata.b(world, blockposition) && this.c(iblockdata, world, blockposition)) {
-             BlockPosition.b blockposition_b = BlockPosition.b.r();
+             BlockPosition.PooledBlockPosition blockposition_pooledblockposition = BlockPosition.PooledBlockPosition.r();
              Throwable throwable = null;
 @@ -27,7 +28,7 @@ public class BlockIceFrost extends BlockIce {
-                     IBlockData iblockdata1 = world.getType(blockposition_b);
+                     IBlockData iblockdata1 = world.getType(blockposition_pooledblockposition);
  
-                     if (iblockdata1.getBlock() == this && !this.c(iblockdata1, world, blockposition_b)) {
--                        world.getBlockTickList().a(blockposition_b, this, MathHelper.nextInt(random, 20, 40));
-+                        world.getBlockTickList().a(blockposition_b, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
+                     if (iblockdata1.getBlock() == this && !this.c(iblockdata1, world, blockposition_pooledblockposition)) {
+-                        world.getBlockTickList().a(blockposition_pooledblockposition, this, MathHelper.nextInt(random, 20, 40));
++                        world.getBlockTickList().a(blockposition_pooledblockposition, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
                      }
                  }
              } catch (Throwable throwable1) {
@@ -54,5 +54,5 @@ index 7cac7cc90..792a69ad5 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
index eb16cb2fef..9908d54500 100644
--- a/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,14 +1,14 @@
-From 14b5c09d5c2ec1c709daba6dc1e5abf715b195ba Mon Sep 17 00:00:00 2001
+From 3d5681205a2678f4417f1e02f12b4da9f96ff5c7 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ca026155d8..e967066dcf 100644
+index 8b515b722..041e4608e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2082,7 +2082,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2066,7 +2066,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.d() == 2) {
                              click = ClickType.MIDDLE;
@@ -18,5 +18,5 @@ index ca026155d8..e967066dcf 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch
index eaf2b8a352..d42247aa85 100644
--- a/Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From e5a3132bd825a7a3a89770dd9afb537e6fba7576 Mon Sep 17 00:00:00 2001
+From 02153bf4f222c0a94526c55cd3758ef401fd38ee Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2ae623e7d..f5bd2245a 100644
+index 894501c61..dfb931298 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -253,4 +253,13 @@ public class PaperConfig {
@@ -23,10 +23,10 @@ index 2ae623e7d..f5bd2245a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5715d7ba8..c31f84a84 100644
+index 041e4608e..f5624f3d6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1193,13 +1193,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1177,13 +1177,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
@@ -44,5 +44,5 @@ index 5715d7ba8..c31f84a84 100644
              limitedPackets = 0;
              return true;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
index dd628ae024..6428b0b3c2 100644
--- a/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 0969b16e0064457cc8c7abbf1791395950c057e4 Mon Sep 17 00:00:00 2001
+From a45c886770943c8e1893a1bc1163b4212f1988b9 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -19,10 +19,10 @@ index 6b9bbc77c..e4e1d999e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 677d6466d..9157c3f0d 100644
+index d54f00037..eb232533c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2500,7 +2500,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2484,7 +2484,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public final boolean isDisconnected() {
diff --git a/Spigot-Server-Patches/0167-Fix-block-break-desync.patch b/Spigot-Server-Patches/0167-Fix-block-break-desync.patch
index 2d70268bf7..9ab5de2826 100644
--- a/Spigot-Server-Patches/0167-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0167-Fix-block-break-desync.patch
@@ -1,14 +1,14 @@
-From 82463a1bf386bbc6ae6d966a9388f464bb9347cb Mon Sep 17 00:00:00 2001
+From 7e47e348b20317ee5b66849ff43520037121d4c2 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dbdd08d17..46608118e 100644
+index eb232533c..74d880e03 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1152,6 +1152,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1136,6 +1136,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
              if (d3 > 36.0D) {
@@ -18,5 +18,5 @@ index dbdd08d17..46608118e 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0171-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 94%
rename from Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0171-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 7ee55430a8..97b8d251a2 100644
--- a/Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0171-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,4 +1,4 @@
-From 241fe427ab94754bd7f745cf4b9acb07a5a91aa9 Mon Sep 17 00:00:00 2001
+From 20c2db8c795362826ee89ca434c7e81866d572b6 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
@@ -18,5 +18,5 @@ index 299776728..41926a361 100644
                  Iterator<Long> iterator = this.unloadQueue.iterator();
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch
deleted file mode 100644
index fdb99ae927..0000000000
--- a/Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 777d98b4a8650fc1cbb0046b63c76cf2d81615d8 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 5 Feb 2017 19:17:28 -0500
-Subject: [PATCH] Shame on you Mojang
-
-Someone wrote some horrible code that throws a world accessing task
-onto the HTTP DOWNLOADER Thread Pool, for an activity that is not even
-heavy enough to warrant async operation.
-
-This then triggers async chunk loads!
-
-What in the hell were you thinking?
-
-diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index fb567f34c..e45ad95fb 100644
---- a/src/main/java/net/minecraft/server/BlockBeacon.java
-+++ b/src/main/java/net/minecraft/server/BlockBeacon.java
-@@ -49,7 +49,7 @@ public class BlockBeacon extends BlockTileEntity {
-     }
- 
-     public static void a(World world, BlockPosition blockposition) {
--        HttpUtilities.a.submit(() -> {
-+        //HttpUtilities.a.submit(() -> { // Paper
-             Chunk chunk = world.getChunkAtWorldCoords(blockposition);
- 
-             for (int i = blockposition.getY() - 1; i >= 0; --i) {
-@@ -73,7 +73,6 @@ public class BlockBeacon extends BlockTileEntity {
-                     });
-                 }
-             }
--
--        });
-+     //   }); // Paper
-     }
- }
--- 
-2.20.1
-
diff --git a/Spigot-Server-Patches/0173-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0172-Do-not-let-armorstands-drown.patch
similarity index 93%
rename from Spigot-Server-Patches/0173-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0172-Do-not-let-armorstands-drown.patch
index 57565458df..34874f01f8 100644
--- a/Spigot-Server-Patches/0173-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0172-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From a1e7d68d0ae7f38e6b94e715c5a87a8af234c71d Mon Sep 17 00:00:00 2001
+From 96b6468f9d3118627a6097dbc92e3f1e18e1bfc2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 5945e37a5..4ecf34a40 100644
+index b57088234..694df9e18 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -763,5 +763,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 5945e37a5..4ecf34a40 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index be0a3f38e..a6457e870 100644
+index 34fbf8362..138a224e0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -202,6 +202,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index be0a3f38e..a6457e870 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0173-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 99%
rename from Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0173-Properly-handle-async-calls-to-restart-the-server.patch
index 061b0723d4..95841adee9 100644
--- a/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0173-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From f9866f40c00cb70dd6987b0e82b4cb30b89dbc8c Mon Sep 17 00:00:00 2001
+From d7b4a418de5fffaf1e4667ae79065bba032605fe Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a5047084e..dd910b16d 100644
+index 6283c774d..db511c1fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -85,6 +85,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -294,5 +294,5 @@ index 944151d14..061cbe7fc 100644
      }
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0175-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0174-Add-system-property-to-disable-book-size-limits.patch
similarity index 97%
rename from Spigot-Server-Patches/0175-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0174-Add-system-property-to-disable-book-size-limits.patch
index 5c48346f61..458ea3767f 100644
--- a/Spigot-Server-Patches/0175-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0174-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From 3105668521742bb253d9380fb45fcb8cce56e8cd Mon Sep 17 00:00:00 2001
+From e2b577bd48746070ebc879711993cb290b1dd3d8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -57,5 +57,5 @@ index a23ec1461..20cddd506 100644
              }
  
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 93%
rename from Spigot-Server-Patches/0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 6e22491ffc..204ff54a10 100644
--- a/Spigot-Server-Patches/0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From fae17dd3704f78651bf125cf4229ea077c07f658 Mon Sep 17 00:00:00 2001
+From 7e0c048688797357331b9b96630f12e0325a264e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -26,7 +26,7 @@ index e49eb0caf..aefb0ce97 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d356c1760..7f0501794 100644
+index 5e5a747e9..23e7cdfe8 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -465,7 +465,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,10 +39,10 @@ index d356c1760..7f0501794 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7555fc3f7..ff5eb0b3d 100644
+index 74d880e03..b906615e3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1751,6 +1751,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1735,6 +1735,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          switch (packetplayinentityaction.c()) {
          case START_SNEAKING:
              this.player.setSneaking(true);
@@ -57,5 +57,5 @@ index 7555fc3f7..ff5eb0b3d 100644
          case STOP_SNEAKING:
              this.player.setSneaking(false);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0177-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 91%
rename from Spigot-Server-Patches/0177-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch
index 9cbe1482c7..90c82912b2 100644
--- a/Spigot-Server-Patches/0177-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From f6ca2a412171bf4de58549ea41ea774f6bb4d382 Mon Sep 17 00:00:00 2001
+From 3282d3a441567161f7a424959345ac7695ebff22 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a4853e04be..0f38b1fb4a 100644
+index a4853e04b..0f38b1fb4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -280,4 +280,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index a4853e04be..0f38b1fb4a 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 02d2b80b91..e238e760a7 100644
+index 02d2b80b9..e238e760a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2140,5 +2140,10 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 02d2b80b91..e238e760a7 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch
index 6fe10b8fc6..1426015088 100644
--- a/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 7cf14855f60627ca3c791907f9c73b3f76dde838 Mon Sep 17 00:00:00 2001
+From a6a3ba9f6b3a8dae529a6202f3db6beb8b7e2735 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 3791b72807..7d626a7d27 100644
+index 51cefc0a1..2b73ec28a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -54,7 +54,7 @@ index 3791b72807..7d626a7d27 100644
          </dependency>
          <dependency>
              <groupId>org.ow2.asm</groupId>
-@@ -205,10 +222,18 @@
+@@ -207,10 +224,18 @@
                                  <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                      <resource>META-INF/services/java.sql.Driver</resource>
                                  </transformer>
@@ -75,7 +75,7 @@ index 3791b72807..7d626a7d27 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 0000000000..688b4715eb
+index 000000000..688b4715e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -121,7 +121,7 @@ index 0000000000..688b4715eb
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 0000000000..685deaa0e5
+index 000000000..685deaa0e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -143,7 +143,7 @@ index 0000000000..685deaa0e5
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 4e9ef43b45..5bb1ea880a 100644
+index 4e9ef43b4..5bb1ea880 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -79,6 +79,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index 4e9ef43b45..5bb1ea880a 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index db511c1fe8..c6ecdf6e8e 100644
+index db511c1fe..c6ecdf6e8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -56,7 +56,6 @@ import org.apache.commons.lang3.Validate;
@@ -243,7 +243,7 @@ index db511c1fe8..c6ecdf6e8e 100644
  
      public KeyPair E() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9d44dcb3b2..8bb3fef21e 100644
+index 9d44dcb3b..8bb3fef21 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -77,8 +77,7 @@ public abstract class PlayerList {
@@ -257,7 +257,7 @@ index 9d44dcb3b2..8bb3fef21e 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e238e760a7..9cf2ee957b 100644
+index e238e760a..9cf2ee957 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -146,8 +146,8 @@ import java.nio.ByteBuffer;
@@ -285,7 +285,7 @@ index e238e760a7..9cf2ee957b 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5c62e990ab..b174a4efae 100644
+index 0c70f6700..04991c991 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -14,7 +14,7 @@ import java.util.logging.Logger;
@@ -327,7 +327,7 @@ index 5c62e990ab..b174a4efae 100644
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb8942..0000000000
+index 26a2fb894..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,74 +0,0 @@
@@ -406,7 +406,7 @@ index 26a2fb8942..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02c4..1e3aae3b8f 100644
+index 33e8ea02c..1e3aae3b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -8,17 +8,27 @@ import java.util.logging.Level;
@@ -485,7 +485,7 @@ index 33e8ea02c4..1e3aae3b8f 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 984df4083d..bbb5a84f36 100644
+index 984df4083..bbb5a84f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread {
@@ -499,7 +499,7 @@ index 984df4083d..bbb5a84f36 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index b640971130..0000000000
+index b64097113..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -558,7 +558,7 @@ index b640971130..0000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00ef..08b6bb7f97 100644
+index 5cee8f00e..08b6bb7f9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
@@ -588,5 +588,5 @@ index 5cee8f00ef..08b6bb7f97 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0179-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 96%
rename from Spigot-Server-Patches/0179-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch
index 1e35cad299..8afe737da0 100644
--- a/Spigot-Server-Patches/0179-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From ae11acb86e16493b74f4758d53def860e6580ac8 Mon Sep 17 00:00:00 2001
+From 21f905a2536d1e3dbf5fe9f96a7f9bfebc4ef139 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -34,5 +34,5 @@ index 81e602d1b..b6af42904 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0180-Item-canEntityPickup.patch b/Spigot-Server-Patches/0179-Item-canEntityPickup.patch
similarity index 94%
rename from Spigot-Server-Patches/0180-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0179-Item-canEntityPickup.patch
index 47689147b7..110a28be9c 100644
--- a/Spigot-Server-Patches/0180-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0179-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From f5e92a52c3e06d819b2bbf304c9eee9ad6c6397c Mon Sep 17 00:00:00 2001
+From 796cef655af2544409704e96ea3c7751594268f3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 7401bafa9..d670b6ba4 100644
+index c53082459..98e214cdd 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -530,6 +530,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index 7401bafa9..d670b6ba4 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index cad1c1a17..e343b39b5 100644
+index 9b854d64f..39a804b7c 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -13,6 +13,7 @@ public class EntityItem extends Entity {
@@ -54,5 +54,5 @@ index 55d6bacf7..6036592f7 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0181-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0180-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0181-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0180-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 9122e85b26..92c8ce76f3 100644
--- a/Spigot-Server-Patches/0181-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0180-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From 8e87c447aeaf60619c17d4800980fedcb2fdfb52 Mon Sep 17 00:00:00 2001
+From d2dc3091b8657b318b2813a1e3ab7a1eed394ae8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index ac0f38e12..c18654256 100644
+index 39a804b7c..643793d55 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -308,6 +308,7 @@ public class EntityItem extends Entity {
@@ -43,5 +43,5 @@ index ac0f38e12..c18654256 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0182-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0181-PlayerAttemptPickupItemEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0182-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0181-PlayerAttemptPickupItemEvent.patch
index dd1c875af5..38ebf41cb2 100644
--- a/Spigot-Server-Patches/0182-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0181-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From beb52bdc2048cc886d469c876fbac60eefbe1091 Mon Sep 17 00:00:00 2001
+From eb450153843e8b028207b2d7e854a092289ea7b6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index c18654256..0b4cab0af 100644
+index 643793d55..85f80741c 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -40,5 +40,5 @@ index c18654256..0b4cab0af 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0183-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0182-Add-UnknownCommandEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0183-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0182-Add-UnknownCommandEvent.patch
index c003334045..248b941cea 100644
--- a/Spigot-Server-Patches/0183-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0182-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 7b5147f0f06ece4202a78ae8391ce5faef0ad8af Mon Sep 17 00:00:00 2001
+From 03c187679f3139c3228ee5d763f7c08474ced30b Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 89ff2fb53..f82ab97e6 100644
+index 9cf2ee957..6dad8fab2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -83,6 +83,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -32,5 +32,5 @@ index 89ff2fb53..f82ab97e6 100644
          // Spigot end
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0184-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0184-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch
index e8dd78e3be..2d140d3b1f 100644
--- a/Spigot-Server-Patches/0184-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 73c73fe9767a2693a0718ed12093fb413ca905b7 Mon Sep 17 00:00:00 2001
+From 48590dd6c44d630eb5b4830660f2ae85784abab6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 0000000000..b151a13c1b
+index 000000000..b151a13c1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 0000000000..b151a13c1b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 0000000000..25836b975b
+index 000000000..25836b975
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 0000000000..25836b975b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 0000000000..3bcdb8f93f
+index 000000000..3bcdb8f93
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 0000000000..3bcdb8f93f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 0000000000..4b2a67423f
+index 000000000..4b2a67423
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 0000000000..4b2a67423f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 0000000000..3aceb0ea8a
+index 000000000..3aceb0ea8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index e1af5c4885..0ef5ad1165 100644
+index e1af5c488..0ef5ad116 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,7 +429,7 @@ index e1af5c4885..0ef5ad1165 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c6ecdf6e8e..5517c5fe81 100644
+index c6ecdf6e8..5517c5fe8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1186,7 +1186,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -450,7 +450,7 @@ index c6ecdf6e8e..5517c5fe81 100644
          return this.V;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 9bf2521be6..0596658362 100644
+index 9bf2521be..059665836 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,7 +43,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index 9bf2521be6..0596658362 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6dad8fab26..ec17eaf9d7 100644
+index 6dad8fab2..ec17eaf9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -164,6 +164,10 @@ import org.bukkit.event.server.ServerLoadEvent;
@@ -523,5 +523,5 @@ index 6dad8fab26..ec17eaf9d7 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0184-Shoulder-Entities-Release-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0184-Shoulder-Entities-Release-API.patch
index 6efed2ede4..9a79200415 100644
--- a/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0184-Shoulder-Entities-Release-API.patch
@@ -1,4 +1,4 @@
-From 0af2354c40db7b7aa736fbc1fa4e89279393efb7 Mon Sep 17 00:00:00 2001
+From 136778b9063d11c79042422caeed11e550c8004e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
diff --git a/Spigot-Server-Patches/0186-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0185-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0186-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0185-Profile-Lookup-Events.patch
index bc085cf34b..3c86ac662c 100644
--- a/Spigot-Server-Patches/0186-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0185-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 55c3f1f54797809a5ac5ef73753d9c4ae16edb65 Mon Sep 17 00:00:00 2001
+From 0db7caa6c1fffb8a75ca04e449016be2d771c7b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644
      }
  }
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0187-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0186-Block-player-logins-during-server-shutdown.patch
similarity index 93%
rename from Spigot-Server-Patches/0187-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0186-Block-player-logins-during-server-shutdown.patch
index 8dbe562a2e..9389a294b6 100644
--- a/Spigot-Server-Patches/0187-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0186-Block-player-logins-during-server-shutdown.patch
@@ -1,4 +1,4 @@
-From 2a4dc5a6b1147aa81b3c974bd8f8712ed1dc6575 Mon Sep 17 00:00:00 2001
+From d234eb539c27dc62a73b839a01389fc6d2489169 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
@@ -22,5 +22,5 @@ index e901c066a..852dc7162 100644
              this.b();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
similarity index 94%
rename from Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
index 2d41e30071..71530ccfef 100644
--- a/Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From a15e970ed18cc79400d6dbbcdcf1d95d5ff86582 Mon Sep 17 00:00:00 2001
+From 3569f378c781dc08ac98caa7de3f38f3d199e003 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4be9226c8e..e64d032b7f 100644
+index 2da7bbe81..c59f137f0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index 4be9226c8e..e64d032b7f 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index ce43b4bc52..98065d6b02 100644
+index ce43b4bc5..98065d6b0 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index ce43b4bc52..98065d6b02 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a82717f5c1..67530ba0fc 100644
+index a82717f5c..67530ba0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -839,5 +839,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -64,5 +64,5 @@ index a82717f5c1..67530ba0fc 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch
similarity index 93%
rename from Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch
index a96948232f..b5ee37334d 100644
--- a/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From 37a62cfb23664f1077c3edf77bb3e2193c0b0b90 Mon Sep 17 00:00:00 2001
+From 3d24b5f762730dd26308701afe17ecc1166428dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index a6ac516147..1560dd382a 100644
+index a6ac51614..1560dd382 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -375,9 +375,9 @@ public class ContainerAnvil extends Container {
@@ -26,7 +26,7 @@ index a6ac516147..1560dd382a 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 35eb4279ec..b03c62bf2d 100644
+index 47e8ef2de..7a74ce26d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1400,6 +1400,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -42,5 +42,5 @@ index 35eb4279ec..b03c62bf2d 100644
          return true;
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0189-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 90%
rename from Spigot-Server-Patches/0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0189-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index 9167b86505..e35003e776 100644
--- a/Spigot-Server-Patches/0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0189-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From ac4056b8b9841f0fa81703e72634c60229c838f9 Mon Sep 17 00:00:00 2001
+From 3d463a5ec0887a8c0424ba171b16bd835c64fade Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 15736f7575..ee09f4c5a0 100644
+index 15736f757..ee09f4c5a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -217,6 +217,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -24,5 +24,5 @@ index 15736f7575..ee09f4c5a0 100644
          return result;
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0191-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0190-Improve-the-Saddle-API-for-Horses.patch
similarity index 97%
rename from Spigot-Server-Patches/0191-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0190-Improve-the-Saddle-API-for-Horses.patch
index bd8d701a9c..ae7ecf7e20 100644
--- a/Spigot-Server-Patches/0191-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0190-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 85ec0814325c3a54b11db44f173f4239975d47fb Mon Sep 17 00:00:00 2001
+From e44afb8723f21042ad1a3dfe0fcaee71a3df3540 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -61,5 +61,5 @@ index 000000000..99cfbaf90
 +
 +}
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0192-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0191-Implement-ensureServerConversions-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0192-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0191-Implement-ensureServerConversions-API.patch
index dab09b7769..f89f2e0d84 100644
--- a/Spigot-Server-Patches/0192-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0191-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 101bcf13b1aef3fa2e0e3b952e403005e9fb5edd Mon Sep 17 00:00:00 2001
+From 9cd2c4f8729a798dcc81ec4cc9cc37c44d3cd489 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -22,5 +22,5 @@ index 52041caed..f5fa58d6c 100644
 +    // Paper end
  }
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0193-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0192-Implement-getI18NDisplayName.patch
similarity index 96%
rename from Spigot-Server-Patches/0193-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0192-Implement-getI18NDisplayName.patch
index 456c352b95..138b593e05 100644
--- a/Spigot-Server-Patches/0193-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0192-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 726405ea60af24ba1dfaf572412e33a555147028 Mon Sep 17 00:00:00 2001
+From 8e20d707407fcd2fafad7ad1eda1dd7906fcb3ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -48,5 +48,5 @@ index f5fa58d6c..3a6e6f687 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0193-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 93%
rename from Spigot-Server-Patches/0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0193-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index f6deab2682..39f830208f 100644
--- a/Spigot-Server-Patches/0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0193-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From 43787fb84844cd102edae334a8b12d0198373999 Mon Sep 17 00:00:00 2001
+From b7c4fc493b7bd6aaf28dacd893e41c2ea5dd0ad3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@@ -22,5 +22,5 @@ index ab4f3b722..e428d4485 100644
              }
              } // Paper timing
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0195-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0194-ProfileWhitelistVerifyEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0195-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0194-ProfileWhitelistVerifyEvent.patch
index 097e8231e1..18aa258ff9 100644
--- a/Spigot-Server-Patches/0195-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0194-ProfileWhitelistVerifyEvent.patch
@@ -1,11 +1,11 @@
-From d92c32d4f54c681035e0d860ed7cd1e28ddbac94 Mon Sep 17 00:00:00 2001
+From a27b596d7218425400bb7ead328db1de31f33bc9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 52b90e12b..102b7f3b2 100644
+index 8bb3fef21..96eff10ff 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -543,9 +543,9 @@ public abstract class PlayerList {
@@ -48,5 +48,5 @@ index 52b90e12b..102b7f3b2 100644
      public boolean isOp(GameProfile gameprofile) {
          return this.operators.d(gameprofile) || this.server.H() && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().u() && this.server.G().equalsIgnoreCase(gameprofile.getName()) || this.u;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0196-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0195-Fix-this-stupid-bullshit.patch
similarity index 93%
rename from Spigot-Server-Patches/0196-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0195-Fix-this-stupid-bullshit.patch
index 4e12336eb9..21ce2b1ddd 100644
--- a/Spigot-Server-Patches/0196-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0195-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From afa4f9949f3ab39721d6d341ff2fda03ab44c855 Mon Sep 17 00:00:00 2001
+From 1e6c11f9a5dd6028668fc391de996e39c2cf01fa Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b174a4efa..c9a6b5afb 100644
+index 04991c991..2d5167eb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -217,10 +217,12 @@ public class Main {
@@ -29,5 +29,5 @@ index b174a4efa..c9a6b5afb 100644
                  }
  
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0197-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0196-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 88%
rename from Spigot-Server-Patches/0197-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0196-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 30b3f716ba..81512da0a7 100644
--- a/Spigot-Server-Patches/0197-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0196-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,11 +1,11 @@
-From 57f01552ff909b09dde2830a199e523ebf74d855 Mon Sep 17 00:00:00 2001
+From b5b1b9834e7d3e8b44ff6719550e36679e212df0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 9fc35730a..2a5a5516a 100644
+index 47aac5b05..ba074c10c 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -61,7 +61,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -18,5 +18,5 @@ index 9fc35730a..2a5a5516a 100644
  
      protected void initAttributes() {
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0197-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 94%
rename from Spigot-Server-Patches/0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0197-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index cbf57fe006..a905c166dd 100644
--- a/Spigot-Server-Patches/0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0197-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,4 +1,4 @@
-From 57d7b3c61b1932a8b1e32158546d62f0e1007c82 Mon Sep 17 00:00:00 2001
+From 8ff001f7d0039fb84f6d34574bcc8d48f8a81d3f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
@@ -28,5 +28,5 @@ index 98065d6b0..027ba7191 100644
                  }
  
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0198-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 91%
rename from Spigot-Server-Patches/0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0198-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 23f42c2283..75cd5c3d1d 100644
--- a/Spigot-Server-Patches/0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0198-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From 996aaeb08a61dfb62749e8b621b6b72f21116a95 Mon Sep 17 00:00:00 2001
+From 41a936d8fb39da0a7b185a10d9aea73e2db7840a Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d4ed23089..30f4ea451 100644
+index 837f875a4..5b589e76f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1273,7 +1273,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -22,5 +22,5 @@ index d4ed23089..30f4ea451 100644
              this.tileEntityListUnload.clear();
          }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0200-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0199-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 95%
rename from Spigot-Server-Patches/0200-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0199-Allow-specifying-a-custom-authentication-servers-dow.patch
index 4510f7448e..dffe9bd408 100644
--- a/Spigot-Server-Patches/0200-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0199-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 1d672bef8f838967fd754efea8cd01512173a4d4 Mon Sep 17 00:00:00 2001
+From 6f22953638e079923027657ef4c892958c04786c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3f59e060b..305a1258f 100644
+index 0f38b1fb4..68c287026 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -42,5 +42,5 @@ index 852dc7162..74bc08f85 100644
                              LoginListener.c.error("Couldn't verify username because servers are unavailable");
                          }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0201-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0200-LivingEntity-setKiller.patch
similarity index 94%
rename from Spigot-Server-Patches/0201-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0200-LivingEntity-setKiller.patch
index 8481c79182..af2973c39c 100644
--- a/Spigot-Server-Patches/0201-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0200-LivingEntity-setKiller.patch
@@ -1,4 +1,4 @@
-From bd1155c27e1a0fa98e542d14396d71befd73985d Mon Sep 17 00:00:00 2001
+From f2fdf943d649d1e7f0dd770429734dbedf0a169c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
@@ -26,5 +26,5 @@ index 716eda990..2f96842bb 100644
          return addPotionEffect(effect, false);
      }
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0201-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0201-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 96fbd6f5c4..2124b08894 100644
--- a/Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0201-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From 10515690ebe575594d71dc39cd76069716e6b5c9 Mon Sep 17 00:00:00 2001
+From a7fc738505f8be1140eb7e8e4a74a422d929fec4 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index 1512ff969..f861eda9d 100644
+index 2b73ec28a..0a6e81b68 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,11 @@
@@ -28,7 +28,7 @@ index 1512ff969..f861eda9d 100644
              <groupId>org.ow2.asm</groupId>
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index be7030d56..71d1c0b25 100644
+index 5bb1ea880..0d2c7a6dc 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -45,5 +45,5 @@ index be7030d56..71d1c0b25 100644
  
          thread.setDaemon(true);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0202-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 97%
rename from Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0202-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 5ef39aa021..49503dd167 100644
--- a/Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0202-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From c94d3bd0e5d19a9cc1575e38f750f8ee750dc951 Mon Sep 17 00:00:00 2001
+From bf174349f34fa396748aa3fefeb5b3765aecb79d Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index f861eda9d..ed6cd4416 100644
+index 0a6e81b68..82b9cae16 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,7 +61,7 @@
@@ -70,5 +70,5 @@ index 08b6bb7f9..9f8334376 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0203-Include-Log4J2-SLF4J-implementation.patch
similarity index 86%
rename from Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0203-Include-Log4J2-SLF4J-implementation.patch
index a649ee8581..f2ccac1a01 100644
--- a/Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0203-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From 0a0de210e103b80fd30452bb7312732d35cb96d1 Mon Sep 17 00:00:00 2001
+From 8a93355be0a60b6692ec9a4515a3d07ea9f0f772 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index ed6cd4416..75f98f79a 100644
+index 82b9cae16..3ad5af346 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,12 @@
@@ -22,5 +22,5 @@ index ed6cd4416..75f98f79a 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0204-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 96%
rename from Spigot-Server-Patches/0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0204-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 611b41cccd..1c86ca1d4f 100644
--- a/Spigot-Server-Patches/0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0204-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 86fbf17a43556c991f01060a506a28a6b43523ec Mon Sep 17 00:00:00 2001
+From 93a6d899b73fcd1b580a5862a131a9bd1a9b95ba Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -35,5 +35,5 @@ index 9f8334376..6711e6dff 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0205-Add-PlayerJumpEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0205-Add-PlayerJumpEvent.patch
index ce6a7c8049..fb2e7c9c45 100644
--- a/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0205-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From 32d2aecb6802eb91b01223ca9bf0b4460cab3c3c Mon Sep 17 00:00:00 2001
+From 84a6783cd3595a4bdb66615d1fc102cdf5610eff Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
@@ -17,7 +17,7 @@ index 298012f37..bfae875eb 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0b6a6cf73..d2d1ce35b 100644
+index b906615e3..af73bb781 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0207-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0206-handle-PacketPlayInKeepAlive-async.patch
similarity index 92%
rename from Spigot-Server-Patches/0207-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0206-handle-PacketPlayInKeepAlive-async.patch
index 4c35fc3cdb..cfe6ab209b 100644
--- a/Spigot-Server-Patches/0207-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0206-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 124cbdd7877329c24ba41a75602f6be6a1ceb840 Mon Sep 17 00:00:00 2001
+From f53f4fdc96bb535750db0518c5e9269501feb8f8 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a7f6d506c1..7e2d046a0a 100644
+index af73bb781..2fa9f797d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2466,14 +2466,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2450,14 +2450,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -40,5 +40,5 @@ index a7f6d506c1..7e2d046a0a 100644
  
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0207-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0207-Expose-client-protocol-version-and-virtual-host.patch
index 1eaef32464..2e135ed1aa 100644
--- a/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0207-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From eebb68cff0c614203e44d7be9c04af9c7378a0c1 Mon Sep 17 00:00:00 2001
+From 375da7221eb8bd8940c2f389e0b935bff3be8dc5 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 0000000000..5caca6439d
+index 000000000..5caca6439
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 0000000000..5caca6439d
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 93ca93b640..e732d55f9f 100644
+index 93ca93b64..e732d55f9 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index 93ca93b640..e732d55f9f 100644
  
      public void a(IChatBaseComponent ichatbasecomponent) {}
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e2fc41d6d1..2ff2549d0e 100644
+index e2fc41d6d..2ff2549d0 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,6 +62,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index e2fc41d6d1..2ff2549d0e 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 7acdac55e5..f1a3be69d0 100644
+index 7acdac55e..f1a3be69d 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -33,6 +33,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 7acdac55e5..f1a3be69d0 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b03c62bf2d..5ea54cb910 100644
+index 7a74ce26d..01547b31e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -174,6 +174,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -136,5 +136,5 @@ index b03c62bf2d..5ea54cb910 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0209-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0208-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0209-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0208-revert-serverside-behavior-of-keepalives.patch
index 7bf5c6a0d3..f09764eb9f 100644
--- a/Spigot-Server-Patches/0209-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0208-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From c8116b786630c8cac6f0ae44373e9c34213b9a11 Mon Sep 17 00:00:00 2001
+From 8459f954517d4b6d5e7dc22acdb0a40950ebeedd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7a6e9132c..8def17495 100644
+index 2fa9f797d..bae10827a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -74,5 +74,5 @@ index 7a6e9132c..8def17495 100644
          this.minecraftServer.methodProfiler.exit();
          // CraftBukkit start
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0209-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 94%
rename from Spigot-Server-Patches/0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0209-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index 0e7f1c6a16..ec07bf45b9 100644
--- a/Spigot-Server-Patches/0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0209-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From 82e0fec9fd1526ee71c3ff93a7f13729452a45f8 Mon Sep 17 00:00:00 2001
+From 3ecd162dfc41c5b05c150cb01f290922298658fb Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
@@ -26,5 +26,5 @@ index 80a5c29f3..cd864c404 100644
  
      public HashTreeSet() {
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0210-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 97%
rename from Spigot-Server-Patches/0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0210-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 2dc986a939..b3c089a28b 100644
--- a/Spigot-Server-Patches/0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0210-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 9da6eabeb84a6797d1dc255cb701801bcfa538c6 Mon Sep 17 00:00:00 2001
+From 7b8d804737438542137a97aa878c053de13bfc6f Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 8378c0789..54d03feb9 100644
+index bfae875eb..259f73f66 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -989,6 +989,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index 8378c0789..54d03feb9 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 30f4ea451..c98c11541 100644
+index 5b589e76f..f2aa22d28 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -954,6 +954,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -89,5 +89,5 @@ index 30f4ea451..c98c11541 100644
          for (int i = 0; i < this.v.size(); ++i) {
              ((IWorldAccess) this.v.get(i)).a(entityhuman, soundeffect, soundcategory, d0, d1, d2, f, f1);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 95%
rename from Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch
index 52fc9152af..e5c6d17fce 100644
--- a/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,11 +1,11 @@
-From 3432691ec7a7e0cc2fca8f8b6c392ef2d27218a7 Mon Sep 17 00:00:00 2001
+From a57980e38a8b652248db915cd44fe7621b30899b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index af31030dc7..b6764c7ec1 100644
+index af31030dc..b6764c7ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -378,4 +378,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index af31030dc7..b6764c7ec1 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fb0fe35000..228f4b28eb 100644
+index fb0fe3500..228f4b28e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -394,16 +394,32 @@ public class CraftEventFactory {
@@ -60,5 +60,5 @@ index fb0fe35000..228f4b28eb 100644
          // Spigot end
          } else {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0212-Add-PlayerArmorChangeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0212-Add-PlayerArmorChangeEvent.patch
index 338733ebab..09bee87998 100644
--- a/Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0212-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 11940ada751fdf632cdd95c754ba8de96c2b1456 Mon Sep 17 00:00:00 2001
+From f6f8fb674c021e3a90a454293b48a30266b9297a Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 46a09faf9..316b66cc4 100644
+index 138a224e0..02fcfc449 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0214-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0213-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 93%
rename from Spigot-Server-Patches/0214-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0213-Prevent-logins-from-being-processed-when-the-player-.patch
index d6ef2206f2..0e90043d5d 100644
--- a/Spigot-Server-Patches/0214-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0213-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 86fdd97563ac2a97f7eb6157b30d794b6774d469 Mon Sep 17 00:00:00 2001
+From dba7e75cc4f2211fecff50af7244c22b7c81d14c Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -23,5 +23,5 @@ index 74bc08f85..15c01333e 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0215-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0214-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 94%
rename from Spigot-Server-Patches/0215-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0214-use-CB-BlockState-implementations-for-captured-block.patch
index 42abbe2859..6dca0fd4f1 100644
--- a/Spigot-Server-Patches/0215-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0214-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From 70822f826d458249efca2253522d5d8c0392fa8a Mon Sep 17 00:00:00 2001
+From 695f4e218ac0761bb6a099d7f2d7e93d028674ba Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c98c11541..d7c1c96a9 100644
+index f2aa22d28..08ad88c14 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -395,7 +395,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -31,5 +31,5 @@ index c98c11541..d7c1c96a9 100644
              }
              // CraftBukkit end
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0215-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 98%
rename from Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0215-API-to-get-a-BlockState-without-a-snapshot.patch
index ed4d64e594..7e92c598e8 100644
--- a/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0215-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From ed595cb3cc0cf53d6f2fad9c919916fdcf9aec21 Mon Sep 17 00:00:00 2001
+From 81858dadc6c83ef90c21a41f1a04ca57728cfcba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -39,7 +39,7 @@ index b3c5766a2..29fe031d8 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index d40127075..e7ccee480 100644
+index 4b4fdf93f..7ae4b7952 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -275,6 +275,20 @@ public class CraftBlock implements Block {
@@ -131,5 +131,5 @@ index e6f86cc4b..3a8f64360 100644
  
      @Override
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0217-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0217-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch
index ea9e23a544..627a3de5f6 100644
--- a/Spigot-Server-Patches/0217-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 5086b17a95581c2e6db5359144c215d354025377 Mon Sep 17 00:00:00 2001
+From 9b37d252cca84ac2fb7f722cbe42bd983595ff68 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7017c02ba..2ad238796 100644
+index bae10827a..273385ee0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -507,10 +507,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -70,7 +70,7 @@ index 7017c02ba..2ad238796 100644
  
      public void a(PacketPlayInSetCommandBlock packetplayinsetcommandblock) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c2e72dac2..9cf5807ee 100644
+index ec17eaf9d..cddd824c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1723,7 +1723,7 @@ public final class CraftServer implements Server {
@@ -127,5 +127,5 @@ index 1e3aae3b8..95d13c146 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0218-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0217-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 88%
rename from Spigot-Server-Patches/0218-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0217-Avoid-NPE-in-PathfinderGoalTempt.patch
index 7681e51a62..25b57a567b 100644
--- a/Spigot-Server-Patches/0218-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0217-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,11 +1,11 @@
-From 109389523c9af61ab6f0655f9ae68269f8fe752f Mon Sep 17 00:00:00 2001
+From 6aedfbae82f449bae1366f7c09bc1f46d2c68806 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index 8ca996e65..1b8247941 100644
+index 5cf9b1896..1f3ae55a0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -52,7 +52,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@@ -18,5 +18,5 @@ index 8ca996e65..1b8247941 100644
          }
      }
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0219-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0218-PlayerPickupExperienceEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0219-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0218-PlayerPickupExperienceEvent.patch
index c81de3c09b..1aa5849032 100644
--- a/Spigot-Server-Patches/0219-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0218-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 3f450566e42f24fc2cde31b2926431ec18137028 Mon Sep 17 00:00:00 2001
+From 371b2893fad6790037faf28546b8edf77b100716 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -19,5 +19,5 @@ index 404a222b4..4bcae2c21 100644
                  entityhuman.receive(this, 1);
                  ItemStack itemstack = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman);
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0219-ExperienceOrbMergeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0219-ExperienceOrbMergeEvent.patch
index 442f321825..d64dd38c0d 100644
--- a/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0219-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 273a0c3b097f14c48a6074d6cbe1a1ab445a9936 Mon Sep 17 00:00:00 2001
+From aee96001e75af09702f51549bc7336fdf72604e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ 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 228f4b28eb..0c57b36c8e 100644
+index 228f4b28e..0c57b36c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -404,7 +404,7 @@ public class CraftEventFactory {
@@ -21,5 +21,5 @@ index 228f4b28eb..0c57b36c8e 100644
                              if ((int) newTotal < 0) continue; // Overflow
                              if (maxValue > 0 && newTotal > (long)maxValue) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch
index dbd619bb21..045ea7b33c 100644
--- a/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 4c3b28ba3d9f79371d4233a6866480ac600f359d Mon Sep 17 00:00:00 2001
+From d477fc926aea0e4dcbee2979cb44c09ba5d508be Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 108ec49aa5..72f0bec4e1 100644
+index 108ec49aa..72f0bec4e 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -242,6 +242,7 @@ public class EnchantmentManager {
@@ -22,7 +22,7 @@ index 108ec49aa5..72f0bec4e1 100644
          List<ItemStack> list = enchantment.a(entityliving);
  
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 4bcae2c21b..09d85764b0 100644
+index 4bcae2c21..09d85764b 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -246,10 +246,12 @@ public class EntityExperienceOrb extends Entity {
@@ -39,7 +39,7 @@ index 4bcae2c21b..09d85764b0 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5ea54cb910..9a0bab5da0 100644
+index 01547b31e..52a463f75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1021,8 +1021,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -84,5 +84,5 @@ index 5ea54cb910..9a0bab5da0 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0222-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 96%
rename from Spigot-Server-Patches/0222-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch
index e736ee7792..f91d302120 100644
--- a/Spigot-Server-Patches/0222-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From a15b922aa1526f9dbc543fc0a36b69d11931206b Mon Sep 17 00:00:00 2001
+From 193187888801fbb2b7f54be6f15c78127f824bbe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@@ -39,5 +39,5 @@ index e428d4485..f481e5a4f 100644
              Iterator iterator2 = this.g.iterator();
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0223-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 98%
rename from Spigot-Server-Patches/0223-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch
index 7b0e3941fe..52c6e85c11 100644
--- a/Spigot-Server-Patches/0223-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From c703e646937694eef89f39aca50807f9c6cac216 Mon Sep 17 00:00:00 2001
+From 6a576fd91e6c21dca0af32180d32e465909b6440 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -107,5 +107,5 @@ index 193c3621c..cf1258c55 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0224-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0224-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch
index 15c9ad9a5f..ec4a9b37af 100644
--- a/Spigot-Server-Patches/0224-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 4fbd76666feb1e20f70b79f9deb27fb273113035 Mon Sep 17 00:00:00 2001
+From 62cbd17d1f0da41dc1c67a97e1dd82cbde999430 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -21,7 +21,7 @@ index 695bdf2e6..313dd9891 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index b4ee0a9c7..a5edc5bc2 100644
+index 1a347bae3..b9c76325d 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -167,7 +167,10 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -37,5 +37,5 @@ index b4ee0a9c7..a5edc5bc2 100644
  
      public void c(float f, float f1, float f2) {
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0225-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0224-PreCreatureSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0225-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0224-PreCreatureSpawnEvent.patch
index 005881b6ad..d2f02f1b10 100644
--- a/Spigot-Server-Patches/0225-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0224-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 6603f05cfc10b4537aa3ca2627062193db6e2d9f Mon Sep 17 00:00:00 2001
+From 09c7a957235c78d328efac0b90a69a6f4c4749ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -56,7 +56,7 @@ index 027ba7191..eca3f85ad 100644
  
                      if (entity == null) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 1ff5dcd85..d1715fdfb 100644
+index 2aa0db5c2..b57616960 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -164,10 +164,30 @@ public final class SpawnerCreature {
@@ -92,5 +92,5 @@ index 1ff5dcd85..d1715fdfb 100644
                                                                      entityinsentient = (EntityInsentient) biomebase_biomemeta.b.a((World) worldserver);
                                                                  } catch (Exception exception) {
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0226-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0225-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0226-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0225-PlayerNaturallySpawnCreaturesEvent.patch
index 3cde68fad5..e0da037076 100644
--- a/Spigot-Server-Patches/0226-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0225-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From 9682a401a3cf8adc29ee2cf949ecc43701d644d1 Mon Sep 17 00:00:00 2001
+From cc85d73644b4dcfeae066be7202558d876062be0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index d1715fdfb..72cd9ba58 100644
+index b57616960..e62616552 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -47,6 +47,15 @@ public final class SpawnerCreature {
@@ -29,5 +29,5 @@ index d1715fdfb..72cd9ba58 100644
                      for (int i1 = -b0; i1 <= b0; ++i1) {
                          for (k = -b0; k <= b0; ++k) {
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0226-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 95%
rename from Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0226-Add-setPlayerProfile-API-for-Skulls.patch
index 1d7fb89bf0..e4eaaff5a5 100644
--- a/Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0226-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From ca5edd7300c8cf5a4f6d2ead581cf00d80abd193 Mon Sep 17 00:00:00 2001
+From 38138854a7fc7b40af92b5cc810e42400b6ee380 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-index 110e04597b..c260af11cd 100644
+index 110e04597..c260af11c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 @@ -1,5 +1,7 @@
@@ -48,7 +48,7 @@ index 110e04597b..c260af11cd 100644
      public BlockFace getRotation() {
          BlockData blockData = getBlockData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 2ad3acf43b..87e51cf8ad 100644
+index 2ad3acf43..87e51cf8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -90,5 +90,5 @@ index 2ad3acf43b..87e51cf8ad 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0228-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0227-Fill-Profile-Property-Events.patch
similarity index 96%
rename from Spigot-Server-Patches/0228-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0227-Fill-Profile-Property-Events.patch
index 7f2383a62d..384dbf1d8a 100644
--- a/Spigot-Server-Patches/0228-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0227-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 7d4063a7135c1bb7d09900fde86a070b13290d82 Mon Sep 17 00:00:00 2001
+From b966e331f36e0c712453f48dfe5eb416300f26b4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -40,5 +40,5 @@ index 4b2a67423..61cfdf73c 100644
  
      @Override
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0229-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0228-PlayerAdvancementCriterionGrantEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0229-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0228-PlayerAdvancementCriterionGrantEvent.patch
index 05b1c62815..a052f71771 100644
--- a/Spigot-Server-Patches/0229-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0228-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From a3bd481882e2f69ddb4d1cff0cc7736c9f148d56 Mon Sep 17 00:00:00 2001
+From c8c50b83336ba0417338cbcb05d8c83eae6d31eb Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
@@ -22,5 +22,5 @@ index 519bccdad..c7ad71c5f 100644
              this.i.add(advancement);
              flag = true;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0229-Add-ArmorStand-Item-Meta.patch
similarity index 98%
rename from Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0229-Add-ArmorStand-Item-Meta.patch
index 2890a4fdfd..efe4ede476 100644
--- a/Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0229-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From d898f4b24d93bb4bdaedd2bbf416659bd0fc9fa8 Mon Sep 17 00:00:00 2001
+From d906a8427aca8749380cfd56bf4e91d343ab6cf3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 3a6e6f687d..6a86cb7eb4 100644
+index 3a6e6f687..6a86cb7eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -191,6 +191,8 @@ public final class CraftItemFactory implements ItemFactory {
@@ -26,7 +26,7 @@ index 3a6e6f687d..6a86cb7eb4 100644
          case CHEST:
          case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index d1a546c8f0..284630f74e 100644
+index d1a546c8f..284630f74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -403,6 +403,8 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index d1a546c8f0..284630f74e 100644
              case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 new file mode 100644
-index 0000000000..c00b89c8d4
+index 000000000..c00b89c8d
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -0,0 +1,311 @@
@@ -356,7 +356,7 @@ index 0000000000..c00b89c8d4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 5e823e1b1a..eaf4cd11c4 100644
+index 5e823e1b1..eaf4cd11c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -155,6 +155,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -385,7 +385,7 @@ index 5e823e1b1a..eaf4cd11c4 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 65b8123a8b..0ad0004b9f 100644
+index 65b8123a8..0ad0004b9 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -8,6 +8,7 @@ import java.util.Arrays;
@@ -416,5 +416,5 @@ index 65b8123a8b..0ad0004b9f 100644
  
          assertThat("Forgotten test?", providers, hasSize(ItemStackTest.COMPOUND_MATERIALS.length - 4/* Normal item meta, skulls, eggs and tile entities */));
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0230-Extend-Player-Interact-cancellation.patch
similarity index 97%
rename from Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0230-Extend-Player-Interact-cancellation.patch
index 4a9868d63d..b2fbac7711 100644
--- a/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0230-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From c9d537eabbe80fd57f2fef3120457965351fa96a Mon Sep 17 00:00:00 2001
+From 41bead639a922980337b87325f23ee2db0b5fa82 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 6ae6afa339..07f9b8d2f7 100644
+index 6ae6afa33..07f9b8d2f 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -111,6 +111,11 @@ public class PlayerInteractManager {
@@ -55,5 +55,5 @@ index 6ae6afa339..07f9b8d2f7 100644
              enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
          } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0232-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0231-Tameable-getOwnerUniqueId-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0232-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0231-Tameable-getOwnerUniqueId-API.patch
index 8a7c023ffe..4ad0524204 100644
--- a/Spigot-Server-Patches/0232-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0231-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From f29a7edad856cf6587e90c89fcdf5ec08d504e16 Mon Sep 17 00:00:00 2001
+From 34f613b9751e7445b797b5bd3364226353ac00f8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -35,5 +35,5 @@ index eaaebeab8..2e959321b 100644
          try {
              return getHandle().getOwnerUUID();
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 39bddd4c38..74393d9b60 100644
--- a/Spigot-Server-Patches/0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,4 +1,4 @@
-From 98c9114ac7b3c07e14234080c7ef7871b9d8792c Mon Sep 17 00:00:00 2001
+From 828d13db6aa9aa148e8cc13fd6442237ce390dda Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
@@ -21,7 +21,7 @@ index 313dd9891..56226bc86 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 610e76328..149731353 100644
+index 259f73f66..1640098c3 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1029,6 +1029,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -33,5 +33,5 @@ index 610e76328..149731353 100644
                      if (flag2) {
                          f *= 1.5F;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0233-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 94%
rename from Spigot-Server-Patches/0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0233-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index bb4ffb1bcc..6612436221 100644
--- a/Spigot-Server-Patches/0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0233-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From cd3976494de750293984da5f012611ef3de358fd Mon Sep 17 00:00:00 2001
+From f5b9ff3b853ac33b56b9f3b8c758b377dc387b43 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@@ -27,5 +27,5 @@ index ac81d3f86..f50bae012 100644
      }
  
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0234-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 59%
rename from Spigot-Server-Patches/0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0234-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 494f1d54d5..b80fb3a814 100644
--- a/Spigot-Server-Patches/0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0234-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,32 +1,32 @@
-From dd443010b1ebb8d120b26a24dccf8c1f10caf5bb Mon Sep 17 00:00:00 2001
+From bdb3742482bd69726b0f0711ff32b127efd0b45f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 792a69ad5..fa7407ba6 100644
+index 2c881be1e..2c4bbc789 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -25,7 +25,8 @@ public class BlockIceFrost extends BlockIce {
                      EnumDirection enumdirection = aenumdirection[j];
  
-                     blockposition_b.g(blockposition).c(enumdirection);
--                    IBlockData iblockdata1 = world.getType(blockposition_b);
-+                    IBlockData iblockdata1 = world.getTypeIfLoaded(blockposition_b); // Paper - don't load chunks
+                     blockposition_pooledblockposition.g(blockposition).c(enumdirection);
+-                    IBlockData iblockdata1 = world.getType(blockposition_pooledblockposition);
++                    IBlockData iblockdata1 = world.getTypeIfLoaded(blockposition_pooledblockposition); // Paper - don't load chunks
 +                    if (iblockdata1 == null) continue; // Paper
  
-                     if (iblockdata1.getBlock() == this && !this.c(iblockdata1, world, blockposition_b)) {
-                         world.getBlockTickList().a(blockposition_b, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
+                     if (iblockdata1.getBlock() == this && !this.c(iblockdata1, world, blockposition_pooledblockposition)) {
+                         world.getBlockTickList().a(blockposition_pooledblockposition, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
 @@ -87,7 +88,7 @@ public class BlockIceFrost extends BlockIce {
                  EnumDirection enumdirection = aenumdirection[l];
  
-                 blockposition_b.g(blockposition).c(enumdirection);
--                if (iblockaccess.getType(blockposition_b).getBlock() == this) {
-+                if (((World) iblockaccess).getBlockIfLoaded(blockposition_b) == this) { // Paper - don't load chunks
+                 blockposition_pooledblockposition.g(blockposition).c(enumdirection);
+-                if (iblockaccess.getType(blockposition_pooledblockposition).getBlock() == this) {
++                if (((World) iblockaccess).getBlockIfLoaded(blockposition_pooledblockposition) == this) { // Paper - don't load chunks
                      ++j;
                      if (j >= i) {
                          boolean flag = false;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0236-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0235-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 95%
rename from Spigot-Server-Patches/0236-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0235-Disable-Explicit-Network-Manager-Flushing.patch
index 17e44dd2e3..6a93f03bff 100644
--- a/Spigot-Server-Patches/0236-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0235-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From da2021ad134355be28703552fa4fb8ffe062cfb8 Mon Sep 17 00:00:00 2001
+From 184de510ade87607a3f9fdcb30fb2da3335fb8fe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@@ -33,5 +33,5 @@ index 2ff2549d0..4a50aab51 100644
  
          if (this.u++ % 20 == 0) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0237-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0236-Implement-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0237-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0236-Implement-extended-PaperServerListPingEvent.patch
index d403320502..d2a2d9e7f4 100644
--- a/Spigot-Server-Patches/0237-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0236-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 88af45c086f6c9a71ddcbfe68e612d383a590929 Mon Sep 17 00:00:00 2001
+From 6af80d440e9fb1675a85122c6535be9121f54af3 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -177,7 +177,7 @@ index 000000000..a85466bc7
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f5ad783c5..c562ba546 100644
+index 5517c5fe8..476a729dd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,6 +1,7 @@
@@ -259,5 +259,5 @@ index 56f135f24..9c442dee2 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0238-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0237-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0238-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0237-Improved-Async-Task-Scheduler.patch
index 816e2f4a3d..bd5bbf6897 100644
--- a/Spigot-Server-Patches/0238-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0237-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From 69b9dc4bb89f52b2eda30c40b552efced841414f Mon Sep 17 00:00:00 2001
+From 735f2ec6beacea16da0eb46c12d02f522cfc3c4a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
@@ -373,5 +373,5 @@ index 3ef79e3e9..3acfc0766 100644
  
      private boolean isReady(final int currentTick) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0238-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 97%
rename from Spigot-Server-Patches/0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0238-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index be39926919..39269662b0 100644
--- a/Spigot-Server-Patches/0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0238-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 02923a0060670bc76eef8a1a74bd53b02fe42234 Mon Sep 17 00:00:00 2001
+From 09d0acccaf56907fd3d3948de70a40bd89560653 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -44,5 +44,5 @@ index 15c01333e..da5a7b3e9 100644
                              if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                  final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0240-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0239-Call-PortalCreateEvent-for-exit-portals.patch
similarity index 98%
rename from Spigot-Server-Patches/0240-Call-PortalCreateEvent-for-exit-portals.patch
rename to Spigot-Server-Patches/0239-Call-PortalCreateEvent-for-exit-portals.patch
index b4d277c3fb..5d89f76262 100644
--- a/Spigot-Server-Patches/0240-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0239-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,11 +1,11 @@
-From a001b53e9f4c971c4747d451f51ee92d4a47968e Mon Sep 17 00:00:00 2001
+From bdaa9d012700842538d78f99bbdcdbaf26688753 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sun, 18 Mar 2018 15:44:44 +0100
 Subject: [PATCH] Call PortalCreateEvent for exit portals
 
 
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 434589adb..7e858bab4 100644
+index aca407142..a24bd02d5 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -48,6 +48,9 @@ public class PortalTravelAgent {
@@ -104,5 +104,5 @@ index 434589adb..7e858bab4 100644
      }
  
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch
index 5d6e91d4d5..48789aa4b2 100644
--- a/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 9b9b51f4a1e80586fd1cff1815e9bba49c8f2272 Mon Sep 17 00:00:00 2001
+From f2a9844d0bbb0a5768592e8915f28dde97969a2f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d8b884e32d..5d5e08ad5e 100644
+index 1640098c3..7f29d1277 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -63,7 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index d8b884e32d..5d5e08ad5e 100644
      private final ItemCooldown ce;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index da5a7b3e92..c5801122dd 100644
+index da5a7b3e9..c5801122d 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -48,7 +48,7 @@ index da5a7b3e92..c5801122dd 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9a0bab5da0..4f849ab1a1 100644
+index 52a463f75..66192415d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -139,5 +139,5 @@ index 9a0bab5da0..4f849ab1a1 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0241-Fix-Dragon-Server-Crashes.patch
similarity index 94%
rename from Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0241-Fix-Dragon-Server-Crashes.patch
index ea6a31ee79..562aef39f5 100644
--- a/Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0241-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From c723aaf4cf2e41f4ddced72a54686523ebe8fccc Mon Sep 17 00:00:00 2001
+From efd5c5166b40afc7c097133594bb0ad29b43dcb8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
@@ -20,5 +20,5 @@ index 1180e7bc1..1906bcfc9 100644
                  blockposition_mutableblockposition.c(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
              }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0243-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0243-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch
index 75c153d31d..687fba0ca5 100644
--- a/Spigot-Server-Patches/0243-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 37cc02d40b2b191de136bd4687556b1bde2015d1 Mon Sep 17 00:00:00 2001
+From 9fbfb40a23093f741ad240fddd85057b400d9987 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9cf5807ee..296e338c8 100644
+index cddd824c3..95d51fb5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1416,6 +1416,26 @@ public final class CraftServer implements Server {
@@ -40,5 +40,5 @@ index 9cf5807ee..296e338c8 100644
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0244-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0243-Make-player-data-saving-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0244-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0243-Make-player-data-saving-configurable.patch
index 7800175331..c657f50d9e 100644
--- a/Spigot-Server-Patches/0244-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0243-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From db7f5c905af40c27d82de4775172e0de67666f6e Mon Sep 17 00:00:00 2001
+From d58753f3ebf083c564382b1300d98339a9b1db78 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
 Subject: [PATCH] Make player data saving configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 305a1258f..5c18e5770 100644
+index 68c287026..3d924fd80 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -291,4 +291,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 305a1258f..5c18e5770 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 0fd6efec0..7553280d2 100644
+index c4173c0aa..d5e21cc33 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -141,6 +141,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@@ -35,5 +35,5 @@ index 0fd6efec0..7553280d2 100644
              NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
              File file = new File(this.playerDir, entityhuman.bu() + ".dat.tmp");
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0245-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0244-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0245-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0244-Make-legacy-ping-handler-more-reliable.patch
index ce5ee6f8c9..4dc6274bd1 100644
--- a/Spigot-Server-Patches/0245-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0244-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From 70c73da3afa8adfbe7458fea7e5e4e41554f7d8c Mon Sep 17 00:00:00 2001
+From 469e2da778fca341cf8e258104fc6eb1e9a65fe6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index cb2b9c368..976888b66 100644
+index 204aa8229..2a99f34df 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
@@ -167,5 +167,5 @@ index cb2b9c368..976888b66 100644
          channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
      }
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0246-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0245-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 99%
rename from Spigot-Server-Patches/0246-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0245-Call-PaperServerListPingEvent-for-legacy-pings.patch
index ebb84dc895..862b300a5b 100644
--- a/Spigot-Server-Patches/0246-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0245-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From bc85306ab6c9b3b7dc491341fad4753155a7d9bf Mon Sep 17 00:00:00 2001
+From b3bd0e775606113e72dcfd82c4625bf7ce4c5362 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@@ -153,5 +153,5 @@ index 2a99f34df..2a30af7de 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch
index d2d47c4068..9115813ff2 100644
--- a/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 31443c27ba1f2d3c990ac68ba75539433f774c43 Mon Sep 17 00:00:00 2001
+From 116352b0a8afcb39408d560294b3561155ebe1e2 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 59f74abaf..0753a0f26 100644
+index 66192415d..e8450a565 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -131,6 +131,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -30,5 +30,5 @@ index 59f74abaf..0753a0f26 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0247-Add-method-to-open-already-placed-sign.patch
similarity index 92%
rename from Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0247-Add-method-to-open-already-placed-sign.patch
index a546a82e37..e77f392174 100644
--- a/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0247-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From 95cec79483b836faea4891a9aff576091bf11136 Mon Sep 17 00:00:00 2001
+From 4d724d6d4fd700c9305718d7c6ffff06e7444a8c Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index af51b3def5..b82aa903ca 100644
+index d5dbc4ca8..9b19dce9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -655,4 +655,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -27,5 +27,5 @@ index af51b3def5..b82aa903ca 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0249-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0248-Load-version-history-at-server-start.patch
similarity index 88%
rename from Spigot-Server-Patches/0249-Load-version-history-at-server-start.patch
rename to Spigot-Server-Patches/0248-Load-version-history-at-server-start.patch
index 9bdc363f7d..c5ee7aabe9 100644
--- a/Spigot-Server-Patches/0249-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0248-Load-version-history-at-server-start.patch
@@ -1,11 +1,11 @@
-From 957c7817dad93a9d8cf4f0d4a104282337050884 Mon Sep 17 00:00:00 2001
+From b2b8830714ab48755af790bc49ace95f70f1ac8a Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:38:14 -0600
 Subject: [PATCH] Load version history at server start
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fb9db65ee..3dc7e2a89 100644
+index 0d2c7a6dc..437ac386a 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -212,6 +212,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -17,5 +17,5 @@ index fb9db65ee..3dc7e2a89 100644
  
              DedicatedServer.LOGGER.info("Generating keypair");
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0250-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch
similarity index 94%
rename from Spigot-Server-Patches/0250-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch
index 4c86c23183..2f79676e11 100644
--- a/Spigot-Server-Patches/0250-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 3f5a8b894d2cb8f863f1066c08474c1e92728613 Mon Sep 17 00:00:00 2001
+From 623810aef4870a0628e85110d07d591dd78eaed9 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -20,7 +20,7 @@ index 56226bc86..6bb54fcbd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cae5d323e..260478166 100644
+index 7f29d1277..d4618d644 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1081,7 +1081,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -37,5 +37,5 @@ index cae5d323e..260478166 100644
  
                          if (flag3) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0250-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 86%
rename from Spigot-Server-Patches/0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0250-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 4e9cc5e499..7d0df8a717 100644
--- a/Spigot-Server-Patches/0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0250-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,14 +1,14 @@
-From e5a7d6787e3f20b05192d5a1bcf6929ed1c99080 Mon Sep 17 00:00:00 2001
+From c1f825af2f4c12870a088a79779702d2056911c5 Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2ad238796..1fdffcfb0 100644
+index 273385ee0..5ffb2cd34 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2480,7 +2480,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2464,7 +2464,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
@@ -18,5 +18,5 @@ index 2ad238796..1fdffcfb0 100644
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
              this.server.getPluginManager().callEvent(event);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0252-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0251-EndermanEscapeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0252-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0251-EndermanEscapeEvent.patch
index e0870455fe..f5dce47d3e 100644
--- a/Spigot-Server-Patches/0252-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0251-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From ca6893396d1e8de4d24ee5b0a93039d12b86d2e0 Mon Sep 17 00:00:00 2001
+From fe971f1d83405580471c21f76c03dedbe9ba515e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -78,5 +78,5 @@ index d5d1be8b6..8949529e6 100644
                          }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0253-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0252-Enderman.teleportRandomly.patch
similarity index 95%
rename from Spigot-Server-Patches/0253-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0252-Enderman.teleportRandomly.patch
index df47649994..a88e782bec 100644
--- a/Spigot-Server-Patches/0253-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0252-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From f2a03bf6e79f1691db683285e1a911c8df456791 Mon Sep 17 00:00:00 2001
+From 0f24704e5978af4e48331ad81d569ad2c376b660 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -30,5 +30,5 @@ index b81693d9f..9bc6a6c0c 100644
          IBlockData blockData = getHandle().getCarried();
          return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0254-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch
similarity index 95%
rename from Spigot-Server-Patches/0254-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch
index 29d316bb86..a2f44ad7f6 100644
--- a/Spigot-Server-Patches/0254-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From cc5ce481cb20c7fec2258936b71ba6d8a478b561 Mon Sep 17 00:00:00 2001
+From bab81459f33357301c77cb9d0577cb8dd7c46fb7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -27,7 +27,7 @@ index 6bb54fcbd..9aba755a4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 431afaf2f..8d41efe8f 100644
+index bab5b89fe..62b5b6ece 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -242,6 +242,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -39,5 +39,5 @@ index 431afaf2f..8d41efe8f 100644
      }
  
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0254-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 96%
rename from Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0254-Expand-World.spawnParticle-API-and-add-Builder.patch
index f8ce0ebcca..e8ccaa9b06 100644
--- a/Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0254-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 6aa64df4448fff5553dc2362aee471c55842754d Mon Sep 17 00:00:00 2001
+From ab66716dc0b5e3805a0c0f4ed99ad9602148df1d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ee09f4c5a0..e4730352d3 100644
+index ee09f4c5a..e4730352d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1183,12 +1183,17 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -34,7 +34,7 @@ index ee09f4c5a0..e4730352d3 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 36d27c2a3e..d064967620 100644
+index 36d27c2a3..d06496762 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1761,11 +1761,17 @@ public class CraftWorld implements World {
@@ -57,5 +57,5 @@ index 36d27c2a3e..d064967620 100644
                  x, y, z, // Position
                  count,  // Count
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0256-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0255-EndermanAttackPlayerEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0256-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0255-EndermanAttackPlayerEvent.patch
index 0e25923333..4b080fc8c4 100644
--- a/Spigot-Server-Patches/0256-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0255-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 2adf65a4aa830a89ec79a5b94bf515a5eb29d94b Mon Sep 17 00:00:00 2001
+From f16ebdf88533538730e5af25c7190e3d5682abf3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -28,5 +28,5 @@ index 233568cc1..139a70ca3 100644
  
          if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0257-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0256-WitchConsumePotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0257-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0256-WitchConsumePotionEvent.patch
index 111f8870f0..5c83f87414 100644
--- a/Spigot-Server-Patches/0257-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0256-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From 26d079a08350eced70d6ca1f352a07ee74d2450d Mon Sep 17 00:00:00 2001
+From bf0fd9808cf4a71b63f0f3146854e135737671d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -23,5 +23,5 @@ index eaae9ea9a..0d579c7e4 100644
                          if (list != null) {
                              Iterator iterator = list.iterator();
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0258-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0257-WitchThrowPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0258-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0257-WitchThrowPotionEvent.patch
index 01b7ab2302..4949c9a265 100644
--- a/Spigot-Server-Patches/0258-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0257-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 5370abcb90e08348765c6ccccce25986d373bdb2 Mon Sep 17 00:00:00 2001
+From 553a1d5f3c85f0277530ba41dac7c5346947882b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index f7d809444..11a8af15e 100644
+index 0d579c7e4..62f99fc3b 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -154,7 +154,15 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
@@ -27,5 +27,5 @@ index f7d809444..11a8af15e 100644
              entitypotion.pitch -= -20.0F;
              entitypotion.shoot(d1, d2 + (double) (f1 * 0.2F), d3, 0.75F, 8.0F);
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0258-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 94%
rename from Spigot-Server-Patches/0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0258-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 323d925cfd..3891c5c07c 100644
--- a/Spigot-Server-Patches/0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0258-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 910391e6e6bdf76769a34ec6b860b5f0579f9bb0 Mon Sep 17 00:00:00 2001
+From e8d18a60dd770cc4ad0669438ae552e892994b8b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -23,5 +23,5 @@ index d06496762..a436ded60 100644
              entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
          } else if (Projectile.class.isAssignableFrom(clazz)) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0260-Configurable-Villages-loading-chunks-for-door-checks.patch b/Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch
similarity index 98%
rename from Spigot-Server-Patches/0260-Configurable-Villages-loading-chunks-for-door-checks.patch
rename to Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch
index 1a2d83c05e..0b3fa167c6 100644
--- a/Spigot-Server-Patches/0260-Configurable-Villages-loading-chunks-for-door-checks.patch
+++ b/Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch
@@ -1,4 +1,4 @@
-From f7f2d007e5e3d22d55540e90008f7ff619be130e Mon Sep 17 00:00:00 2001
+From 9467d4c80d0a12a9699615796ddfff76e80a0985 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Configurable Villages loading chunks for door checks
@@ -45,7 +45,7 @@ index 7a9fb9753..e40cd4186 100644
  
      public void a(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index c99d4debc..c63f70b1f 100644
+index b79457291..1363c53ff 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -11,10 +11,10 @@ import javax.annotation.Nullable;
@@ -124,5 +124,5 @@ index 33ad5faa3..1edffc462 100644
          this.d = i;
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0261-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0260-WitchReadyPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0261-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0260-WitchReadyPotionEvent.patch
index 6996a3eb43..4f00d9b983 100644
--- a/Spigot-Server-Patches/0261-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0260-WitchReadyPotionEvent.patch
@@ -1,11 +1,11 @@
-From 53b135e8dea526b9a7d123f3f03375c56e5087d6 Mon Sep 17 00:00:00 2001
+From e691c3a54819fb82ea763ee65bc67736ce990965 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 11a8af15e..896388c41 100644
+index 62f99fc3b..feedfc9d9 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -100,7 +100,11 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
@@ -22,5 +22,5 @@ index 11a8af15e..896388c41 100644
                      this.a(true);
                      this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_WITCH_DRINK, this.bV(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0262-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0261-ItemStack-getMaxItemUseDuration.patch
similarity index 93%
rename from Spigot-Server-Patches/0262-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0261-ItemStack-getMaxItemUseDuration.patch
index 8a9e1f90cc..214a81fe3f 100644
--- a/Spigot-Server-Patches/0262-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0261-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From d0e12406e3b5a779929007d5132ffd5108eb58a6 Mon Sep 17 00:00:00 2001
+From f6046d8c629d430a2905a0c7c6aae297874e9f7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 23:00:29 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index c08c1e8e4..8f2b0742d 100644
+index f26ace5cd..713977e3c 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -527,6 +527,7 @@ public final class ItemStack {
@@ -36,5 +36,5 @@ index 284630f74..1282ee399 100644
      public void addUnsafeEnchantment(Enchantment ench, int level) {
          Validate.notNull(ench, "Cannot add null enchantment");
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0263-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0262-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0263-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0262-Implement-EntityTeleportEndGatewayEvent.patch
index 50bb1fec06..09c4885ee9 100644
--- a/Spigot-Server-Patches/0263-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0262-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,11 +1,11 @@
-From 0d412c9b25938e45fff9bb813e6f9edd9cae9c51 Mon Sep 17 00:00:00 2001
+From 56676e418b82651d08584c7796dde227128c7859 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index af71c7c48..8b52a25ec 100644
+index d2b29ecbe..2af225021 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -138,8 +138,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -30,5 +30,5 @@ index af71c7c48..8b52a25ec 100644
  
              this.f();
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0264-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0263-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 93%
rename from Spigot-Server-Patches/0264-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0263-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 3a281e5af3..d50617f50c 100644
--- a/Spigot-Server-Patches/0264-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0263-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 89460708a2e3800f898082e23a95f44de51a2995 Mon Sep 17 00:00:00 2001
+From 5ad10a79ab1be9173465d09b1a35079f5152242f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 01:18:49 -0400
 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index fb76dc18b..73d9d3b2c 100644
+index b6af42904..a07337ae4 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
@@ -27,5 +27,5 @@ index fb76dc18b..73d9d3b2c 100644
              // CraftBukkit end
          }
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0265-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch
similarity index 94%
rename from Spigot-Server-Patches/0265-Properly-remove-entities-on-dimension-teleport.patch
rename to Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch
index 59438e3e50..76a1e3b26e 100644
--- a/Spigot-Server-Patches/0265-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From fc66da2297c31678b873891cfc210bafde45c4e2 Mon Sep 17 00:00:00 2001
+From 41555aaf3ad7b457129248b588529ebdc76a2089 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
@@ -22,7 +22,7 @@ requirement, but plugins (such as my own) use this method to
 trigger a "reload" of the entity on the client.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e64d032b7f..f54e9784c4 100644
+index c59f137f0..f7a3e2ce7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2608,7 +2608,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index e64d032b7f..f54e9784c4 100644
              this.world.methodProfiler.enter("reposition");
              /* CraftBukkit start - Handled in calculateTarget
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e4730352d3..c08ee62e84 100644
+index e4730352d..c08ee62e8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -997,6 +997,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -47,5 +47,5 @@ index e4730352d3..c08ee62e84 100644
          this.entitiesById.d(entity.getId());
          this.entitiesByUUID.remove(entity.getUniqueID());
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0266-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch
similarity index 94%
rename from Spigot-Server-Patches/0266-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch
index d5930487ee..cb311c658e 100644
--- a/Spigot-Server-Patches/0266-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From a8aaa82fc8fca58ee9cab877c23dbb674f02d44b Mon Sep 17 00:00:00 2001
+From 9ccdc6edf0547373e3e6ffd692099c5f54b4a069 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 8b0f530ba..633cf7b30 100644
+index 67530ba0f..d4a8fb16b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -542,14 +542,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -45,5 +45,5 @@ index 8b0f530ba..633cf7b30 100644
  
      public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0267-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0266-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from Spigot-Server-Patches/0267-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0266-Configurable-Alternative-LootPool-Luck-Formula.patch
index cf1dd5e099..e58d3ff8ab 100644
--- a/Spigot-Server-Patches/0267-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0266-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From c8284559251c0f3e8d9451c4a7e95b3a5b006599 Mon Sep 17 00:00:00 2001
+From 0153d967248e1a2b8ea247d88c9a52446197fa38 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5c18e5770..48b0a742a 100644
+index 3d924fd80..361b3c9e9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -300,4 +300,12 @@ public class PaperConfig {
@@ -104,5 +104,5 @@ index 3e313bba7..80f9f9a25 100644
      public abstract void a(Collection<ItemStack> collection, Random random, LootTableInfo loottableinfo);
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0268-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0267-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 88%
rename from Spigot-Server-Patches/0268-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0267-Print-Error-details-when-failing-to-save-player-data.patch
index d9de18978f..b79d61a17d 100644
--- a/Spigot-Server-Patches/0268-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0267-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,11 +1,11 @@
-From 4b7926e5b453411ba73aab8df0c3a03898071b64 Mon Sep 17 00:00:00 2001
+From 0d831d5219f4f9ece92fce6eeabcf36870bc4cfd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 20:37:03 -0400
 Subject: [PATCH] Print Error details when failing to save player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 7553280d2..ab085788a 100644
+index d5e21cc33..577ba1b5f 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -154,7 +154,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@@ -18,5 +18,5 @@ index 7553280d2..ab085788a 100644
  
      }
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0269-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0269-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch
index 1750fbfde5..1f5c87cb15 100644
--- a/Spigot-Server-Patches/0269-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch
@@ -1,4 +1,4 @@
-From 1156ee87e9e5e134ce99184906330ab7d395fb0f Mon Sep 17 00:00:00 2001
+From 2d496d8c12f0e17ce2f0a22c563ca216ac0a4373 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
@@ -19,7 +19,7 @@ index 2033ace4f..875650b8d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 49e55ebdb..866fd90ce 100644
+index 02fcfc449..deb50b84f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2701,7 +2701,7 @@ public abstract class EntityLiving extends Entity {
@@ -69,5 +69,5 @@ index 2f96842bb..8e65bfc78 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0270-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0269-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 95%
rename from Spigot-Server-Patches/0270-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0269-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 4beb8c3645..98b7be5043 100644
--- a/Spigot-Server-Patches/0270-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0269-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From fd52f1040f689774b9105819a6593fca83013006 Mon Sep 17 00:00:00 2001
+From 4d741d79e00149f2ade3d413f34ddb333131b54b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 16:23:38 -0400
 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
@@ -32,5 +32,5 @@ index 5a21aed43..4d9f3d369 100644
          }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0270-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 96%
rename from Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0270-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index e9b1cfd14b..08f7faec62 100644
--- a/Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0270-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 4cecc779c616eee62691db263753aef45e345bfc Mon Sep 17 00:00:00 2001
+From d80a4b17e1c8d28526426a21fd09a901b298b40b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index 749a8a5272..6e2ee04c77 100644
+index 749a8a527..6e2ee04c7 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -152,7 +152,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index 749a8a5272..6e2ee04c77 100644
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 6934114005..52bc68e6a6 100644
+index 693411400..52bc68e6a 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -55,6 +55,7 @@ public class ItemBow extends Item {
@@ -59,7 +59,7 @@ index 6934114005..52bc68e6a6 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0c57b36c8e..e75c188b5e 100644
+index 0c57b36c8..e75c188b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -332,7 +332,7 @@ public class CraftEventFactory {
@@ -81,5 +81,5 @@ index 0c57b36c8e..e75c188b5e 100644
  
          return event;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0272-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0271-PlayerReadyArrowEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0272-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0271-PlayerReadyArrowEvent.patch
index 37cbb9cd81..8fdd6d08c8 100644
--- a/Spigot-Server-Patches/0272-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0271-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From a2615ce98c342a8618229c37ff2b050ac3e8789d Mon Sep 17 00:00:00 2001
+From 17c90fda2396b574e67a8073b8e7c962e09f4cd6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 52bc68e6a6..f8dbc3c400 100644
+index 52bc68e6a..f8dbc3c40 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -1,5 +1,7 @@
@@ -76,5 +76,5 @@ index 52bc68e6a6..f8dbc3c400 100644
          if (!entityhuman.abilities.canInstantlyBuild && !flag) {
              return flag ? new InteractionResultWrapper<>(EnumInteractionResult.PASS, itemstack) : new InteractionResultWrapper<>(EnumInteractionResult.FAIL, itemstack);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0273-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0272-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 93%
rename from Spigot-Server-Patches/0273-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0272-Fire-EntityShootBowEvent-for-Illusioner.patch
index e7e5846a61..3a7ce01378 100644
--- a/Spigot-Server-Patches/0273-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0272-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,11 +1,11 @@
-From 2f7f07012b3ef439c0d93e98378815f01000dd92 Mon Sep 17 00:00:00 2001
+From f34f47817491a0b6e37e1779964f96dd5cf83240 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 22:19:36 -0400
 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 4aee9d794..f62b38c35 100644
+index 08af4453f..8b595979e 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -123,8 +123,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -29,5 +29,5 @@ index 4aee9d794..f62b38c35 100644
  
      protected EntityArrow v(float f) {
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0274-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0273-Implement-EntityKnockbackByEntityEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0274-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0273-Implement-EntityKnockbackByEntityEvent.patch
index 6ae4ad273c..b7f5305ad5 100644
--- a/Spigot-Server-Patches/0274-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0273-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 387b89e5a2142154b75d78517dd7308cda269adb Mon Sep 17 00:00:00 2001
+From fe425522ea63caa0bf747aeff4b7d92b27dd1506 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 67ed48652..8aef335a1 100644
+index deb50b84f..164e4b412 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1251,6 +1251,12 @@ public abstract class EntityLiving extends Entity {
@@ -42,5 +42,5 @@ index 67ed48652..8aef335a1 100644
      }
  
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0275-Expand-Explosions-API.patch b/Spigot-Server-Patches/0274-Expand-Explosions-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0275-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0274-Expand-Explosions-API.patch
index d3a9d65a0b..b3fe19df7f 100644
--- a/Spigot-Server-Patches/0275-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0274-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 0e16be3c8535594ae8167bc60e9b0d7cf5e4b1a6 Mon Sep 17 00:00:00 2001
+From 6df78c6dfa67a9a87e28b71732f6d6db344bb618 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -22,5 +22,5 @@ index a436ded60..35f8f93c6 100644
      public boolean createExplosion(Location loc, float power) {
          return createExplosion(loc, power, false);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0276-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0275-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0276-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0275-LivingEntity-Hand-Raised-Item-Use-API.patch
index 57afdc1371..1ee619175b 100644
--- a/Spigot-Server-Patches/0276-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0275-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 2d800eaf6113cd7a62575bfd80b4dd77a85e01bf Mon Sep 17 00:00:00 2001
+From 62cda842f8e05b1ba09d00b2b213f60364646754 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8687c0a86..fa4c593de 100644
+index 164e4b412..bc1ab273b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
@@ -62,5 +62,5 @@ index 8e65bfc78..52834b6da 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0277-RangedEntity-API.patch b/Spigot-Server-Patches/0276-RangedEntity-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0277-RangedEntity-API.patch
rename to Spigot-Server-Patches/0276-RangedEntity-API.patch
index b5a68e03cc..7770f45809 100644
--- a/Spigot-Server-Patches/0277-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0276-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 86975a3f763aea0432c2ea606d4aff04ee33c683 Mon Sep 17 00:00:00 2001
+From 3f0e1b8934a82c3b3c27364cec3c0c02dee03599 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 22:00:49 -0400
 Subject: [PATCH] RangedEntity API
@@ -159,5 +159,5 @@ index 3df0fcb9b..a1d04ff28 100644
      private BossBar bossBar;
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0278-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 97%
rename from Spigot-Server-Patches/0278-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch
index 9624e8cee0..a83eaaecf9 100644
--- a/Spigot-Server-Patches/0278-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,4 +1,4 @@
-From 90ed98347acb886351bbc2fc37e14f9e64715e95 Mon Sep 17 00:00:00 2001
+From 726761caf70e3e00e5ffb2c57512b7f1eaf2a301 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
@@ -47,5 +47,5 @@ index a6259d9e6..aad7ce93f 100644
          if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
              if (nbttagcompound.b("DragonUUID")) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0279-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0278-Implement-World.getEntity-UUID-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0279-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0278-Implement-World.getEntity-UUID-API.patch
index f13d5ce642..84d40cd819 100644
--- a/Spigot-Server-Patches/0279-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0278-Implement-World.getEntity-UUID-API.patch
@@ -1,4 +1,4 @@
-From bb7bf7e2a58190bf61bb7a89b204dca34e778826 Mon Sep 17 00:00:00 2001
+From 90c284c82dd7c3f2b4aebd9f0dadc35336335f5f Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
@@ -24,5 +24,5 @@ index 35f8f93c6..2fca59f8f 100644
      // Spigot start
          save(true);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch
index a2a81d048c..2c924f7f78 100644
--- a/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 9045427bfbc7fb6cc77450ae8182d52cf4fce381 Mon Sep 17 00:00:00 2001
+From a3bcf6f34aeef3c2d225a81b1df7ed35c134abb5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -110,10 +110,10 @@ index e4e1d999e..dc72538de 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ca5665137..38c784e75 100644
+index 5ffb2cd34..a00b271b2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2016,7 +2016,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2000,7 +2000,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
diff --git a/Spigot-Server-Patches/0281-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0280-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 97%
rename from Spigot-Server-Patches/0281-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0280-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 070187ea7b..10d1d3a2b7 100644
--- a/Spigot-Server-Patches/0281-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0280-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From 84d6829023a55809a241a8dd80499bb2c90b7d35 Mon Sep 17 00:00:00 2001
+From d059aee7f3cf690c8173570c63b736fdf971921f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 03:39:51 -0400
 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk
@@ -22,7 +22,7 @@ index 3ca579e38..1c1f39524 100644
          this.a(entity, entity.chunkY);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d7c1c96a9..c6615b5a7 100644
+index 08ad88c14..9befa890b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1192,12 +1192,15 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -85,5 +85,5 @@ index d7c1c96a9..c6615b5a7 100644
              }
          }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0282-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0282-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch
index dd2cc18741..4cec957722 100644
--- a/Spigot-Server-Patches/0282-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 27493cc4d5dbc4979536427a27c72212d0521c03 Mon Sep 17 00:00:00 2001
+From 36acae6d7bd94abfd53508a8a7e9af5729c8c990 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -101,5 +101,5 @@ index 06f627002..d81a2db6c 100644
          return iblockaccess.getType(blockposition.down()).q() && !iblockaccess.getType(blockposition).getMaterial().isBuildable() && !iblockaccess.getType(blockposition.up()).getMaterial().isBuildable();
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0283-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0282-Vex-getSummoner-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0283-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0282-Vex-getSummoner-API.patch
index 8a2f61b097..5b52ec2eac 100644
--- a/Spigot-Server-Patches/0283-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0282-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From acaa925fc0a60fa1089fdba56b3197f7d74b20b3 Mon Sep 17 00:00:00 2001
+From a89b899dbc110d276fc9e4e1e805f85e8a08db47 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:30:22 -0400
 Subject: [PATCH] Vex#getSummoner API
@@ -18,7 +18,7 @@ index 388d34126..c3864b869 100644
          return this.b;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 787a41e01..927ed9a9a 100644
+index 0f01fc591..c96a5df80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -1,8 +1,10 @@
@@ -47,5 +47,5 @@ index 787a41e01..927ed9a9a 100644
      public String toString() {
          return "CraftVex";
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0284-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0283-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 88%
rename from Spigot-Server-Patches/0284-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0283-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 9757959a4b..a39266cb2c 100644
--- a/Spigot-Server-Patches/0284-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0283-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 18dc435476b4008046ffb520fcb7adaea73f993e Mon Sep 17 00:00:00 2001
+From 5f819f6f6d0720cbb42f542d5f16240b3bfd5ce3 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index adc57a374..9c1c1fbb4 100644
+index a00b271b2..9394d60d9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1931,6 +1931,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1915,6 +1915,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      }
  
                      if (event.isCancelled()) {
@@ -28,5 +28,5 @@ index adc57a374..9c1c1fbb4 100644
                      }
                      // CraftBukkit end
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0285-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0284-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 91%
rename from Spigot-Server-Patches/0285-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0284-Don-t-change-the-Entity-Random-seed-for-squids.patch
index df935506e9..de52d94b0d 100644
--- a/Spigot-Server-Patches/0285-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0284-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,4 +1,4 @@
-From e1ff26f4ec7d8088d2961c986f9b60c1e4b1c530 Mon Sep 17 00:00:00 2001
+From 1392b62b543545f39bd24d9bea933ab4c3223dd6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:05:00 -0400
 Subject: [PATCH] Don't change the Entity Random seed for squids
@@ -18,5 +18,5 @@ index b9c76325d..ab79317a2 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0286-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0285-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 92%
rename from Spigot-Server-Patches/0286-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0285-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 005fd99f0b..72b532df68 100644
--- a/Spigot-Server-Patches/0286-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0285-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 22931a13533f9de81b52b12373d1c87a8f8ebdd3 Mon Sep 17 00:00:00 2001
+From c1163e0b159552622d66012f82923ef4a24c7b84 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c08ee62e84..85a30652c4 100644
+index c08ee62e8..85a30652c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -963,7 +963,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -22,5 +22,5 @@ index c08ee62e84..85a30652c4 100644
                      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0287-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
similarity index 92%
rename from Spigot-Server-Patches/0287-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
rename to Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
index e790963bb6..a09cd093fa 100644
--- a/Spigot-Server-Patches/0287-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ b/Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
@@ -1,4 +1,4 @@
-From 4bdb7307f4c4f3e07590359da354c417abdcd6a0 Mon Sep 17 00:00:00 2001
+From 11804fc6af089b140904ea3aaf81757aee10206b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:23:00 -0400
 Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for
@@ -12,7 +12,7 @@ keep it vanilla in behavior
 a player may teleport away, and trigger instant despawn
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index d670b6ba4..8317ecea8 100644
+index 98e214cdd..ee5078370 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -634,6 +634,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -25,5 +25,5 @@ index d670b6ba4..8317ecea8 100644
  
              if (entityhuman != null && entityhuman.affectsSpawning) { // Paper - Affects Spawning API
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0288-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0287-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 89%
rename from Spigot-Server-Patches/0288-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0287-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index d65cef3381..5a6597c245 100644
--- a/Spigot-Server-Patches/0288-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0287-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From b1305dada61e75f04e84c20141fa9e1228db873e Mon Sep 17 00:00:00 2001
+From cbcb5513c2dd25b08035877ac014282b934d84f0 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 16 Jul 2018 12:42:20 +0200
 Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 2b67fa834..d11e4d3d8 100644
+index 85f80741c..6752d0b8c 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -173,6 +173,10 @@ public class EntityItem extends Entity {
@@ -20,5 +20,5 @@ index 2b67fa834..d11e4d3d8 100644
          double radius = world.spigotConfig.itemMerge;
          Iterator iterator = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius)).iterator();
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0289-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0288-Use-asynchronous-Log4j-2-loggers.patch
similarity index 90%
rename from Spigot-Server-Patches/0289-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0288-Use-asynchronous-Log4j-2-loggers.patch
index 4fce4db655..6200ff4967 100644
--- a/Spigot-Server-Patches/0289-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0288-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From d0bd2562792c056e7d3b8088367512443c3a26f8 Mon Sep 17 00:00:00 2001
+From f841f4e17ff60ac0f7bd13f9f0d79ae67dab8ec5 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 75f98f79a..57042c171 100644
+index 3ad5af346..9cbd4880f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -30,5 +30,5 @@ index 000000000..ee7c90784
 @@ -0,0 +1 @@
 +Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0290-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch
similarity index 92%
rename from Spigot-Server-Patches/0290-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch
index 26d81d7986..4e67fafa56 100644
--- a/Spigot-Server-Patches/0290-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From aea6c165a8325f3a2c90a5f0fc0a949b94756704 Mon Sep 17 00:00:00 2001
+From f575e9f84da3025facfbcc342e13529e79cca9eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f54e9784c4..1b76a8e25e 100644
+index f7a3e2ce7..8e7eedd09 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2511,7 +2511,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,5 +19,5 @@ index f54e9784c4..1b76a8e25e 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0291-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0290-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0291-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0290-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index e7b6ff981a..fb75cecdbc 100644
--- a/Spigot-Server-Patches/0291-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0290-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From 2a6ac85ccce508cb601bdb5bbedafa7aaca97a8f Mon Sep 17 00:00:00 2001
+From d10c53b639cee25522092b354621d0002f7e04e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1b76a8e25e..5701f535e4 100644
+index 8e7eedd09..58122bfcc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 1b76a8e25e..5701f535e4 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 59656f31af..f3894a8a0d 100644
+index 9befa890b..c3369dcf4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -110,6 +110,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -30,7 +30,7 @@ index 59656f31af..f3894a8a0d 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 85a30652c4..6d1f70b39e 100644
+index 85a30652c..6d1f70b39 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -51,6 +51,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -103,5 +103,5 @@ index 85a30652c4..6d1f70b39e 100644
  
          if (aentity != null) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0292-EnderDragon-Events.patch b/Spigot-Server-Patches/0291-EnderDragon-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0292-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0291-EnderDragon-Events.patch
index 3150ae43b2..c360266a31 100644
--- a/Spigot-Server-Patches/0292-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0291-EnderDragon-Events.patch
@@ -1,4 +1,4 @@
-From 5d3ce3987e9a094bc2a9e87ca46b25c08ca09861 Mon Sep 17 00:00:00 2001
+From fb3095a90265c6cb609b7f882dca74d07c4f3aee Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:27 -0500
 Subject: [PATCH] EnderDragon Events
@@ -56,5 +56,5 @@ index 7df8fd4d7..c0d66a023 100644
              }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0293-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0292-PlayerElytraBoostEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0293-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0292-PlayerElytraBoostEvent.patch
index 544b96bc5b..0c699cbb1f 100644
--- a/Spigot-Server-Patches/0293-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0292-PlayerElytraBoostEvent.patch
@@ -1,4 +1,4 @@
-From 767d0000bd7293945276b8b4a7b60a1295b20f6d Mon Sep 17 00:00:00 2001
+From b6251b63fcd15c228239af1b9cf2cea15c04f064 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:59 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
@@ -28,5 +28,5 @@ index dbb422e9d..13938775b 100644
              }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0294-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0293-PlayerLaunchProjectileEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0294-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0293-PlayerLaunchProjectileEvent.patch
index 0d6000a08b..578d071637 100644
--- a/Spigot-Server-Patches/0294-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0293-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From ef42b2e74c1447362e02453981a5bfe7c9c7d461 Mon Sep 17 00:00:00 2001
+From 7da3a215fe926e8a27fc41e0e952cf72ad565873 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:11:03 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
@@ -255,5 +255,5 @@ index 87e2825a8..2bddefb80 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0295-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch
similarity index 97%
rename from Spigot-Server-Patches/0295-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch
index be345cce35..400d66da64 100644
--- a/Spigot-Server-Patches/0295-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 1aa2e1b1e6793a709bf930c2fc4149ebdcbbc2be Mon Sep 17 00:00:00 2001
+From 33a0b942620f80702dcbea1008f0c043250a26d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 92acfa6fb8..05509e4fdb 100644
+index 92acfa6fb..05509e4fd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -454,4 +454,43 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index 92acfa6fb8..05509e4fdb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1c1f39524d..edae53b825 100644
+index 1c1f39524..edae53b82 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
@@ -163,7 +163,7 @@ index 1c1f39524d..edae53b825 100644
              // CraftBukkit start
              List<Entity> toRemove = new LinkedList<>();
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5701f535e4..e16fd4e5e9 100644
+index 58122bfcc..a64a02fd4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2736,6 +2736,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -175,7 +175,7 @@ index 5701f535e4..e16fd4e5e9 100644
          this.uniqueID = uuid;
          this.au = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f3894a8a0d..8a0687a529 100644
+index c3369dcf4..eda3f10f2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -70,7 +70,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -188,7 +188,7 @@ index f3894a8a0d..8a0687a529 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> c = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6d1f70b39e..293818b196 100644
+index 6d1f70b39..293818b19 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -37,7 +37,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -219,5 +219,5 @@ index 6d1f70b39e..293818b196 100644
              logger.error("Overwrote an existing entity " + old + " with " + entity);
              if (DEBUG_ENTITIES) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0296-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0295-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0296-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0295-Speedup-BlockPos-by-fixing-inlining.patch
index 378c702413..e12b0c69c5 100644
--- a/Spigot-Server-Patches/0296-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0295-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 5ac6c5d4c6873c58978ed4f46cfe790a59c15b36 Mon Sep 17 00:00:00 2001
+From 53fd6438952f6854cea9a810e23949c9b027acc1 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -80,7 +80,7 @@ index 4c7793f86..cc17a414f 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index a4c282220..f260068c6 100644
+index 80e13dfb2..20cf9255b 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -202,18 +202,18 @@ public class BlockPosition extends BaseBlockPosition {
@@ -201,5 +201,5 @@ index a4c282220..f260068c6 100644
  
          public BlockPosition toBlockPosition() { return h(); } // Paper - OBFHELPER
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0297-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0296-Don-t-save-Proto-Chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0297-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0296-Don-t-save-Proto-Chunks.patch
index d544bbf418..68f4c35962 100644
--- a/Spigot-Server-Patches/0297-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0296-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From c9fb380ad89cac03569265033dd78a7cb0af754f Mon Sep 17 00:00:00 2001
+From 8144fe1c7fb428423df1a46a86e78c814e71ee8a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jul 2018 21:21:41 -0400
 Subject: [PATCH] Don't save Proto Chunks
@@ -41,5 +41,5 @@ index 70a95c263..56958a5ce 100644
  
          synchronized (this.e) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0298-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0297-Optimize-RegistryID.c.patch
similarity index 96%
rename from Spigot-Server-Patches/0298-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0297-Optimize-RegistryID.c.patch
index 06877338d3..534816e002 100644
--- a/Spigot-Server-Patches/0298-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0297-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 50a73ad721c1214ae9d5df9361edb7d75123ed7e Mon Sep 17 00:00:00 2001
+From f94d8c12caa1814684ee30a6543c51d68d68d9fd Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -64,5 +64,5 @@ index 5a5c464ea..37641fa86 100644
  
      public int b() {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0299-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 94%
rename from Spigot-Server-Patches/0299-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 451126a6f7..bfd1ca4bf9 100644
--- a/Spigot-Server-Patches/0299-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 8ed9fda55686c59ac2ca3eecdd7abf203842146a Mon Sep 17 00:00:00 2001
+From 19b4e3b7404f122071f38eb325a2190b6aee10a1 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@@ -21,7 +21,7 @@ index 05509e4fd..4059c7a72 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b90c64a17..5104afc33 100644
+index eda3f10f2..cd234c288 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1547,6 +1547,14 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -40,5 +40,5 @@ index b90c64a17..5104afc33 100644
          int i = MathHelper.floor(axisalignedbb.minX);
          int j = MathHelper.f(axisalignedbb.maxX);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0300-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0299-Vanished-players-don-t-have-rights.patch
similarity index 96%
rename from Spigot-Server-Patches/0300-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0299-Vanished-players-don-t-have-rights.patch
index 66cbe2925d..4f934b3e70 100644
--- a/Spigot-Server-Patches/0300-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0299-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 5f54c38ae42d4fa924279bf60b688bc3162ab432 Mon Sep 17 00:00:00 2001
+From f9a1242fb60134e1404e031a18948fa8ba51197e Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e16fd4e5e..61a547a40 100644
+index a64a02fd4..a211cb945 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index e16fd4e5e..61a547a40 100644
      protected int k;
      private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 85d364b8f..ff6c8e2b5 100644
+index f27d565e1..49ad201c6 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -70,7 +70,8 @@ public class ItemBlock extends Item {
@@ -32,7 +32,7 @@ index 85d364b8f..ff6c8e2b5 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5104afc33..7eb15fbb5 100644
+index cd234c288..08596bf3c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1529,6 +1529,37 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -93,5 +93,5 @@ index 167a3baec..1b13fa618 100644
          return event;
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0301-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0300-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 93%
rename from Spigot-Server-Patches/0301-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0300-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index e2b42da572..1853586c24 100644
--- a/Spigot-Server-Patches/0301-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0300-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 413e10660968d6a4ce03ffd138b806ae1ed99fe6 Mon Sep 17 00:00:00 2001
+From dd6dc076e44e550e1851252e0d23ae0e3ad813c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@@ -26,5 +26,5 @@ index edae53b82..42b76b212 100644
              itemCounts[i]--;
          } else if (entity instanceof IInventory) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0302-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0301-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 95%
rename from Spigot-Server-Patches/0302-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0301-Add-some-Debug-to-Chunk-Entity-slices.patch
index 327b2f68d9..b241504989 100644
--- a/Spigot-Server-Patches/0302-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0301-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From c694fb42c86f64e9cda92745dd020ac0121d470a Mon Sep 17 00:00:00 2001
+From 96241e585235ed412e893f10f2cc1a9df400f679 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 42b76b2122..7dd59ee031 100644
+index 42b76b212..7dd59ee03 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -714,8 +714,27 @@ public class Chunk implements IChunkAccess {
@@ -63,7 +63,7 @@ index 42b76b2122..7dd59ee031 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 61a547a40d..15a81d1eb9 100644
+index a211cb945..72e43622e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -62,6 +62,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -75,5 +75,5 @@ index 61a547a40d..15a81d1eb9 100644
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0303-Optimize-Region-File-Cache.patch b/Spigot-Server-Patches/0302-Optimize-Region-File-Cache.patch
similarity index 97%
rename from Spigot-Server-Patches/0303-Optimize-Region-File-Cache.patch
rename to Spigot-Server-Patches/0302-Optimize-Region-File-Cache.patch
index 4cf7dc317e..ef6d13ae50 100644
--- a/Spigot-Server-Patches/0303-Optimize-Region-File-Cache.patch
+++ b/Spigot-Server-Patches/0302-Optimize-Region-File-Cache.patch
@@ -1,4 +1,4 @@
-From 70b73f56aafb1a6e9209bb568fd46fdb7cbf64bf Mon Sep 17 00:00:00 2001
+From ef3479c926dcb3b18351f3d163558c9b1d86aa58 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 23:40:04 -0400
 Subject: [PATCH] Optimize Region File Cache
@@ -63,5 +63,5 @@ index 964996976..d07222239 100644
  
          return regionfile != null ? regionfile.d(i & 31, j & 31) : false;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0304-EntityTransformedEvent.patch b/Spigot-Server-Patches/0303-EntityTransformedEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0304-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0303-EntityTransformedEvent.patch
index 6e0a3a637b..64125f613a 100644
--- a/Spigot-Server-Patches/0304-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0303-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From ba0abba634bf17f22948e04ef7b4402e6643581e Mon Sep 17 00:00:00 2001
+From 4e5f302df9ea3d56f12f2ce4eff4531e39f99c36 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 141c17bf80..dde9f1e61e 100644
+index 141c17bf8..dde9f1e61 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -53,6 +53,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index 141c17bf80..dde9f1e61e 100644
  
                  this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 78acac4ca7..f01e776fe5 100644
+index 78acac4ca..f01e776fe 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -624,6 +624,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -29,7 +29,7 @@ index 78acac4ca7..f01e776fe5 100644
              // CraftBukkit end
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 7a943a6c27..7998b80c17 100644
+index 7a943a6c2..7998b80c1 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -239,6 +239,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index 7a943a6c27..7998b80c17 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index c6198626ab..86e5fbcdab 100644
+index c6198626a..86e5fbcda 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -139,6 +139,7 @@ public class EntityZombieVillager extends EntityZombie {
@@ -61,5 +61,5 @@ index c6198626ab..86e5fbcdab 100644
          this.world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
          // CraftBukkit end
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0305-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0304-SkeletonHorse-Additions.patch
similarity index 97%
rename from Spigot-Server-Patches/0305-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0304-SkeletonHorse-Additions.patch
index 642a450c3d..44ee52fe87 100644
--- a/Spigot-Server-Patches/0305-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0304-SkeletonHorse-Additions.patch
@@ -1,4 +1,4 @@
-From 8afe439962f5ff13b6945d644dea1611b974a6ce Mon Sep 17 00:00:00 2001
+From b16b1b1a0902b9b983f4a1e629b05aba2f332572 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
@@ -71,5 +71,5 @@ index e822c2200..496d0c0ca 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0306-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0305-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0306-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0305-Prevent-Saving-Bad-entities-to-chunks.patch
index 93c4c94c09..54adada42e 100644
--- a/Spigot-Server-Patches/0306-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0305-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From da5c171c54cc1df931c2b505b1d05bafb0ad26f3 Mon Sep 17 00:00:00 2001
+From 176a6ae2aff482d22329cb39f9315603915f56ab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -57,5 +57,5 @@ index 2c4a4fc6b..485bce987 100644
          nbttagcompound.set("Entities", nbttaglist1);
          NBTTagList nbttaglist2 = new NBTTagList();
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0307-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0306-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 98%
rename from Spigot-Server-Patches/0307-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0306-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 9b17905204..ff4e9bd6e7 100644
--- a/Spigot-Server-Patches/0307-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0306-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 6f951c08506ab811908bc19c17634c2f8c4ce97a Mon Sep 17 00:00:00 2001
+From 0d5c6c41c263d5d58abdf24833a1498562ddeba4 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -84,5 +84,5 @@ index 0ad0004b9..7455461f1 100644
      public void testBlockStateMeta() {
          List<Block> queue = new ArrayList<>();
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0308-Always-process-chunk-removal-in-removeEntity.patch b/Spigot-Server-Patches/0307-Always-process-chunk-removal-in-removeEntity.patch
similarity index 93%
rename from Spigot-Server-Patches/0308-Always-process-chunk-removal-in-removeEntity.patch
rename to Spigot-Server-Patches/0307-Always-process-chunk-removal-in-removeEntity.patch
index 18d42eec25..a650968a31 100644
--- a/Spigot-Server-Patches/0308-Always-process-chunk-removal-in-removeEntity.patch
+++ b/Spigot-Server-Patches/0307-Always-process-chunk-removal-in-removeEntity.patch
@@ -1,4 +1,4 @@
-From 46d34d7499b61271b55499dc09d080afdaa2574f Mon Sep 17 00:00:00 2001
+From 58bcaacaaf7a6267dbc8766cf378858b40dd78ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:09:20 -0400
 Subject: [PATCH] Always process chunk removal in removeEntity
@@ -8,7 +8,7 @@ which can keep them in the chunk when they shouldnt be if done
 during entity ticking.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7eb15fbb5..63588cd0c 100644
+index 08596bf3c..f93adc860 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1107,7 +1107,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -29,5 +29,5 @@ index 7eb15fbb5..63588cd0c 100644
          int index = this.entityList.indexOf(entity);
          if (index != -1) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0309-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0308-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 97%
rename from Spigot-Server-Patches/0309-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0308-Ignore-Dead-Entities-in-entityList-iteration.patch
index 71e8fd71e7..ab9c97aed1 100644
--- a/Spigot-Server-Patches/0309-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0308-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 1afbefeda4968c4d7af97d155ea94bbe6f237de0 Mon Sep 17 00:00:00 2001
+From 86175d98704ba04f46d51e36b6ff3fc2ff213f32 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -23,7 +23,7 @@ index 56700fc59..9b9c8361e 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 15a81d1eb..f0fa4e944 100644
+index 72e43622e..71ea64fe7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -121,6 +121,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 15a81d1eb..f0fa4e944 100644
      public float length;
      public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 63588cd0c..ddd438647 100644
+index f93adc860..814950bde 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1046,6 +1046,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -107,5 +107,5 @@ index 2fca59f8f..3fdd12ec0 100644
  
                  if (bukkitEntity == null) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0310-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0309-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 99%
rename from Spigot-Server-Patches/0310-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0309-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index 5c47514501..dc84f6d6b3 100644
--- a/Spigot-Server-Patches/0310-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0309-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From d9812faa701cf379d733e98cf420a0603cdebfc7 Mon Sep 17 00:00:00 2001
+From 020f4fd5fbcf97767797623c6dd444fcae8b2d0e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 15:48:50 -0400
 Subject: [PATCH] Provide option to use a versioned world folder for testing
@@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand.
 This is highly experiemental so backup your world before relying on this to not modify it
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 48b0a742a..f0b87972d 100644
+index 361b3c9e9..3538e80c3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -13,6 +13,7 @@ import java.util.List;
@@ -224,5 +224,5 @@ index 577ba1b5f..9be0e994e 100644
          this.baseDir.mkdirs();
          this.playerDir = new File(this.baseDir, "playerdata");
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0311-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0310-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 91%
rename from Spigot-Server-Patches/0311-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0310-MC-111480-Start-Entity-ID-s-at-1.patch
index 68210ad8a6..1f8be50070 100644
--- a/Spigot-Server-Patches/0311-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0310-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From bfd5ce7a6f18c70be376c9ac0deda74de4a6b1ba Mon Sep 17 00:00:00 2001
+From bfcb40bd0062ef2312c4beaaf20e4444ba7eed77 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index cc30f19f0..a9b0f8497 100644
+index 71ea64fe7..2d2edbd33 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -90,7 +90,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -20,5 +20,5 @@ index cc30f19f0..a9b0f8497 100644
      private int id;
      public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0312-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0311-Implement-Expanded-ArmorStand-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0312-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0311-Implement-Expanded-ArmorStand-API.patch
index bc0c7b5f26..3bbe3989b9 100644
--- a/Spigot-Server-Patches/0312-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0311-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 44cc35dd1cec5cad93e1c521d870a4d040f96761 Mon Sep 17 00:00:00 2001
+From 7c2071e930f61d44c3ec4addd1c31f0969da6ad0 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -126,5 +126,5 @@ index 124c3185b..9f5c3b92e 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0313-AnvilDamageEvent.patch b/Spigot-Server-Patches/0312-AnvilDamageEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0313-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0312-AnvilDamageEvent.patch
index 9ba07aef1c..16fefedc17 100644
--- a/Spigot-Server-Patches/0313-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0312-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From f126252bb10fc5177e8e8ab43b65910ae5bb9167 Mon Sep 17 00:00:00 2001
+From f9787a408a77786c10c8632dad2ecac098e557d5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
@@ -26,5 +26,5 @@ index 1560dd382..d206e0465 100644
                          if (iblockdata1 == null) {
                              world.setAir(blockposition);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0314-World-EntityHuman-Lookup-Optimizations.patch b/Spigot-Server-Patches/0313-World-EntityHuman-Lookup-Optimizations.patch
similarity index 97%
rename from Spigot-Server-Patches/0314-World-EntityHuman-Lookup-Optimizations.patch
rename to Spigot-Server-Patches/0313-World-EntityHuman-Lookup-Optimizations.patch
index 56715425a4..918cafed7a 100644
--- a/Spigot-Server-Patches/0314-World-EntityHuman-Lookup-Optimizations.patch
+++ b/Spigot-Server-Patches/0313-World-EntityHuman-Lookup-Optimizations.patch
@@ -1,11 +1,11 @@
-From d16207bc6f8483316663f8ffcf3f9ad25a0d0daf Mon Sep 17 00:00:00 2001
+From 20c9c4952328ef753d46754008f17efcc036d085 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 30 Jul 2018 02:42:49 -0400
 Subject: [PATCH] World EntityHuman Lookup Optimizations
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ddd438647..74e1f4810 100644
+index 814950bde..748ab8212 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -76,6 +76,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -78,5 +78,5 @@ index ddd438647..74e1f4810 100644
  
      public void checkSession() throws ExceptionWorldConflict {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0315-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0314-Add-TNTPrimeEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0315-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0314-Add-TNTPrimeEvent.patch
index 72334ac586..4d1338e3b2 100644
--- a/Spigot-Server-Patches/0315-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0314-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From 5f1451b3b8e9c4216cd1d58a9917023311766232 Mon Sep 17 00:00:00 2001
+From d10cf16f06181a2b2c05c7aac1569b065fb647d7 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
@@ -136,5 +136,5 @@ index 79d8be8d4..fcc82d8eb 100644
  
                  this.world.setAir(new BlockPosition(blockX, blockY, blockZ));
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0316-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0315-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0316-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0315-Break-up-and-make-tab-spam-limits-configurable.patch
index 10763a71a5..f19d65d2e3 100644
--- a/Spigot-Server-Patches/0316-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0315-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From 7e3c7a77ce227e39ccd52ca8a180f06578678877 Mon Sep 17 00:00:00 2001
+From 4eb1fe024505c41a58aedceadf435a00505610ed Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f0b87972d..a92914576 100644
+index 3538e80c3..975ebf75c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -332,4 +332,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index f0b87972d..a92914576 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index efcb82877..8899ad0f6 100644
+index 9394d60d9..a7b4439f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -74,5 +74,5 @@ index efcb82877..8899ad0f6 100644
              return;
          }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0317-Make-portal-teleportation-adjustment-math-more-accur.patch b/Spigot-Server-Patches/0316-Make-portal-teleportation-adjustment-math-more-accur.patch
similarity index 98%
rename from Spigot-Server-Patches/0317-Make-portal-teleportation-adjustment-math-more-accur.patch
rename to Spigot-Server-Patches/0316-Make-portal-teleportation-adjustment-math-more-accur.patch
index 1fc97006a0..ddef0e0b00 100644
--- a/Spigot-Server-Patches/0317-Make-portal-teleportation-adjustment-math-more-accur.patch
+++ b/Spigot-Server-Patches/0316-Make-portal-teleportation-adjustment-math-more-accur.patch
@@ -1,4 +1,4 @@
-From e51147bb0227c0433e18d89fbbf9e470a541669b Mon Sep 17 00:00:00 2001
+From 4b2173326c910bed90cac49417bf04e35389fef6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 31 Jul 2018 19:32:57 -0500
 Subject: [PATCH] Make portal teleportation adjustment math more accurate
@@ -91,5 +91,5 @@ index 8ba4da0ea..8716f5fd9 100644
              return this.e;
          }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0318-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0317-Add-hand-to-bucket-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0318-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0317-Add-hand-to-bucket-events.patch
index 8979d9cc36..a96f7d1c47 100644
--- a/Spigot-Server-Patches/0318-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0317-Add-hand-to-bucket-events.patch
@@ -1,11 +1,11 @@
-From 6f5ab26fd61ec2013afce229efda24dbe932ebc6 Mon Sep 17 00:00:00 2001
+From afd813d5fc75c545790b5fd56d8cb0a8c0468992 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 5ac88166fd..5874d2993c 100644
+index 5ac88166f..5874d2993 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -65,7 +65,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index 5ac88166fd..5874d2993c 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index 6f5dda880b..a064897fc4 100644
+index 6f5dda880..a064897fc 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -35,7 +35,7 @@ public class ItemBucket extends Item {
@@ -67,7 +67,7 @@ index 6f5dda880b..a064897fc4 100644
                          ((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 1b13fa6186..93da4c7267 100644
+index 1b13fa618..93da4c726 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -234,6 +234,20 @@ public class CraftEventFactory {
@@ -105,5 +105,5 @@ index 1b13fa6186..93da4c7267 100644
          }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0319-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0318-MC-135506-Experience-should-save-as-Integers.patch
similarity index 94%
rename from Spigot-Server-Patches/0319-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0318-MC-135506-Experience-should-save-as-Integers.patch
index fd4fd6d5f0..deebe75d9b 100644
--- a/Spigot-Server-Patches/0319-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0318-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,4 +1,4 @@
-From 2c72d20e4e8a288b3cfb72c67123c5a2a7e4623c Mon Sep 17 00:00:00 2001
+From d8949d63320b0811e3b341d4b3bf3d1147f2efef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
@@ -26,5 +26,5 @@ index 09d85764b..3606b1014 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0320-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0319-Entity-add-to-world-fixes.patch
similarity index 96%
rename from Spigot-Server-Patches/0320-Entity-add-to-world-fixes.patch
rename to Spigot-Server-Patches/0319-Entity-add-to-world-fixes.patch
index 27c69d790e..05d85bf307 100644
--- a/Spigot-Server-Patches/0320-Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/0319-Entity-add-to-world-fixes.patch
@@ -1,4 +1,4 @@
-From 90b8557b107d2a011e2a7bb73e5519e78f8436cc Mon Sep 17 00:00:00 2001
+From 9a10ba335454cdf6a3ebb047e1ae00a84a00b368 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 22:47:46 -0400
 Subject: [PATCH] Entity add to world fixes
@@ -14,7 +14,7 @@ Fix this by differing entity add to world for all entities at the same time
 the original entity is dead, overwrite it as the logic does for unloaod queued entities.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1c9e2cb1ce..d22e83f3c6 100644
+index 7dd59ee03..a915d0184 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 1c9e2cb1ce..d22e83f3c6 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cf739ae2e5..7f255db567 100644
+index 748ab8212..bd8d9ef48 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1037,6 +1037,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -79,7 +79,7 @@ index cf739ae2e5..7f255db567 100644
              this.b(entity);
          });
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 293818b196..4cda6cee2b 100644
+index 293818b19..4cda6cee2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -967,7 +967,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -92,5 +92,5 @@ index 293818b196..4cda6cee2b 100644
                  } else {
                      if (!(entity instanceof EntityHuman)) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0321-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0320-Fix-client-rendering-skulls-from-same-user.patch
similarity index 98%
rename from Spigot-Server-Patches/0321-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0320-Fix-client-rendering-skulls-from-same-user.patch
index 97fdbe1f54..e82e000b19 100644
--- a/Spigot-Server-Patches/0321-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0320-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 6f0fd4eca259760779e5acfbbe94fc8556634067 Mon Sep 17 00:00:00 2001
+From 6bf0f56317073c410ca0a168e77a084f55cf066d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 8f2b0742d..e0091358a 100644
+index 713977e3c..91a9f1bbb 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -44,7 +44,7 @@ public final class ItemStack {
@@ -126,5 +126,5 @@ index 79c24cdc4..6511bfda8 100644
  
      public NBTTagCompound aa_() {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0322-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0321-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 98%
rename from Spigot-Server-Patches/0322-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0321-Add-Early-Warning-Feature-to-WatchDog.patch
index 4a3baedb0a..c4162cfc29 100644
--- a/Spigot-Server-Patches/0322-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0321-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 7f98ea9490aaabaf4295ad4ef1f63ae99db850fd Mon Sep 17 00:00:00 2001
+From 667fcf79b5b3891c9cb350454630f949223e9b93 Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
@@ -36,7 +36,7 @@ index 975ebf75c..6bd59a886 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c562ba546..e993b4da6 100644
+index 476a729dd..4565a56b3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -792,6 +792,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -48,7 +48,7 @@ index c562ba546..e993b4da6 100644
                  long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 296e338c8..bc7d39e26 100644
+index 95d51fb5b..81e27949d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -752,6 +752,7 @@ public final class CraftServer implements Server {
@@ -81,7 +81,7 @@ index 9c442dee2..fb09fb097 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index ed5f46bf6..9dba9510f 100644
+index 0117c3d3d..5447bc9cc 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
@@ -182,5 +182,5 @@ index ed5f46bf6..9dba9510f 100644
              {
                  interrupt();
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0323-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0322-Make-EnderDragon-implement-Mob.patch
similarity index 95%
rename from Spigot-Server-Patches/0323-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0322-Make-EnderDragon-implement-Mob.patch
index 90510aedc2..42d76d0cfa 100644
--- a/Spigot-Server-Patches/0323-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0322-Make-EnderDragon-implement-Mob.patch
@@ -1,4 +1,4 @@
-From dffe858eacb53e549424ed5152bb46ff7f4c493b Mon Sep 17 00:00:00 2001
+From 3193f11d6ce6386788eeb087c60d36a80ee2ca84 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob
@@ -32,5 +32,5 @@ index cc115cc36..4947249da 100644
  
      @Override
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0324-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0323-Detect-and-repair-corrupt-Region-Files.patch
similarity index 98%
rename from Spigot-Server-Patches/0324-Detect-and-repair-corrupt-Region-Files.patch
rename to Spigot-Server-Patches/0323-Detect-and-repair-corrupt-Region-Files.patch
index c754f04f55..97927b2821 100644
--- a/Spigot-Server-Patches/0324-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0323-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From 49d9979c5c63c62f676834076ab49026eecd4b68 Mon Sep 17 00:00:00 2001
+From fbb8d56a912bb3725a440d665a79ce9ec2af3dc0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Aug 2018 00:49:20 -0400
 Subject: [PATCH] Detect and repair corrupt Region Files
@@ -11,7 +11,7 @@ I don't know why mojang only checks for 4096, when anything less than 8192 is a
 But to be safe, it will attempt to back up the file.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index e2d4450e90..c20511588d 100644
+index e2d4450e9..c20511588 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -25,10 +25,10 @@ public class RegionFile {
@@ -135,5 +135,5 @@ index e2d4450e90..c20511588d 100644
  
          private final int b;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0325-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0324-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from Spigot-Server-Patches/0325-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0324-Use-ConcurrentHashMap-in-JsonList.patch
index 6a430dc6f4..0beac3e034 100644
--- a/Spigot-Server-Patches/0325-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0324-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 6e49834ea2f19d8731df052ac9de3f2a04b8abe9 Mon Sep 17 00:00:00 2001
+From b52072b894657cdc5b9820705e7ecddb1c335316 Mon Sep 17 00:00:00 2001
 From: egg82 <phantom_zero@ymail.com>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
@@ -99,5 +99,5 @@ index 026ef7939..b7cde4d41 100644
          String s = this.b.toJson(collection);
          BufferedWriter bufferedwriter = null;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0326-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0325-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0326-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0325-Use-a-Queue-for-Queueing-Commands.patch
index d77d284d56..1ddc5efc82 100644
--- a/Spigot-Server-Patches/0326-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0325-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From a3b684b2cea02f3a33fa08ececd3e786778c6d97 Mon Sep 17 00:00:00 2001
+From f35d0221d6e2958f70a9c358a6318b0f6d83b5d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 3062d3e20..67690561b 100644
+index 437ac386a..21a05b2b2 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -32,5 +32,5 @@ index 3062d3e20..67690561b 100644
              // CraftBukkit start - ServerCommand for preprocessing
              ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0327-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0326-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 94%
rename from Spigot-Server-Patches/0327-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0326-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 2682334377..3d9476b5d4 100644
--- a/Spigot-Server-Patches/0327-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0326-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,4 +1,4 @@
-From ab4cd2964cc5a3c0306769a25d35d0310859ba1a Mon Sep 17 00:00:00 2001
+From 1a56c638a04b91d269ab30d436c954e23c239ec2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
@@ -31,5 +31,5 @@ index e65768499..9ba2fa5de 100644
  
          return entities;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0328-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0328-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch
index 70775efed1..26e5a9490d 100644
--- a/Spigot-Server-Patches/0328-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From 08bbc4d2c03b381ae4444f6920fa37bf2a9a66e8 Mon Sep 17 00:00:00 2001
+From c3e0bed1cacc07c470717a3a75769ce86673f31a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
@@ -141,7 +141,7 @@ index c604182dd..2c54e3e34 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bca5136dc..497b5ceb5 100644
+index bc1ab273b..cb32d64bd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2083,52 +2083,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0329-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0328-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0329-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0328-Optimize-BlockPosition-helper-methods.patch
index d2164b356a..9f16cbb6d5 100644
--- a/Spigot-Server-Patches/0329-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0328-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 9b44022abc6f62f42e55ae12c094df9388259427 Mon Sep 17 00:00:00 2001
+From 0056df40feab7ba6dce50706531a187db5fcd355 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Aug 2018 12:05:12 -0700
 Subject: [PATCH] Optimize BlockPosition helper methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index f260068c6..cf3cf1c25 100644
+index 20cf9255b..5ce18f54c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -59,55 +59,72 @@ public class BlockPosition extends BaseBlockPosition {
@@ -96,5 +96,5 @@ index f260068c6..cf3cf1c25 100644
  
      public BlockPosition shift(EnumDirection enumdirection, int i) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0330-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0329-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 97%
rename from Spigot-Server-Patches/0330-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0329-Send-nearby-packets-from-world-player-list-not-serve.patch
index 90193da554..9abf13e253 100644
--- a/Spigot-Server-Patches/0330-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0329-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From 96564e1f1dc17ab53657d29a4ec10c5c15235605 Mon Sep 17 00:00:00 2001
+From 3d84f674a2ca7d83d43d9aebb1df9661077f5d01 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ddaa73e83d..ec760325ba 100644
+index ddaa73e83..ec760325b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1201,8 +1201,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index ddaa73e83d..ec760325ba 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldManager.java b/src/main/java/net/minecraft/server/WorldManager.java
-index b4225b58ec..0ba0eb661b 100644
+index b4225b58e..0ba0eb661 100644
 --- a/src/main/java/net/minecraft/server/WorldManager.java
 +++ b/src/main/java/net/minecraft/server/WorldManager.java
 @@ -35,8 +35,8 @@ public class WorldManager implements IWorldAccess {
@@ -95,7 +95,7 @@ index b4225b58ec..0ba0eb661b 100644
              if (entityplayer != null && entityplayer.world == this.world && entityplayer.getId() != i) {
                  double d0 = (double) blockposition.getX() - entityplayer.locX;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4cda6cee2b..0ff3fe03dd 100644
+index 4cda6cee2..0ff3fe03d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1064,7 +1064,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -119,7 +119,7 @@ index 4cda6cee2b..0ff3fe03dd 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3fdd12ec08..e0b466d0c6 100644
+index 3fdd12ec0..e0b466d0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1636,7 +1636,7 @@ public class CraftWorld implements World {
@@ -132,5 +132,5 @@ index 3fdd12ec08..e0b466d0c6 100644
  
      public String getGameRuleValue(String rule) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0331-Cache-World-Entity-Type-counts.patch b/Spigot-Server-Patches/0330-Cache-World-Entity-Type-counts.patch
similarity index 98%
rename from Spigot-Server-Patches/0331-Cache-World-Entity-Type-counts.patch
rename to Spigot-Server-Patches/0330-Cache-World-Entity-Type-counts.patch
index e2c5563e19..1e5d5380b0 100644
--- a/Spigot-Server-Patches/0331-Cache-World-Entity-Type-counts.patch
+++ b/Spigot-Server-Patches/0330-Cache-World-Entity-Type-counts.patch
@@ -1,4 +1,4 @@
-From f2e6a430e2bb0295c4e5a23223dbd20857d0c8a5 Mon Sep 17 00:00:00 2001
+From 4b037a6ff610d3f9552b7f9e348d02ca470b97da Mon Sep 17 00:00:00 2001
 From: Colin Godsey <crgodsey@gmail.com>
 Date: Wed, 8 Aug 2018 10:10:06 -0600
 Subject: [PATCH] Cache World Entity Type counts
@@ -133,7 +133,7 @@ index 000000000..a10a5bc13
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3ca51a5c5..c29d7eeb0 100644
+index 2d2edbd33..47d3609c3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -122,6 +122,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -171,7 +171,7 @@ index e62616552..bfbe4d3e3 100644
                      if (l1 <= k) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index db130852f..0866c6feb 100644
+index bd8d9ef48..c25c82bf1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -45,7 +45,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -213,5 +213,5 @@ index db130852f..0866c6feb 100644
          if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking // Paper - always remove from current chunk above
          // CraftBukkit start - Decrement loop variable field if we've already ticked this entity
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0332-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0331-Restore-vanlla-default-mob-spawn-range.patch
similarity index 91%
rename from Spigot-Server-Patches/0332-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0331-Restore-vanlla-default-mob-spawn-range.patch
index dd8d731a57..cdb9edcb6a 100644
--- a/Spigot-Server-Patches/0332-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0331-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,4 +1,4 @@
-From 650d6b77cb1f885c067e01a383763db0a373732d Mon Sep 17 00:00:00 2001
+From 88e23447dfbb01add6cf7be8fa22e643d7fbcd03 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Aug 2018 12:43:16 -0400
 Subject: [PATCH] Restore vanlla default mob-spawn-range
@@ -18,5 +18,5 @@ index 1d222eaff..809ce1d6a 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0333-Optimize-Hoppers.patch b/Spigot-Server-Patches/0332-Optimize-Hoppers.patch
similarity index 98%
rename from Spigot-Server-Patches/0333-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0332-Optimize-Hoppers.patch
index a258544c65..5a234164c1 100644
--- a/Spigot-Server-Patches/0333-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0332-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From cf94efd4b2ec72c0468fb8c4131008b329395979 Mon Sep 17 00:00:00 2001
+From 718bfae2fd74cdbf3b15a469b0fd16a9140e236f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 10efe6b3d9..6feea98b6b 100644
+index 10efe6b3d..6feea98b6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -420,6 +420,15 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index 10efe6b3d9..6feea98b6b 100644
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 91a9f1bbb4..914da48a23 100644
+index 91a9f1bbb..914da48a2 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -464,8 +464,9 @@ public final class ItemStack {
@@ -47,7 +47,7 @@ index 91a9f1bbb4..914da48a23 100644
          itemstack.d(this.B());
          if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4565a56b3f..38c0201acb 100644
+index 4565a56b3..38c0201ac 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1048,6 +1048,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -59,7 +59,7 @@ index 4565a56b3f..38c0201acb 100644
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                  this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 29fe031d85..d67fd92d9d 100644
+index 29fe031d8..d67fd92d9 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -52,6 +52,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -79,7 +79,7 @@ index 29fe031d85..d67fd92d9d 100644
              this.world.b(this.position, this);
              if (!this.f.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 559eedfa66..7303a6fdda 100644
+index 559eedfa6..7303a6fdd 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -189,6 +189,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -299,5 +299,5 @@ index 559eedfa66..7303a6fdda 100644
                  flag = true;
              } else if (a(itemstack1, itemstack)) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0334-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0333-Optimize-CraftBlockData-Creation.patch
similarity index 96%
rename from Spigot-Server-Patches/0334-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0333-Optimize-CraftBlockData-Creation.patch
index 2fa5901048..733091d3fb 100644
--- a/Spigot-Server-Patches/0334-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0333-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From 52945047efffbd431400031b5c3e456afcc33afa Mon Sep 17 00:00:00 2001
+From 1e4052dcd847bbcde1fb82b45fc30f6a52c08cff Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
@@ -47,7 +47,7 @@ index e4e4c5513..08a5acb0a 100644
          return this.getBlock().n(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 8c110c67d..808826588 100644
+index 7755e4f7a..4bb43e360 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -521,7 +521,17 @@ public class CraftBlockData implements BlockData {
@@ -69,5 +69,5 @@ index 8c110c67d..808826588 100644
      }
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0335-Fix-MC-124320.patch b/Spigot-Server-Patches/0334-Fix-MC-124320.patch
similarity index 96%
rename from Spigot-Server-Patches/0335-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0334-Fix-MC-124320.patch
index fb89196b38..9e36dbe37c 100644
--- a/Spigot-Server-Patches/0335-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0334-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From e474e75089946df413dd1d5574f907342ded620e Mon Sep 17 00:00:00 2001
+From cec81e81be74f02e67f7de151f545126fdb393a0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 66643be2b..28efb4d4f 100644
+index c674aa13d..2e460a7f6 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -154,6 +154,7 @@ public class Block implements IMaterial {
@@ -49,5 +49,5 @@ index 139a70ca3..e4aba0e0a 100644
              if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1)) {
                  // CraftBukkit start - Place event
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0336-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0335-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0336-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0335-Slime-Pathfinder-Events.patch
index f78beeaf8e..b161303998 100644
--- a/Spigot-Server-Patches/0336-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0335-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From f6fa732cbdcbe7dcadc27df28822bae39b34acd1 Mon Sep 17 00:00:00 2001
+From b77aad0930a6e3a9dee6e158b92bae4c144672dc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events
@@ -164,5 +164,5 @@ index 18e7ef80a..8403c1e01 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0337-Anti-Xray.patch b/Spigot-Server-Patches/0336-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0337-Anti-Xray.patch
rename to Spigot-Server-Patches/0336-Anti-Xray.patch
index 0f4d189484..392de6a820 100644
--- a/Spigot-Server-Patches/0337-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0336-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From 90e651a3b6a019e8ac6201b1681beb86df5a109f Mon Sep 17 00:00:00 2001
+From dd0691766e290b04122d57c0b4717665f1d3d3a7 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
@@ -1070,7 +1070,7 @@ index 000000000..37093419c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d22e83f3c..1d006bad1 100644
+index a915d0184..9f28d7775 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -541,7 +541,7 @@ public class Chunk implements IChunkAccess {
@@ -1534,7 +1534,7 @@ index 16e3469d0..e4c0cc6a3 100644
  
              if (enumskyblock == EnumSkyBlock.SKY) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9218f45ed..ee5d478b5 100644
+index c25c82bf1..1bd2167aa 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,6 +1,8 @@
@@ -1596,5 +1596,5 @@ index 550416bef..923d1b282 100644
          return section;
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0338-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 97%
rename from Spigot-Server-Patches/0338-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch
index b2402ce09d..f50d77e4ec 100644
--- a/Spigot-Server-Patches/0338-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From e142de31a76e71e82432fee1cf0132ef972a430d Mon Sep 17 00:00:00 2001
+From 1d4af8c0e9e1b39d7b55d27a56bed234be220222 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
@@ -64,5 +64,5 @@ index e67238582..b53a88c33 100644
  
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0339-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0338-Optimize-RegistryMaterials.patch
similarity index 95%
rename from Spigot-Server-Patches/0339-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0338-Optimize-RegistryMaterials.patch
index db1d2e8c72..aaaf977225 100644
--- a/Spigot-Server-Patches/0339-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0338-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From 15a763f8d90036c9d62ca19ee6f1debc50960b52 Mon Sep 17 00:00:00 2001
+From ab8504873f6002be3e43c0c6b36317a6cfd5474a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Aug 2018 20:49:50 -0400
 Subject: [PATCH] Optimize RegistryMaterials
@@ -34,5 +34,5 @@ index 1521ed759..78de740ac 100644
  
          return this.d[random.nextInt(this.d.length)];
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0340-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0339-Add-PhantomPreSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0340-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0339-Add-PhantomPreSpawnEvent.patch
index 32d7f21254..e727948f70 100644
--- a/Spigot-Server-Patches/0340-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0339-Add-PhantomPreSpawnEvent.patch
@@ -1,4 +1,4 @@
-From d1aba7bb16817353cd0be79f16f7e8596eb5fe94 Mon Sep 17 00:00:00 2001
+From 6c1ef3d465fbd943aa636cabbec5b5504b0756b9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:51 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
@@ -86,5 +86,5 @@ index 9f9ee9239..2b9731369 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0341-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0340-Add-More-Creeper-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0341-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0340-Add-More-Creeper-API.patch
index 0ede45530d..e86ad13053 100644
--- a/Spigot-Server-Patches/0341-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0340-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From c0a4ea7a94c6b7cee9784046eb7677af3ab1e383 Mon Sep 17 00:00:00 2001
+From 9827a1e538552fa814633570a07ba756dea05215 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
@@ -74,5 +74,5 @@ index ffebb54ca..ab2b20a0d 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0342-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0341-Inventory-removeItemAnySlot.patch
similarity index 97%
rename from Spigot-Server-Patches/0342-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0341-Inventory-removeItemAnySlot.patch
index 14f98ebf31..c18081e5da 100644
--- a/Spigot-Server-Patches/0342-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0341-Inventory-removeItemAnySlot.patch
@@ -1,4 +1,4 @@
-From f9c8c31e588e039f634eb1e6f4a31f4622eda27b Mon Sep 17 00:00:00 2001
+From 55980265ea40b8dba6c5b37074398010f5b67999 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:15 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
@@ -57,5 +57,5 @@ index dd7b3d766..01af98293 100644
                  // Drat! we don't have this type in the inventory
                  if (first == -1) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0343-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0342-Optimize-getChunkIfLoaded-type-calls.patch
similarity index 97%
rename from Spigot-Server-Patches/0343-Optimize-getChunkIfLoaded-type-calls.patch
rename to Spigot-Server-Patches/0342-Optimize-getChunkIfLoaded-type-calls.patch
index 7d1eb79311..1701341bf9 100644
--- a/Spigot-Server-Patches/0343-Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/0342-Optimize-getChunkIfLoaded-type-calls.patch
@@ -1,4 +1,4 @@
-From c8660c3dbfdb271d5d03fb6564a4a36963f05e05 Mon Sep 17 00:00:00 2001
+From 291c79c7ba20324ab6aedf274c8e50e846429506 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Aug 2018 21:59:22 -0400
 Subject: [PATCH] Optimize getChunkIfLoaded type calls
@@ -23,7 +23,7 @@ index 41926a361..186cfda7e 100644
                      neighbor.setNeighborUnloaded(-x, -z);
                      chunk.setNeighborUnloaded(x, z);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ee5d478b5..1e51f2bb6 100644
+index 1bd2167aa..d12e4763a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -162,7 +162,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -77,5 +77,5 @@ index e0b466d0c..2c4465fff 100644
              return true;
          }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0344-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0343-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 93%
rename from Spigot-Server-Patches/0344-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0343-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 4e48da9437..1a908568e5 100644
--- a/Spigot-Server-Patches/0344-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0343-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 874d71db6ba9406d83c07e4f6cd40bbf504d316d Mon Sep 17 00:00:00 2001
+From 1036aa02bdf179bb0ea4239432085c642d5f9519 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
diff --git a/Spigot-Server-Patches/0345-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0344-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 97%
rename from Spigot-Server-Patches/0345-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0344-Add-ray-tracing-methods-to-LivingEntity.patch
index c43ca78fbb..0b193b4797 100644
--- a/Spigot-Server-Patches/0345-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0344-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From e5e454ca90c90bf05dcccb7e9364b85f37ac9b9c Mon Sep 17 00:00:00 2001
+From e0d5ee78d679bbe31ac7225c463063d798b1084d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 18b5ecbc6..10d95d306 100644
+index cb32d64bd..6367fdd46 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2817,6 +2817,22 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0346-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch
similarity index 96%
rename from Spigot-Server-Patches/0346-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch
index 190e26c9de..e3dc3844d6 100644
--- a/Spigot-Server-Patches/0346-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,4 +1,4 @@
-From 184c1493b6316c0341e9323c6fca358f62c2fdc8 Mon Sep 17 00:00:00 2001
+From b3314d8893709cd8c8325e7ef065690851c75c4f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
diff --git a/Spigot-Server-Patches/0347-Improve-death-events.patch b/Spigot-Server-Patches/0346-Improve-death-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0347-Improve-death-events.patch
rename to Spigot-Server-Patches/0346-Improve-death-events.patch
index 95bd717b8a..1e05733754 100644
--- a/Spigot-Server-Patches/0347-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0346-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 4cc6a61a3e7c1967dc72e8cb4c5f551029bc3efd Mon Sep 17 00:00:00 2001
+From abd95df904a7c8ca358ce81bce7e5e570b90034c Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -27,7 +27,7 @@ index bbd5e2b2a..19750ceed 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c29d7eeb0..acd89649c 100644
+index 47d3609c3..f470d7090 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1553,6 +1553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -69,7 +69,7 @@ index 2c54e3e34..a5cc5e284 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 10d95d306..f48ddbc68 100644
+index 6367fdd46..3d1cdd627 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -76,14 +76,14 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0348-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0347-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 96%
rename from Spigot-Server-Patches/0348-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0347-Allow-chests-to-be-placed-with-NBT-data.patch
index c96fb8fcd4..59ea6f279f 100644
--- a/Spigot-Server-Patches/0348-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0347-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,4 +1,4 @@
-From 8b32a559c1f6f2b988e2bddbe3220bf5cbeb6df2 Mon Sep 17 00:00:00 2001
+From 354126d95e7f5100281067ddde4845dfad3dbb43 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
diff --git a/Spigot-Server-Patches/0349-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0348-Mob-Pathfinding-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0349-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0348-Mob-Pathfinding-API.patch
index 194af9afc1..79b66c115d 100644
--- a/Spigot-Server-Patches/0349-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0348-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From d45341eada2fdac81b627263e0f9a4b7c2b7bc10 Mon Sep 17 00:00:00 2001
+From 3501ae94e3889678406e8d15690cd905c859d788 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
diff --git a/Spigot-Server-Patches/0350-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0349-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 97%
rename from Spigot-Server-Patches/0350-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0349-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 18fe0f83bf..5b47b5bf0a 100644
--- a/Spigot-Server-Patches/0350-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0349-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From 544f74d213fdc5149acc86228ad5cac0427f3789 Mon Sep 17 00:00:00 2001
+From a6d0d3f88cd564ea13258eeb70929791801b6a63 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index 28edf37d0..bbffeae3d 100644
+index 431602cac..c0955d6ec 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -185,7 +185,8 @@ public abstract class FluidTypeFlowing extends FluidType {
diff --git a/Spigot-Server-Patches/0351-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0350-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0351-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0350-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 3dfdfec4d1..415e92d84b 100644
--- a/Spigot-Server-Patches/0351-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0350-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,4 +1,4 @@
-From 125c1ae05584e68ca0228f4a29f26a54371a5820 Mon Sep 17 00:00:00 2001
+From 79274884292748c5830bd23cdd4b329093e56e7e Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
diff --git a/Spigot-Server-Patches/0352-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0351-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0352-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0351-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index d2625c5961..92957d03ba 100644
--- a/Spigot-Server-Patches/0352-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0351-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,4 +1,4 @@
-From 03753fce4c12f59e44a7565653c930538db64908 Mon Sep 17 00:00:00 2001
+From b9d64587ae8fa0d608b6d970b08368113e8f73aa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
@@ -74,7 +74,7 @@ index e58fdee8b..f2c4048c2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9edcf0257..9bfc5db39 100644
+index d12e4763a..a7302b39c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -764,7 +764,17 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0353-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0352-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0353-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0352-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 40806e6dbc..e616d755c0 100644
--- a/Spigot-Server-Patches/0353-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0352-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 0fc15178f4b4df4561c69c969471de117ec11d88 Mon Sep 17 00:00:00 2001
+From 8b1bb76c61044895a83195a93978c5ba1af14de5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks
diff --git a/Spigot-Server-Patches/0354-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0353-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 97%
rename from Spigot-Server-Patches/0354-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0353-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index d29cdf1475..3ff9ed0f6f 100644
--- a/Spigot-Server-Patches/0354-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0353-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From aa754d6ca5dce33051ca97a2665268bbf49b1ce9 Mon Sep 17 00:00:00 2001
+From 258bbb1d83dd2f662c4725e4520e722acf85b934 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
diff --git a/Spigot-Server-Patches/0355-Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/0354-Optimize-and-Fix-ExpiringMap-Issues.patch
similarity index 99%
rename from Spigot-Server-Patches/0355-Optimize-and-Fix-ExpiringMap-Issues.patch
rename to Spigot-Server-Patches/0354-Optimize-and-Fix-ExpiringMap-Issues.patch
index 027389b98d..ff5193eaad 100644
--- a/Spigot-Server-Patches/0355-Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/0354-Optimize-and-Fix-ExpiringMap-Issues.patch
@@ -1,4 +1,4 @@
-From eac13d2ed91683f10ee47dec5283046be299e0f5 Mon Sep 17 00:00:00 2001
+From 370fdd742cc646eda4300fc51556ad3a03aacfb1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 16 Sep 2018 00:00:16 -0400
 Subject: [PATCH] Optimize and Fix ExpiringMap Issues
diff --git a/Spigot-Server-Patches/0356-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0355-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0356-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0355-Implement-furnace-cook-speed-multiplier-API.patch
index c72ac7426f..ab13b98469 100644
--- a/Spigot-Server-Patches/0356-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0355-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 281cf6008ce76eb1809239170f0e60e4a56d1793 Mon Sep 17 00:00:00 2001
+From e6278f7b1afddb39628b007f2f651679894c54e9 Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
diff --git a/Spigot-Server-Patches/0357-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch
similarity index 98%
rename from Spigot-Server-Patches/0357-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch
index a0a81ba150..882f9c479f 100644
--- a/Spigot-Server-Patches/0357-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From f2d7d60de5fc9f1c38b570c3133fde69af05fb6d Mon Sep 17 00:00:00 2001
+From 46226e106cc137643f5ac72ef84644664d2b5760 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
diff --git a/Spigot-Server-Patches/0358-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0357-Optimize-Server-World-Map.patch
similarity index 99%
rename from Spigot-Server-Patches/0358-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0357-Optimize-Server-World-Map.patch
index 6351512ee2..af3a0dc9c3 100644
--- a/Spigot-Server-Patches/0358-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0357-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 95829d064a601441f7c7f13d845608e5d00bb1f3 Mon Sep 17 00:00:00 2001
+From e50938d7b680aec6e1b487ace88c4d1351a38db5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
diff --git a/Spigot-Server-Patches/0359-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0358-PreSpawnerSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0359-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0358-PreSpawnerSpawnEvent.patch
index 1d62dbdc70..d240564c3c 100644
--- a/Spigot-Server-Patches/0359-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0358-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 522598e29ee35ab64a9c62aafcb78a57a202a8bb Mon Sep 17 00:00:00 2001
+From 6510bcdfe343936432ec730caa99f9bc4029cea6 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
diff --git a/Spigot-Server-Patches/0360-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 98%
rename from Spigot-Server-Patches/0360-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 80fce5ffa7..6fa0bd9e88 100644
--- a/Spigot-Server-Patches/0360-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From a474fdc7768a5473ece227a6c037f4a2b552c01d Mon Sep 17 00:00:00 2001
+From c7e5b48b5ea474914bbc5dd37cac4a39a69a2b87 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -26,7 +26,7 @@ index e38a0d488..a245df1dc 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index acd89649c..49ddb9715 100644
+index f470d7090..be555f82d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1742,7 +1742,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0361-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch
similarity index 94%
rename from Spigot-Server-Patches/0361-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch
index 10a3cd07e3..5d2cc5c502 100644
--- a/Spigot-Server-Patches/0361-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From b7eb941955ef61c16f5422f60400d65fa60dbdd6 Mon Sep 17 00:00:00 2001
+From 0334632709977dec5c7b1ddeeb99070ea77f3eb8 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
diff --git a/Spigot-Server-Patches/0362-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0361-Honor-EntityAgeable.ageLock.patch
similarity index 91%
rename from Spigot-Server-Patches/0362-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0361-Honor-EntityAgeable.ageLock.patch
index df1fae8036..916fc08048 100644
--- a/Spigot-Server-Patches/0362-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0361-Honor-EntityAgeable.ageLock.patch
@@ -1,4 +1,4 @@
-From 9f6bf5a9f952475fc29bfe8fec7208732e0ae2b6 Mon Sep 17 00:00:00 2001
+From dcf95f62ae968eeb17aa06bfea3e4cb0842d4178 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 23 Sep 2018 20:59:53 -0500
 Subject: [PATCH] Honor EntityAgeable.ageLock
diff --git a/Spigot-Server-Patches/0363-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch
similarity index 99%
rename from Spigot-Server-Patches/0363-Async-Chunk-Loading-and-Generation.patch
rename to Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch
index 4bfdf78799..3402e0e3d1 100644
--- a/Spigot-Server-Patches/0363-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch
@@ -1,4 +1,4 @@
-From 16ac299068f1e64f24ff8e93f4952865b7c89c22 Mon Sep 17 00:00:00 2001
+From 126fcc3b0e84e0ee1b2d356311d8f6b2a32625c4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@@ -934,7 +934,7 @@ index f5a6387f2..f45685099 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 49ddb9715..ec54a77e6 100644
+index be555f82d..3e81ebdb8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -207,7 +207,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2056,7 +2056,7 @@ index 284e96710..8b08efe1f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9bfc5db39..2224eeab2 100644
+index a7302b39c..739fbecac 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -41,7 +41,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
diff --git a/Spigot-Server-Patches/0364-Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch
similarity index 93%
rename from Spigot-Server-Patches/0364-Ignore-Dimension-NBT-field-in-Entity-data.patch
rename to Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch
index 4b6fafb923..b5622b307a 100644
--- a/Spigot-Server-Patches/0364-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -1,4 +1,4 @@
-From 07e36065266568c429590e1e040ccf09bf8ef204 Mon Sep 17 00:00:00 2001
+From 00a896b679177fdfc8eca7f47828cc42481641fe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
@@ -14,7 +14,7 @@ DimensionManager set to the world it is being placed into.
 This fixes corrupt entities breaking chunk saving in custom worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ec54a77e6..235061e57 100644
+index 3e81ebdb8..52ef2c9c2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1729,7 +1729,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0365-Optimize-Light-Recalculations.patch b/Spigot-Server-Patches/0364-Optimize-Light-Recalculations.patch
similarity index 97%
rename from Spigot-Server-Patches/0365-Optimize-Light-Recalculations.patch
rename to Spigot-Server-Patches/0364-Optimize-Light-Recalculations.patch
index 38d73c44be..77646cd2ce 100644
--- a/Spigot-Server-Patches/0365-Optimize-Light-Recalculations.patch
+++ b/Spigot-Server-Patches/0364-Optimize-Light-Recalculations.patch
@@ -1,4 +1,4 @@
-From c5c8ec25c00ac3bbda8b6ee3fdfdd372b8bbac38 Mon Sep 17 00:00:00 2001
+From 68e14a1e03878d225c0026275611d94a77947081 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 20:46:29 -0400
 Subject: [PATCH] Optimize Light Recalculations
@@ -52,7 +52,7 @@ index fb00e7a9c..fdf062b8b 100644
                      int i1 = iblockdata.b(this.world, blockposition);
                      int j1 = iblockdata1.b(this.world, blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2224eeab2..57de5f48a 100644
+index 739fbecac..739448d8b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -591,8 +591,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0366-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0365-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0366-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0365-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index 979eb9a53d..58c6e7ae50 100644
--- a/Spigot-Server-Patches/0366-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0365-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 4345f180fd5a8c0b232e82e5c8d59342602a8c4f Mon Sep 17 00:00:00 2001
+From 78aed292564c995e7aec1bcfd4fe1c89acb58e31 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
@@ -18,7 +18,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 57de5f48a..2e48ea9d8 100644
+index 739448d8b..e88e265bf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1081,7 +1081,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0367-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0366-Don-t-recheck-type-after-setting-a-block.patch
similarity index 95%
rename from Spigot-Server-Patches/0367-Don-t-recheck-type-after-setting-a-block.patch
rename to Spigot-Server-Patches/0366-Don-t-recheck-type-after-setting-a-block.patch
index 5b3cc2c51a..05ff2f6ff7 100644
--- a/Spigot-Server-Patches/0367-Don-t-recheck-type-after-setting-a-block.patch
+++ b/Spigot-Server-Patches/0366-Don-t-recheck-type-after-setting-a-block.patch
@@ -1,4 +1,4 @@
-From c74d9072387dce3b2e4ba0406bb087da22b97176 Mon Sep 17 00:00:00 2001
+From 8a5e07c9519d35e5ac82330c9d68f08b40f569c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 22:27:33 -0400
 Subject: [PATCH] Don't recheck type after setting a block
diff --git a/Spigot-Server-Patches/0368-Fix-Sending-Chunks-to-Client.patch b/Spigot-Server-Patches/0367-Fix-Sending-Chunks-to-Client.patch
similarity index 97%
rename from Spigot-Server-Patches/0368-Fix-Sending-Chunks-to-Client.patch
rename to Spigot-Server-Patches/0367-Fix-Sending-Chunks-to-Client.patch
index a95e58bb3a..dff9de979f 100644
--- a/Spigot-Server-Patches/0368-Fix-Sending-Chunks-to-Client.patch
+++ b/Spigot-Server-Patches/0367-Fix-Sending-Chunks-to-Client.patch
@@ -1,4 +1,4 @@
-From 18286af8e0396d079dd3aac05c304cd29cc68de1 Mon Sep 17 00:00:00 2001
+From 56d87b1b48beb896633f0c9364806f711ae53655 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 29 Sep 2018 01:18:16 -0400
 Subject: [PATCH] Fix Sending Chunks to Client
diff --git a/Spigot-Server-Patches/0369-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0368-Configurable-connection-throttle-kick-message.patch
similarity index 97%
rename from Spigot-Server-Patches/0369-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0368-Configurable-connection-throttle-kick-message.patch
index bcd82fc8e0..93238dad9b 100644
--- a/Spigot-Server-Patches/0369-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0368-Configurable-connection-throttle-kick-message.patch
@@ -1,4 +1,4 @@
-From d08710d4257ab8f3b8c7089140c1de1f877382eb Mon Sep 17 00:00:00 2001
+From 74dc5cf3e80d9f99293f89c4273358f65f755549 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message
diff --git a/Spigot-Server-Patches/0370-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0369-Fix-FileIOThread-concurrency-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0370-Fix-FileIOThread-concurrency-issues.patch
rename to Spigot-Server-Patches/0369-Fix-FileIOThread-concurrency-issues.patch
index f38ca8eb37..adfa84c73f 100644
--- a/Spigot-Server-Patches/0370-Fix-FileIOThread-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0369-Fix-FileIOThread-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From 4f4907cd5fd6564da326c5abb2f2816007b4059c Mon Sep 17 00:00:00 2001
+From a3fbb3c9303e070a1a4110b2bcacfb69e5562054 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 3 Oct 2018 19:04:53 +0100
 Subject: [PATCH] Fix FileIOThread concurrency issues
diff --git a/Spigot-Server-Patches/0371-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0370-Hook-into-CB-plugin-rewrites.patch
similarity index 99%
rename from Spigot-Server-Patches/0371-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0370-Hook-into-CB-plugin-rewrites.patch
index 236ba558ae..dab971a086 100644
--- a/Spigot-Server-Patches/0371-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0370-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From e763015c2f584525e1da87691ebf9570ba516d69 Mon Sep 17 00:00:00 2001
+From b99974a67eb570f26dab20309617378f7450c89a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
diff --git a/Spigot-Server-Patches/0372-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0371-Allow-setting-the-vex-s-summoner.patch
similarity index 95%
rename from Spigot-Server-Patches/0372-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0371-Allow-setting-the-vex-s-summoner.patch
index 8ef6d5304e..75e0848fae 100644
--- a/Spigot-Server-Patches/0372-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0371-Allow-setting-the-vex-s-summoner.patch
@@ -1,4 +1,4 @@
-From 22634d13454d06024532e4b44f68af7d216ba742 Mon Sep 17 00:00:00 2001
+From ad4eebb90434f0752dcbecb8a163e6bfe6ba87dd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner
diff --git a/Spigot-Server-Patches/0373-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch
similarity index 98%
rename from Spigot-Server-Patches/0373-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch
index c8ef330471..66e8269a55 100644
--- a/Spigot-Server-Patches/0373-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From 028f2d7f254b02f2344c8ac875dbbdd531c151cd Mon Sep 17 00:00:00 2001
+From 0fad12f0b78bc75be6ccade99778318ffde58ee0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -46,7 +46,7 @@ index 1c0b783e8..dad1ff737 100644
      public MovingObjectPosition b(Vec3D vec3d, Vec3D vec3d1) {
          return this.a(vec3d, vec3d1, (BlockPosition) null);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 235061e57..a82714574 100644
+index 52ef2c9c2..4fa992316 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1533,6 +1533,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -71,7 +71,7 @@ index 235061e57..a82714574 100644
          return this.d(this.pitch, this.yaw);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f48ddbc68..1023505d1 100644
+index 3d1cdd627..14f102968 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0374-Add-sun-related-API.patch b/Spigot-Server-Patches/0373-Add-sun-related-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0374-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0373-Add-sun-related-API.patch
index e00c349aa3..5bde4d4b91 100644
--- a/Spigot-Server-Patches/0374-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0373-Add-sun-related-API.patch
@@ -1,4 +1,4 @@
-From 87d1c7a76330cf12eb0bd67b160961f2d4355ac2 Mon Sep 17 00:00:00 2001
+From 9ea7c799dd3324001490189303392b36d4e89f10 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
@@ -17,7 +17,7 @@ index ee5078370..3059682a4 100644
          if (this.world.L() && !this.world.isClientSide) {
              float f = this.az();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2e48ea9d8..a21de9b3d 100644
+index e88e265bf..d9006a2d6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0375-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0374-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 95%
rename from Spigot-Server-Patches/0375-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0374-Check-Drowned-for-Villager-Aggression-Config.patch
index 631f1f5ed7..e45e363f0b 100644
--- a/Spigot-Server-Patches/0375-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0374-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,4 +1,4 @@
-From 2a79b79c6f44abaf6cca0c254bfc014dfe80fc2c Mon Sep 17 00:00:00 2001
+From e407281f62615d5c907d7df945bd41eea9e0d8eb Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
diff --git a/Spigot-Server-Patches/0376-Here-s-Johnny.patch b/Spigot-Server-Patches/0375-Here-s-Johnny.patch
similarity index 96%
rename from Spigot-Server-Patches/0376-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0375-Here-s-Johnny.patch
index dc767a5924..1221fba74d 100644
--- a/Spigot-Server-Patches/0376-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0375-Here-s-Johnny.patch
@@ -1,4 +1,4 @@
-From 9f55006a73e6cebd575002ed48f7fbf820a52a35 Mon Sep 17 00:00:00 2001
+From 6230a02a2c1701e0d533b11d90147b2b08d9b968 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!
diff --git a/Spigot-Server-Patches/0377-Turtle-API.patch b/Spigot-Server-Patches/0376-Turtle-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0377-Turtle-API.patch
rename to Spigot-Server-Patches/0376-Turtle-API.patch
index 4161ef876c..b3acffe187 100644
--- a/Spigot-Server-Patches/0377-Turtle-API.patch
+++ b/Spigot-Server-Patches/0376-Turtle-API.patch
@@ -1,4 +1,4 @@
-From 840d10f8cefb7f0fb445240ec43d5a39bcf895f3 Mon Sep 17 00:00:00 2001
+From da6d5c11859fc142c18eea0194faf0f53c4d58f6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
diff --git a/Spigot-Server-Patches/0378-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch
similarity index 98%
rename from Spigot-Server-Patches/0378-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch
index 836810557e..a6c613c998 100644
--- a/Spigot-Server-Patches/0378-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch
@@ -1,4 +1,4 @@
-From d05e9f6ac6e00c2ecdbcba37bde6f575f4e18d4c Mon Sep 17 00:00:00 2001
+From c42c13d5dbe4ecbfa968caf358f3fc38f352c92a Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
diff --git a/Spigot-Server-Patches/0379-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0378-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 97%
rename from Spigot-Server-Patches/0379-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0378-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 9dc54a3e86..0ba71c455d 100644
--- a/Spigot-Server-Patches/0379-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0378-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 6f31765d9967bba38cd09911a54b48a701dba5b4 Mon Sep 17 00:00:00 2001
+From bacfdeb718a1a43b35ea4cefdd5c1ca4bd00b434 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
diff --git a/Spigot-Server-Patches/0380-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0379-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 96%
rename from Spigot-Server-Patches/0380-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0379-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 2b26e347a7..c3820f01bd 100644
--- a/Spigot-Server-Patches/0380-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0379-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From f68336ea1c40cf143abe86158e6e6db2beafd268 Mon Sep 17 00:00:00 2001
+From 0f87ea655baaaa6ca4d45542454bd04f44104ded Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
diff --git a/Spigot-Server-Patches/0381-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0380-Call-player-spectator-target-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0381-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0380-Call-player-spectator-target-events.patch
index bace84ec84..256d757dd4 100644
--- a/Spigot-Server-Patches/0381-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0380-Call-player-spectator-target-events.patch
@@ -1,4 +1,4 @@
-From a854a7b5588062bada57d6f473da1caafcaf14f2 Mon Sep 17 00:00:00 2001
+From a630ba6ecd087103a6cd941d4aa9a58f131b6b07 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
diff --git a/Spigot-Server-Patches/0382-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0381-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from Spigot-Server-Patches/0382-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0381-Add-Velocity-IP-Forwarding-Support.patch
index 40009807c5..df82918f88 100644
--- a/Spigot-Server-Patches/0382-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0381-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From 1271279035cd2cdca7f5692aab1430f19cda31a2 Mon Sep 17 00:00:00 2001
+From 030d1e586741e3af6dae59830ea6b957fb4f9f58 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
diff --git a/Spigot-Server-Patches/0383-Add-more-Witch-API.patch b/Spigot-Server-Patches/0382-Add-more-Witch-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0383-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0382-Add-more-Witch-API.patch
index 4202ea56b5..9a146b7510 100644
--- a/Spigot-Server-Patches/0383-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0382-Add-more-Witch-API.patch
@@ -1,4 +1,4 @@
-From 3889a94875866da0cd6d4fdb46ac5577a4539a91 Mon Sep 17 00:00:00 2001
+From ef215c6f3536a6b336f0cd737f9bafa3d3d896e2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
diff --git a/Spigot-Server-Patches/0384-Fix-MC-93764.patch b/Spigot-Server-Patches/0383-Fix-MC-93764.patch
similarity index 91%
rename from Spigot-Server-Patches/0384-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0383-Fix-MC-93764.patch
index 16346de8a9..763d8adbeb 100644
--- a/Spigot-Server-Patches/0384-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0383-Fix-MC-93764.patch
@@ -1,4 +1,4 @@
-From fdb341d9208fc88c45afdfa5ea676af314893617 Mon Sep 17 00:00:00 2001
+From 9bdbdfd3170d2be7b170cf55bc65960fb2b507a8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
diff --git a/Spigot-Server-Patches/0385-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 97%
rename from Spigot-Server-Patches/0385-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch
index bb6add2d36..b09e84c96d 100644
--- a/Spigot-Server-Patches/0385-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From 8d6a0c67d91465646f20d6bcea39849f4c83fd6a Mon Sep 17 00:00:00 2001
+From a934c12a69f5fe8a16185e217602893fe736bc7d Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -20,7 +20,7 @@ index d723868fc..8210b22eb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7e285c629..0ee9e7095 100644
+index a7b4439f0..3dfaef056 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -341,6 +341,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0386-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch
similarity index 92%
rename from Spigot-Server-Patches/0386-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch
index 2f3babed73..e03a86a922 100644
--- a/Spigot-Server-Patches/0386-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From fcfc45227ee51e5c988f5317120013076e086631 Mon Sep 17 00:00:00 2001
+From 160f88409f7264bfd857f58826b83555d7b626db Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a82714574..28ec879ed 100644
+index 4fa992316..b3491c7ce 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2332,7 +2332,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0387-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0386-Strip-private-area-unicode-characters-from-signs.patch
similarity index 98%
rename from Spigot-Server-Patches/0387-Strip-private-area-unicode-characters-from-signs.patch
rename to Spigot-Server-Patches/0386-Strip-private-area-unicode-characters-from-signs.patch
index 747a27ff22..e6891f0f5c 100644
--- a/Spigot-Server-Patches/0387-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0386-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From 05a05086b51e934ef63f0a8b023ca80453bb563d Mon Sep 17 00:00:00 2001
+From 560ee9e68a8e3030c7ae0872505ec276dbe4fefb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
diff --git a/Spigot-Server-Patches/0388-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0387-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 96%
rename from Spigot-Server-Patches/0388-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0387-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 631168ef14..6636ea7214 100644
--- a/Spigot-Server-Patches/0388-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0387-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 554f78b8d61e076ba2b6c38ac250f0259e6e0e0b Mon Sep 17 00:00:00 2001
+From 3405b5f2508cfb61c5b429d7a5a629ca856e4ad9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
diff --git a/Spigot-Server-Patches/0389-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0388-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 94%
rename from Spigot-Server-Patches/0389-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0388-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 5e122b1f13..66d779a433 100644
--- a/Spigot-Server-Patches/0389-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0388-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,4 +1,4 @@
-From c385874bb1a911ae87a08c3ecaafacae1667abb8 Mon Sep 17 00:00:00 2001
+From cc0a58a8c8a6d10ba3460969f2b1267211128d21 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
diff --git a/Spigot-Server-Patches/0390-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0389-Use-EntityTypes-for-living-entities.patch
similarity index 99%
rename from Spigot-Server-Patches/0390-Use-EntityTypes-for-living-entities.patch
rename to Spigot-Server-Patches/0389-Use-EntityTypes-for-living-entities.patch
index 3718cc5591..0ea2d8cbdc 100644
--- a/Spigot-Server-Patches/0390-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0389-Use-EntityTypes-for-living-entities.patch
@@ -1,4 +1,4 @@
-From 0638effa3977ba91ac7ad81d2b770152e70239fe Mon Sep 17 00:00:00 2001
+From fe18b0ba4dedd917601d2eb2ef3f534635b4c7f9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities
diff --git a/Spigot-Server-Patches/0391-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0390-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
similarity index 96%
rename from Spigot-Server-Patches/0391-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
rename to Spigot-Server-Patches/0390-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index 02e75b53fa..026742c8ef 100644
--- a/Spigot-Server-Patches/0391-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0390-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From e8113ca713464a138cb8e324be1f40a5b5d18657 Mon Sep 17 00:00:00 2001
+From b2af8215533a37b4ba09975a4472790ca9a63682 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
diff --git a/Spigot-Server-Patches/0392-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0391-Optimize-World-Time-Updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0392-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0391-Optimize-World-Time-Updates.patch
index f6db99c86b..b731b5994c 100644
--- a/Spigot-Server-Patches/0392-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0391-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From d3414568c39ff5340ce00d38075c63ef00c50313 Mon Sep 17 00:00:00 2001
+From 354a84e86917aacb348049818f5a2bacb3f4caf7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
diff --git a/Spigot-Server-Patches/0393-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0392-Restore-custom-InventoryHolder-support.patch
similarity index 96%
rename from Spigot-Server-Patches/0393-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0392-Restore-custom-InventoryHolder-support.patch
index 24ca51a7b4..db97bcff74 100644
--- a/Spigot-Server-Patches/0393-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0392-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From 6c68ae69a20f9f6fbc4e03543a3ff2a46019ccba Mon Sep 17 00:00:00 2001
+From 6b6d7942e9bb5ad754b836326ea2f9148302156f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
diff --git a/Spigot-Server-Patches/0394-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0393-Use-Vanilla-Minecart-Speeds.patch
similarity index 94%
rename from Spigot-Server-Patches/0394-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0393-Use-Vanilla-Minecart-Speeds.patch
index c46fba5528..f68d75a9a1 100644
--- a/Spigot-Server-Patches/0394-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0393-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From cccd965a231f6bb88ef265299a2242f222b3be12 Mon Sep 17 00:00:00 2001
+From 792f1c9084fbe17db6d7fc1a7f8696076ea3530b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
diff --git a/Spigot-Server-Patches/0395-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0394-Fix-SpongeAbsortEvent-handling.patch
similarity index 96%
rename from Spigot-Server-Patches/0395-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0394-Fix-SpongeAbsortEvent-handling.patch
index 8c38555be0..b433a45cc3 100644
--- a/Spigot-Server-Patches/0395-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0394-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From 0be5964d2811cef78db25e17d8dd2792c6f45c6e Mon Sep 17 00:00:00 2001
+From b7698e8589cf36333efe29a2299c47fa4be71dcd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
diff --git a/Spigot-Server-Patches/0396-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0395-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 87%
rename from Spigot-Server-Patches/0396-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0395-Don-t-allow-digging-into-unloaded-chunks.patch
index ecde3fd346..efa29a3901 100644
--- a/Spigot-Server-Patches/0396-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0395-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,14 +1,14 @@
-From 2dd901e48989d8ad4ce19b66416e1f7e9159c661 Mon Sep 17 00:00:00 2001
+From 71f409afaab237ea4e309739295d16c0b1cd232c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0ee9e7095..1d6f70a72 100644
+index 3dfaef056..e8cef58cb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1223,6 +1223,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1207,6 +1207,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          case START_DESTROY_BLOCK:
          case ABORT_DESTROY_BLOCK:
          case STOP_DESTROY_BLOCK:
diff --git a/Spigot-Server-Patches/0397-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0397-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch
index 4d166976ee..570f7d2b72 100644
--- a/Spigot-Server-Patches/0397-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 1c19a7882b65906c0ee80a39fdcb8d745898581b Mon Sep 17 00:00:00 2001
+From 9392c69898ef0bcbd528eedb4588c9d1d64675a3 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -954,7 +954,7 @@ index 000000000..21d9d6d7e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 48c79568f..a09aa6944 100644
+index 2e30270bb..72d261707 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1122,7 +1122,7 @@ index 48c79568f..a09aa6944 100644
                  iblockdata.a(world, blockposition, 0);
                  world.setAir(blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a21de9b3d..2f12e35ac 100644
+index d9006a2d6..7f78445dc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -648,6 +648,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0398-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch
similarity index 97%
rename from Spigot-Server-Patches/0398-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch
index 49aa843c62..051af72b94 100644
--- a/Spigot-Server-Patches/0398-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From d2dfc530ddc68fc0d31d867ca56f81dd09c6a57e Mon Sep 17 00:00:00 2001
+From c6ddf8aedf7a24641bfb79511c59c10242f607ac Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 28ec879ed..5aa26d9ee 100644
+index b3491c7ce..3c2e79b14 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2094,12 +2094,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -90,7 +90,7 @@ index 4bbf57752..f5d9b4abc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1023505d1..d134d0fae 100644
+index 14f102968..4d5459d24 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2479,10 +2479,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0399-Book-Size-Limits.patch b/Spigot-Server-Patches/0398-Book-Size-Limits.patch
similarity index 97%
rename from Spigot-Server-Patches/0399-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0398-Book-Size-Limits.patch
index e27ff4acb2..5c903e4460 100644
--- a/Spigot-Server-Patches/0399-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0398-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 6b2db9f703e6829eabec505bd796b51c0656f475 Mon Sep 17 00:00:00 2001
+From 901472d0286f689ca74f071a98a43dad6c5d2168 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
@@ -22,7 +22,7 @@ index 52ce8f89e..07f0b4529 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1d6f70a72..391ecc9db 100644
+index e8cef58cb..74b27322f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -12,6 +12,8 @@ import java.util.Collections;
diff --git a/Spigot-Server-Patches/0400-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0400-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch
index 20228d00bd..6fa32fe897 100644
--- a/Spigot-Server-Patches/0400-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch
@@ -1,4 +1,4 @@
-From 75cff715a223289dada2f0a9ca73c603ac0cf5fb Mon Sep 17 00:00:00 2001
+From 52001926d936c225b023d7526ad3dd1635076281 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
diff --git a/Spigot-Server-Patches/0401-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0400-Add-more-Zombie-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0401-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0400-Add-more-Zombie-API.patch
index 150a924332..178e9f66f6 100644
--- a/Spigot-Server-Patches/0401-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0400-Add-more-Zombie-API.patch
@@ -1,4 +1,4 @@
-From 96d2d95d063b97c649af6c0d861325cd3ef6ce37 Mon Sep 17 00:00:00 2001
+From 43af2664a31e1843a4c6a14fc57cebab8b3eef6e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
diff --git a/Spigot-Server-Patches/0402-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0401-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
similarity index 94%
rename from Spigot-Server-Patches/0402-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
rename to Spigot-Server-Patches/0401-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
index 5950a12504..ded7d3a659 100644
--- a/Spigot-Server-Patches/0402-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/0401-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@@ -1,4 +1,4 @@
-From 17b199cbe6c42c99fdc5d64fe6261ae8e770029a Mon Sep 17 00:00:00 2001
+From 95730a89b8feceb17a77e6f7513b07c3cdb5cdb1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 13 Nov 2018 14:01:00 +0000
 Subject: [PATCH] limit the range at which we'll consider an attackable target
@@ -12,7 +12,7 @@ decrease when set, allowing us to skip further checks earlier on
 when looking for an attackable entity
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2f12e35ac..a7f6288f5 100644
+index 7f78445dc..b6c602bd0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2729,8 +2729,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0403-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0402-Prevent-rayTrace-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0403-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0402-Prevent-rayTrace-from-loading-chunks.patch
index a759a5aa9f..2f96260a6b 100644
--- a/Spigot-Server-Patches/0403-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0402-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From a90d63af76870844060df4d7adeb642655193543 Mon Sep 17 00:00:00 2001
+From 8aded7fc32eb2d1e7f64a0f98b05ab61371196c8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a7f6288f5..380ef602e 100644
+index b6c602bd0..aa78ccb68 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0404-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0403-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from Spigot-Server-Patches/0404-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0403-Handle-Large-Packets-disconnecting-client.patch
index 7a618206eb..6d872bb9fc 100644
--- a/Spigot-Server-Patches/0404-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0403-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From e02ea5dc0c5d1a2b42f9f8cffef5a18c42a860cf Mon Sep 17 00:00:00 2001
+From 9536e33637881c75f5956442e16b5b389aa64b52 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
diff --git a/Spigot-Server-Patches/0405-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0404-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 97%
rename from Spigot-Server-Patches/0405-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0404-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 973ae38c01..b1545855b2 100644
--- a/Spigot-Server-Patches/0405-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0404-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From 994cf40747a9e207fdd94aad8888ef6704045198 Mon Sep 17 00:00:00 2001
+From edd48edd3662af1687e64c1142d6b74db20e0d16 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
diff --git a/Spigot-Server-Patches/0406-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0405-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0406-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0405-Add-PlayerConnectionCloseEvent.patch
index 950923a59c..881e2d03f2 100644
--- a/Spigot-Server-Patches/0406-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0405-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 24f5b7a6aefbb3db250009eff45ec749fc9457df Mon Sep 17 00:00:00 2001
+From 2d8964a5789d209c5ff26da414b9129e602c40ac Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
diff --git a/Spigot-Server-Patches/0407-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0406-Prevent-Enderman-from-loading-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0407-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0406-Prevent-Enderman-from-loading-chunks.patch
index cb733dc3f0..7cf2d72e56 100644
--- a/Spigot-Server-Patches/0407-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0406-Prevent-Enderman-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 6e420f53cfbd29e6ff63ef1def9976425e0c3bb1 Mon Sep 17 00:00:00 2001
+From f18f9c31dd37e88747b1c19a657bf7878de484ae Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
diff --git a/Spigot-Server-Patches/0408-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 99%
rename from Spigot-Server-Patches/0408-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 3fe11267f5..62cd3a0bc3 100644
--- a/Spigot-Server-Patches/0408-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From e344f4a68112289fab009b0f283508be9ef66f44 Mon Sep 17 00:00:00 2001
+From 5b3800c25be7d699871cabe943901ec67dbd70de Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
diff --git a/Spigot-Server-Patches/0409-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0408-Fix-PlayerEditBookEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0409-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0408-Fix-PlayerEditBookEvent.patch
index 47e3217297..7cda1338d2 100644
--- a/Spigot-Server-Patches/0409-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0408-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From ac58c1ed400f8cb8d0dc74074eb068e200d6cbe8 Mon Sep 17 00:00:00 2001
+From a0135105f12f99ae603f67df283cf5a0961c5769 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 391ecc9db..04344a371 100644
+index 74b27322f..bd3653be4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -823,10 +823,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0410-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0409-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 93%
rename from Spigot-Server-Patches/0410-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0409-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 78a8e9fa8a..a628d67101 100644
--- a/Spigot-Server-Patches/0410-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0409-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,4 +1,4 @@
-From 2270e5fa23896ccfba6b8360bde4f3ae0074f0d3 Mon Sep 17 00:00:00 2001
+From c30ea95b78ae18005efefec5a38836d7b8c423b2 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
diff --git a/Spigot-Server-Patches/0411-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0410-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 97%
rename from Spigot-Server-Patches/0411-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0410-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index ad9cb6baf2..b7a420b87c 100644
--- a/Spigot-Server-Patches/0411-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0410-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From e4bda78c8414c9b20781efd737759ffdf756af48 Mon Sep 17 00:00:00 2001
+From 5554a8ccf3d8199dea0a55f4104cd265c4d39b06 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
diff --git a/Spigot-Server-Patches/0412-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 95%
rename from Spigot-Server-Patches/0412-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch
index b347524c6b..4a0f107264 100644
--- a/Spigot-Server-Patches/0412-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From 35eb0a4b325bbdb3f7a1d53f39d438e65cfb2011 Mon Sep 17 00:00:00 2001
+From 180010dcd9ff9844849ea2416ca3c4046231b5d3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
diff --git a/Spigot-Server-Patches/0413-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0412-Allow-Saving-of-Oversized-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0413-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0412-Allow-Saving-of-Oversized-Chunks.patch
index d578e2f483..e63875f91a 100644
--- a/Spigot-Server-Patches/0413-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0412-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 26c2e34845483bb962e6b7415e571e00c8849842 Mon Sep 17 00:00:00 2001
+From b676fa2fa828bd7dbaa734620bcf463b8bfcea11 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
diff --git a/Spigot-Server-Patches/0414-BlockDestroyEvent.patch b/Spigot-Server-Patches/0413-BlockDestroyEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0414-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0413-BlockDestroyEvent.patch
index ae41c3dbf3..ef0037eb1d 100644
--- a/Spigot-Server-Patches/0414-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0413-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 2ca9c446682f9983713744f955af985a4e0190d3 Mon Sep 17 00:00:00 2001
+From d6bef87db05d23c6dea48e59f68f0706f63ea70a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 380ef602e..4d3f88431 100644
+index aa78ccb68..0624848cc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -548,8 +548,20 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0415-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0414-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 98%
rename from Spigot-Server-Patches/0415-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0414-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 4a50f2a5c1..c45c2db214 100644
--- a/Spigot-Server-Patches/0415-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0414-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From 0e0b416232c64de39fe9e7ccb0e0c70fdea72a19 Mon Sep 17 00:00:00 2001
+From 8076fb34e182a4674a5f985fe2327491f6294e39 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
diff --git a/Spigot-Server-Patches/0416-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0415-Fix-sign-edit-memory-leak.patch
similarity index 93%
rename from Spigot-Server-Patches/0416-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0415-Fix-sign-edit-memory-leak.patch
index 29d8cb4f26..b802eda810 100644
--- a/Spigot-Server-Patches/0416-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0415-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From babca63b4e7b4a3b90912973359014d69d5238b7 Mon Sep 17 00:00:00 2001
+From 61245c33905e034f89946592a7f8d42be2796817 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 04344a371..5c58b8538 100644
+index bd3653be4..690d932e3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2527,7 +2527,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2511,7 +2511,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
              TileEntitySign tileentitysign = (TileEntitySign) tileentity;
  
diff --git a/Spigot-Server-Patches/0417-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0416-Limit-Client-Sign-length-more.patch
similarity index 94%
rename from Spigot-Server-Patches/0417-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0416-Limit-Client-Sign-length-more.patch
index d879d2d22a..f485a193f4 100644
--- a/Spigot-Server-Patches/0417-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0416-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 8cc36c92535383739aa5fb7a5d57c7854f5ef38f Mon Sep 17 00:00:00 2001
+From 20caaee28c1b76471f55dd356568c9380c07df20 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5c58b8538..dc8c20efb 100644
+index 690d932e3..c4edb5b85 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -104,6 +104,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -33,7 +33,7 @@ index 5c58b8538..dc8c20efb 100644
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
  
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
-@@ -2543,6 +2544,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2527,6 +2528,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
diff --git a/Spigot-Server-Patches/0418-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0417-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 95%
rename from Spigot-Server-Patches/0418-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0417-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 355cf71d6a..f31a40f940 100644
--- a/Spigot-Server-Patches/0418-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0417-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 9bdbd0618a195a535e814fb8fd4a57dea6e98aab Mon Sep 17 00:00:00 2001
+From 5c32222fa29000441f4be1bd0a3423cd519bb89a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
diff --git a/Spigot-Server-Patches/0419-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0418-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 98%
rename from Spigot-Server-Patches/0419-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0418-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index 3918076213..d7992fa78d 100644
--- a/Spigot-Server-Patches/0419-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0418-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From ca740a7103a7674d27106edb8e6a7a0a8eaff361 Mon Sep 17 00:00:00 2001
+From 3fb9b4659a7ce71a5b57e0df3ae085d6dc2762e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of
diff --git a/Spigot-Server-Patches/0420-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0419-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 97%
rename from Spigot-Server-Patches/0420-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0419-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 7b20c83216..22b25a7016 100644
--- a/Spigot-Server-Patches/0420-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0419-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From 3df95a31c5dd7127572ac377b9328425075db463 Mon Sep 17 00:00:00 2001
+From d7db57b339c57a92499d3cf10f4d6f55ad3fc104 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
diff --git a/Spigot-Server-Patches/0421-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0420-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 93%
rename from Spigot-Server-Patches/0421-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0420-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 5441ecbeab..450bb4de76 100644
--- a/Spigot-Server-Patches/0421-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0420-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 75ba6e0812c6d2849241fa2dd5957d46cbf8d3c0 Mon Sep 17 00:00:00 2001
+From 727fe100a19532c038f152a5dd279eb293a62e2a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
diff --git a/Spigot-Server-Patches/0422-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0421-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 91%
rename from Spigot-Server-Patches/0422-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0421-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index be23b32966..6edc093ebc 100644
--- a/Spigot-Server-Patches/0422-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0421-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,4 +1,4 @@
-From 513424d0a7b3f23173003091ab2047aced0bd016 Mon Sep 17 00:00:00 2001
+From b47b695772ea905a1556f6db24b198709000ab74 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
diff --git a/work/BuildData b/work/BuildData
index bcf503132c..7886694452 160000
--- a/work/BuildData
+++ b/work/BuildData
@@ -1 +1 @@
-Subproject commit bcf503132cdd66b4f92e41a8174e1b901467ec81
+Subproject commit 7886694452c8a42e0f708be0bb846c118bb7180a
diff --git a/work/Bukkit b/work/Bukkit
index 9a6a1de31b..279eeab35f 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 9a6a1de31bef4b0e54195d5b14f2915c4f90f87f
+Subproject commit 279eeab35f4cac02744055f8a0aaf9087f02fcf0
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 8d8475fc46..d3ed151625 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 8d8475fc46dad8fb40f4261b5ae4f382a4fd02b7
+Subproject commit d3ed151625eee11050717b79f81f54aa813a0970
diff --git a/work/Spigot b/work/Spigot
index cf694d87c1..e6eb36f2a1 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit cf694d87c16991fd93ca48fa1343072f468423ff
+Subproject commit e6eb36f2a1b5f11534f3e3c8277da14728fb027d