From 0708fa363b83f2ba47d858c9bfb94ffeb11b5ba1 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 16 Jul 2019 23:09:32 +0100
Subject: [PATCH] Updated Upstream (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

CraftBukkit Changes:
eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance
989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events
f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving
2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block

Spigot Changes:
9a643a6a Remove DataWatcher Locking
---
 ...-MinecraftKey-Information-to-Objects.patch |  14 +-
 ...to-current-Chunk-for-Entity-and-Bloc.patch |  12 +-
 Spigot-Server-Patches/0009-Timings-v2.patch   |  32 ++--
 ...ck-and-tnt-entities-at-the-specified.patch |  12 +-
 .../0025-Entity-Origin-API.patch              |  20 +--
 ...nfigurable-top-of-nether-void-damage.patch |  14 +-
 ...sition-the-first-time-an-entity-is-s.patch |   8 +-
 ...44-Ensure-commands-are-not-ran-async.patch |  14 +-
 .../0054-Add-exception-reporting-event.patch  |  10 +-
 ...oreboards-for-non-players-by-default.patch |  10 +-
 .../0058-Complete-resource-pack-API.patch     |   8 +-
 ...-Do-not-load-chunks-for-Pathfinding.patch} |  10 +-
 .../0080-Use-Optimized-Collections.patch      |  38 -----
 ...Do-not-load-chunks-for-light-checks.patch} |   4 +-
 ...082-Add-PlayerUseUnknownEntityEvent.patch} |   8 +-
 ...DebugInfo-not-initialized-on-client.patch} |   4 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |   6 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |   4 +-
 ...6-Remove-Debug-checks-from-DataBits.patch} |   4 +-
 ...illa-per-world-scoreboard-coloring-.patch} |  10 +-
 ...d-for-setting-passengers-on-players.patch} |   4 +-
 ...emove-unused-World-Tile-Entity-List.patch} |   4 +-
 ... 0090-Don-t-tick-Skulls-unused-code.patch} |   4 +-
 ... 0091-Configurable-Player-Collision.patch} |  10 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |   4 +-
 ...> 0093-Configurable-RCON-IP-address.patch} |   8 +-
 ...94-Prevent-Fire-from-loading-chunks.patch} |   4 +-
 ...5-Implement-PlayerLocaleChangeEvent.patch} |   6 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |   6 +-
 ...to-configure-frosted_ice-properties.patch} |   6 +-
 ...possibility-for-getServer-singleton.patch} |   4 +-
 ...tem-frames-performance-and-bug-fixe.patch} |  10 +-
 ...API-Replenishable-Lootables-Feature.patch} |  34 ++---
 ...-scoreboard-teams-to-scoreboard.dat.patch} |   6 +-
 ...em-property-for-disabling-watchdoge.patch} |   4 +-
 ...0103-Optimize-UserCache-Thread-Safe.patch} |   6 +-
 ...locking-on-Network-Manager-creation.patch} |   4 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} |  12 +-
 ...-redstone-torch-rapid-clock-removal.patch} |   6 +-
 ...h => 0107-Add-server-name-parameter.patch} |   4 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |   6 +-
 ...=> 0109-Fix-Double-World-Add-issues.patch} |   4 +-
 ...tch => 0110-Fix-Old-Sign-Conversion.patch} |   8 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |   4 +-
 ...ative-vehicle-moved-wrongly-message.patch} |   4 +-
 ...rs-that-dismount-from-other-players.patch} |   4 +-
 ...etting-for-proxy-online-mode-status.patch} |   8 +-
 ...timise-BlockState-s-hashCode-equals.patch} |  10 +-
 ...nfigurable-packet-in-spam-threshold.patch} |   8 +-
 ...7-Configurable-flying-kick-messages.patch} |   6 +-
 ...ch => 0118-Chunk-registration-fixes.patch} |   4 +-
 ...k-reference-on-Craft-Entity-removal.patch} |   4 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |   4 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |   6 +-
 ...nt.patch => 0122-Add-EntityZapEvent.patch} |   8 +-
 ...hunks-from-Hoppers-and-other-things.patch} |   4 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |   6 +-
 ...25-Cache-user-authenticator-threads.patch} |   4 +-
 ....patch => 0126-Optimise-removeQueue.patch} |   4 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |   4 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |   6 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |   4 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |   6 +-
 ... => 0131-Add-ProjectileCollideEvent.patch} |  12 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |   4 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |   6 +-
 ...igurable-Cartographer-Treasure-Maps.patch} |   6 +-
 ... => 0135-Optimize-ItemStack.isEmpty.patch} |   4 +-
 ...o-control-if-armour-stands-can-move.patch} |   6 +-
 ...7-Properly-fix-item-duplication-bug.patch} |   8 +-
 ...=> 0138-String-based-Action-Bar-API.patch} |   6 +-
 ...-API-s.patch => 0139-Firework-API-s.patch} |  10 +-
 ... 0140-PlayerTeleportEndGatewayEvent.patch} |   4 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |   2 +-
 ...h => 0142-Enforce-Sync-Player-Saves.patch} |   4 +-
 ...low-entities-to-ride-themselves-572.patch} |   6 +-
 ...atch => 0144-Fix-block-break-desync.patch} |   6 +-
 ...I-for-Reason-Source-Triggering-play.patch} |   2 +-
 ...patch => 0146-Cap-Entity-Collisions.patch} |   8 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |   4 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |  10 +-
 ...> 0149-Do-not-let-armorstands-drown.patch} |   6 +-
 ...e-async-calls-to-restart-the-server.patch} |   8 +-
 ...roperty-to-disable-book-size-limits.patch} |   4 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |  10 +-
 ...-option-to-prevent-player-names-fro.patch} |   6 +-
 ...leAppender-for-console-improvements.patch} |  28 ++--
 ...rable-option-to-disable-creeper-lin.patch} |   6 +-
 ....patch => 0156-Item-canEntityPickup.patch} |   8 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |   4 +-
 ...> 0158-PlayerAttemptPickupItemEvent.patch} |   4 +-
 ...tch => 0159-Add-UnknownCommandEvent.patch} |   4 +-
 ...tch => 0160-Basic-PlayerProfile-API.patch} |  20 +--
 ... 0161-Shoulder-Entities-Release-API.patch} |   6 +-
 ...patch => 0162-Profile-Lookup-Events.patch} |   4 +-
 ...layer-logins-during-server-shutdown.patch} |   4 +-
 ...patch => 0164-Entity-fromMobSpawner.patch} |  12 +-
 ...5-Improve-the-Saddle-API-for-Horses.patch} |   8 +-
 ...plement-ensureServerConversions-API.patch} |   2 +-
 ...> 0167-Implement-getI18NDisplayName.patch} |   2 +-
 ...=> 0168-ProfileWhitelistVerifyEvent.patch} |   4 +-
 ...ch => 0169-Fix-this-stupid-bullshit.patch} |   2 +-
 ...wns-should-honor-nametags-and-leash.patch} |   4 +-
 ...mer-when-spawner-event-is-cancelled.patch} |   4 +-
 ...2-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |   4 +-
 ...a-custom-authentication-servers-dow.patch} |   6 +-
 ...atch => 0174-LivingEntity-setKiller.patch} |   6 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |   6 +-
 ...-prefixes-using-Log4J-configuration.patch} |   8 +-
 ...Include-Log4J2-SLF4J-implementation.patch} |   4 +-
 ...efix-for-various-plugins-bypassing-.patch} |   4 +-
 ...t.patch => 0179-Add-PlayerJumpEvent.patch} |   4 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |   6 +-
 ...t-protocol-version-and-virtual-host.patch} |  12 +-
 ...t-serverside-behavior-of-keepalives.patch} |   4 +-
 ...Effects-only-to-players-who-can-see.patch} |   6 +-
 ...maximum-exp-value-when-merging-orbs.patch} |   6 +-
 ... => 0185-Add-PlayerArmorChangeEvent.patch} |   6 +-
 ...om-being-processed-when-the-player-.patch} |   4 +-
 ...-implementations-for-captured-block.patch} |   4 +-
 ...get-a-BlockState-without-a-snapshot.patch} |  10 +-
 ...patch => 0189-AsyncTabCompleteEvent.patch} |   8 +-
 ...90-Avoid-NPE-in-PathfinderGoalTempt.patch} |   4 +-
 ...=> 0191-PlayerPickupExperienceEvent.patch} |   4 +-
 ...tch => 0192-ExperienceOrbMergeEvent.patch} |   4 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |   8 +-
 ...max-squid-spawn-height-configurable.patch} |   6 +-
 ...patch => 0195-PreCreatureSpawnEvent.patch} |   6 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |   6 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |   6 +-
 ...> 0198-Fill-Profile-Property-Events.patch} |   4 +-
 ...layerAdvancementCriterionGrantEvent.patch} |   4 +-
 ...ch => 0200-Add-ArmorStand-Item-Meta.patch} |   2 +-
 ...Extend-Player-Interact-cancellation.patch} |   4 +-
 ... 0202-Tameable-getOwnerUniqueId-API.patch} |   6 +-
 ...-crits-helps-mitigate-hacked-client.patch} |   6 +-
 ...ing-location-from-InventoryEnderChe.patch} |   4 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |   4 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |   4 +-
 ...t-extended-PaperServerListPingEvent.patch} |  16 +-
 ... 0208-Improved-Async-Task-Scheduler.patch} |   6 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |   4 +-
 ...=> 0210-Player.setPlayerProfile-API.patch} |   8 +-
 ...h => 0211-Fix-Dragon-Server-Crashes.patch} |   4 +-
 ...patch => 0212-getPlayerUniqueId-API.patch} |   4 +-
 ...ake-player-data-saving-configurable.patch} |   6 +-
 ...e-legacy-ping-handler-more-reliable.patch} |   4 +-
 ...erverListPingEvent-for-legacy-pings.patch} |   6 +-
 ...6-Flag-to-disable-the-channel-limit.patch} |   4 +-
 ...-method-to-open-already-placed-sign.patch} |   4 +-
 ...rable-sprint-interruption-on-attack.patch} |   6 +-
 ...allowed-colored-signs-to-be-created.patch} |   6 +-
 ...t.patch => 0220-EndermanEscapeEvent.patch} |   4 +-
 ...h => 0221-Enderman.teleportRandomly.patch} |   6 +-
 ...222-Block-Enderpearl-Travel-Exploit.patch} |   6 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |   2 +-
 ...h => 0224-EndermanAttackPlayerEvent.patch} |   4 +-
 ...tch => 0225-WitchConsumePotionEvent.patch} |   4 +-
 ...patch => 0226-WitchThrowPotionEvent.patch} |   4 +-
 ...tem-entities-with-World.spawnEntity.patch} |   2 +-
 ...patch => 0228-WitchReadyPotionEvent.patch} |   4 +-
 ...229-ItemStack-getMaxItemUseDuration.patch} |   6 +-
 ...ement-EntityTeleportEndGatewayEvent.patch} |   4 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |   4 +-
 ...ch => 0232-Fix-CraftEntity-hashCode.patch} |   4 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |   6 +-
 ...ls-when-failing-to-save-player-data.patch} |   4 +-
 ...-shield-blocking-delay-configurable.patch} |   8 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |   4 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  10 +-
 ...patch => 0238-PlayerReadyArrowEvent.patch} |   4 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |   4 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |   4 +-
 ...patch => 0241-Expand-Explosions-API.patch} |   2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   6 +-
 ...-API.patch => 0243-RangedEntity-API.patch} |  18 +--
 ...o-disable-ender-dragon-legacy-check.patch} |   6 +-
 ...-Implement-World.getEntity-UUID-API.patch} |   2 +-
 ...0246-InventoryCloseEvent-Reason-API.patch} |  20 +--
 ...0247-Configurable-Bed-Search-Radius.patch} |   6 +-
 ...I.patch => 0248-Vex-getSummoner-API.patch} |   6 +-
 ...ventory-when-cancelling-PlayerInter.patch} |   6 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |   4 +-
 ...illa-entity-warnings-for-duplicates.patch} |   4 +-
 ...-if-stack-size-above-max-stack-size.patch} |   4 +-
 ...53-Use-asynchronous-Log4j-2-loggers.patch} |   2 +-
 ...more-information-to-Entity.toString.patch} |   6 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} |  10 +-
 ...ts.patch => 0256-EnderDragon-Events.patch} |   8 +-
 ...atch => 0257-PlayerElytraBoostEvent.patch} |   4 +-
 ...=> 0258-PlayerLaunchProjectileEvent.patch} |  14 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |   6 +-
 ...patch => 0260-Optimize-RegistryID.c.patch} |   4 +-
 ...-armor-stands-from-doing-entity-loo.patch} |   6 +-
 ...-Vanished-players-don-t-have-rights.patch} |   4 +-
 ...anytime-entities-change-to-guarante.patch} |   4 +-
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |   6 +-
 ...atch => 0265-EntityTransformedEvent.patch} |  10 +-
 ...tch => 0266-SkeletonHorse-Additions.patch} |   8 +-
 ...event-Saving-Bad-entities-to-chunks.patch} |   4 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |   2 +-
 ...ad-Entities-in-entityList-iteration.patch} |   4 +-
 ...-use-a-versioned-world-folder-for-t.patch} |   8 +-
 ...71-MC-111480-Start-Entity-ID-s-at-1.patch} |   4 +-
 ...2-Implement-Expanded-ArmorStand-API.patch} |   6 +-
 ...vent.patch => 0273-AnvilDamageEvent.patch} |   4 +-
 ...ent.patch => 0274-Add-TNTPrimeEvent.patch} |   8 +-
 ...d-make-tab-spam-limits-configurable.patch} |   6 +-
 ...h => 0276-Add-hand-to-bucket-events.patch} |  16 +-
 ...-Experience-should-save-as-Integers.patch} |   4 +-
 ...ent-rendering-skulls-from-same-user.patch} |  10 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  12 +-
 ...0280-Make-EnderDragon-implement-Mob.patch} |   4 +-
 ...ect-and-repair-corrupt-Region-Files.patch} |   4 +-
 ...2-Use-ConcurrentHashMap-in-JsonList.patch} |   4 +-
 ...3-Use-a-Queue-for-Queueing-Commands.patch} |   4 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |   2 +-
 ...llow-disabling-armour-stand-ticking.patch} |  10 +-
 ...timize-BlockPosition-helper-methods.patch} |   4 +-
 ...ts-from-world-player-list-not-serve.patch} |   2 +-
 ...tore-vanlla-default-mob-spawn-range.patch} |   2 +-
 ...pers.patch => 0289-Optimize-Hoppers.patch} |  12 +-
 ...90-Optimize-CraftBlockData-Creation.patch} |   2 +-
 ...-124320.patch => 0291-Fix-MC-124320.patch} |   6 +-
 ...tch => 0292-Slime-Pathfinder-Events.patch} |   6 +-
 ...e-speed-for-water-flowing-over-lava.patch} |   6 +-
 ... => 0294-Optimize-RegistryMaterials.patch} |   4 +-
 ...ch => 0295-Add-PhantomPreSpawnEvent.patch} |   8 +-
 ....patch => 0296-Add-More-Creeper-API.patch} |   6 +-
 ...=> 0297-Inventory-removeItemAnySlot.patch} |   4 +-
 ...oadChunk-int-int-false-load-unconve.patch} |   2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |   6 +-
 ...-attack-cooldown-methods-for-Player.patch} |   6 +-
 ....patch => 0301-Improve-death-events.patch} |  24 +--
 ...w-chests-to-be-placed-with-NBT-data.patch} |   6 +-
 ...I.patch => 0303-Mob-Pathfinding-API.patch} |  12 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |   4 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |   2 +-
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |   8 +-
 ...ning-from-loading-generating-chunks.patch} |   4 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   4 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |   6 +-
 ...0310-Support-Overriding-World-Seeds.patch} |  10 +-
 ...h => 0311-Optimize-Server-World-Map.patch} |   6 +-
 ....patch => 0312-PreSpawnerSpawnEvent.patch} |   4 +-
 ...rseException-in-Entity-and-TE-names.patch} |  14 +-
 ... 0314-Avoid-dimension-id-collisions.patch} |   4 +-
 ...=> 0315-Honor-EntityAgeable.ageLock.patch} |   4 +-
 ...le-connection-throttle-kick-message.patch} |   6 +-
 ...> 0317-Hook-into-CB-plugin-rewrites.patch} |   4 +-
 ...18-Allow-setting-the-vex-s-summoner.patch} |   6 +-
 ...I.patch => 0319-Add-sun-related-API.patch} |   2 +-
 ...wned-for-Villager-Aggression-Config.patch} |   4 +-
 ...-Johnny.patch => 0321-Here-s-Johnny.patch} |   6 +-
 ...Turtle-API.patch => 0322-Turtle-API.patch} |   6 +-
 ...it-lightning-strike-effect-distance.patch} |   8 +-
 ...her-worlds-for-shooter-of-projectil.patch} |   4 +-
 ...Call-player-spectator-target-events.patch} |   4 +-
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  18 +--
 ...PI.patch => 0327-Add-more-Witch-API.patch} |   6 +-
 ...MC-93764.patch => 0328-Fix-MC-93764.patch} |   4 +-
 ...vent-players-from-moving-into-unloa.patch} |   6 +-
 ...0-Reset-players-airTicks-on-respawn.patch} |   8 +-
 ...-area-unicode-characters-from-signs.patch} |   4 +-
 ...after-profile-lookups-if-not-needed.patch} |   2 +-
 ...le-thread-count-default-for-bootstr.patch} |   4 +-
 ...id-item-for-enchantment-checks-on-b.patch} |   4 +-
 ...=> 0335-Optimize-World-Time-Updates.patch} |   4 +-
 ...tore-custom-InventoryHolder-support.patch} |   4 +-
 ...=> 0337-Use-Vanilla-Minecart-Speeds.patch} |   4 +-
 ...0338-Fix-SpongeAbsortEvent-handling.patch} |   6 +-
 ...-allow-digging-into-unloaded-chunks.patch} |   6 +-
 ...=> 0340-Optimize-redstone-algorithm.patch} |  10 +-
 ...ntity-dismount-during-teleportation.patch} |  18 +--
 ...mits.patch => 0342-Book-Size-Limits.patch} |   6 +-
 ...ult-permission-message-configurable.patch} |   6 +-
 ...I.patch => 0344-Add-more-Zombie-API.patch} |   8 +-
 ...revent-rayTrace-from-loading-chunks.patch} |   4 +-
 ...-Large-Packets-disconnecting-client.patch} |  12 +-
 ...world-storage-in-CraftOfflinePlayer.patch} |   4 +-
 ...0348-Add-PlayerConnectionCloseEvent.patch} |   6 +-
 ...revent-Enderman-from-loading-chunks.patch} |   4 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |  10 +-
 ...tch => 0351-Fix-PlayerEditBookEvent.patch} |   4 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |   4 +-
 ...nRetractEvent-for-all-empty-pistons.patch} |   4 +-
 ...remove-from-being-called-on-Players.patch} |   4 +-
 ...55-Allow-Saving-of-Oversized-Chunks.patch} |  10 +-
 ...ent.patch => 0356-BlockDestroyEvent.patch} |   4 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |   4 +-
 ...h => 0358-Fix-sign-edit-memory-leak.patch} |   8 +-
 ... 0359-Limit-Client-Sign-length-more.patch} |   6 +-
 ...onvertSigns-boolean-every-sign-save.patch} |   4 +-
 ...Signs-in-Chunks-creating-too-large-.patch} |   8 +-
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |   6 +-
 ...t-tick-at-start-of-drowning-process.patch} |   4 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |   4 +-
 ...65-Add-LivingEntity-getTargetEntity.patch} |  16 +-
 ...ngth-when-serialising-BungeeCord-te.patch} |   4 +-
 ...=> 0367-Entity-getEntitySpawnReason.patch} |  14 +-
 ...ty-Metadata-for-all-tracked-players.patch} |   8 +-
 ...tch => 0369-Fire-event-on-GS4-query.patch} |   8 +-
 ...70-Implement-PlayerPostRespawnEvent.patch} |   4 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |   4 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |   4 +-
 ...ts.patch => 0373-Server-Tick-Events.patch} |   4 +-
 ...374-PlayerDeathEvent-getItemsToKeep.patch} |   4 +-
 ...s-to-fire-only-after-the-server-plu.patch} |   6 +-
 ...ion-files-more-reliable-to-write-to.patch} |   4 +-
 ...mize-GameRules-to-use-LinkedHashMap.patch} |   4 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |   4 +-
 ...API.patch => 0379-Add-Heightmap-API.patch} |   2 +-
 ...0-Handle-bad-chunks-more-gracefully.patch} |   4 +-
 ...> 0381-Mob-Spawner-API-Enhancements.patch} |   6 +-
 ...ayer-View-Distance-API-placeholders.patch} |   8 +-
 ...tch => 0383-Async-Chunk-placeholder.patch} |   2 +-
 ...-to-changed-postToMainThread-method.patch} |   4 +-
 ...-item-frames-are-modified-MC-123450.patch} |   6 +-
 ...sPrimaryThread-and-MinecraftServer-.patch} |   6 +-
 ...-entity-loss-due-to-unloaded-chunks.patch} |   4 +-
 ... 0388-Duplicate-UUID-Resolve-Option.patch} |  12 +-
 .../0388-Elide-lock-in-DataWatcher.patch      | 140 ------------------
 ...89-improve-CraftWorld-isChunkLoaded.patch} |   2 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |   2 +-
 ...-some-generation-concurrency-issues.patch} |   8 +-
 ...ityAreaEffectCloud-from-going-negat.patch} |   4 +-
 ....patch => 0393-ChunkMapDistance-CME.patch} |  31 +++-
 ...ually-Limit-Natural-Spawns-To-Limit.patch} |   4 +-
 ...0395-Implement-CraftBlockSoundGroup.patch} |  10 +-
 ...d.patch => 0396-Chunk-debug-command.patch} |   8 +-
 ...ch => 0397-incremental-chunk-saving.patch} |  14 +-
 ...ptions-from-dispenser-entity-spawns.patch} |   4 +-
 ...99-Fix-World-isChunkGenerated-calls.patch} |  10 +-
 ...te-location-if-we-failed-to-read-it.patch} |   4 +-
 ...-154214.patch => 0401-Fix-MC-154214.patch} |   4 +-
 ...ad-in-DataPaletteBlock-lock-failure.patch} |   6 +-
 ...tatus-cache-when-saving-protochunks.patch} |   6 +-
 ...6-Anti-Xray.patch => 0404-Anti-Xray.patch} |  10 +-
 ...l-Spawned-mobs-towards-natural-spaw.patch} |   2 +-
 work/CraftBukkit                              |   2 +-
 work/Spigot                                   |   2 +-
 341 files changed, 1086 insertions(+), 1249 deletions(-)
 rename Spigot-Server-Patches/{0081-Do-not-load-chunks-for-Pathfinding.patch => 0080-Do-not-load-chunks-for-Pathfinding.patch} (95%)
 delete mode 100644 Spigot-Server-Patches/0080-Use-Optimized-Collections.patch
 rename Spigot-Server-Patches/{0082-Do-not-load-chunks-for-light-checks.patch => 0081-Do-not-load-chunks-for-light-checks.patch} (90%)
 rename Spigot-Server-Patches/{0083-Add-PlayerUseUnknownEntityEvent.patch => 0082-Add-PlayerUseUnknownEntityEvent.patch} (89%)
 rename Spigot-Server-Patches/{0084-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0083-Fix-reducedDebugInfo-not-initialized-on-client.patch} (91%)
 rename Spigot-Server-Patches/{0085-Configurable-Grass-Spread-Tick-Rate.patch => 0084-Configurable-Grass-Spread-Tick-Rate.patch} (92%)
 rename Spigot-Server-Patches/{0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (89%)
 rename Spigot-Server-Patches/{0087-Remove-Debug-checks-from-DataBits.patch => 0086-Remove-Debug-checks-from-DataBits.patch} (95%)
 rename Spigot-Server-Patches/{0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (93%)
 rename Spigot-Server-Patches/{0089-Workaround-for-setting-passengers-on-players.patch => 0088-Workaround-for-setting-passengers-on-players.patch} (91%)
 rename Spigot-Server-Patches/{0090-Remove-unused-World-Tile-Entity-List.patch => 0089-Remove-unused-World-Tile-Entity-List.patch} (97%)
 rename Spigot-Server-Patches/{0091-Don-t-tick-Skulls-unused-code.patch => 0090-Don-t-tick-Skulls-unused-code.patch} (90%)
 rename Spigot-Server-Patches/{0092-Configurable-Player-Collision.patch => 0091-Configurable-Player-Collision.patch} (96%)
 rename Spigot-Server-Patches/{0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0092-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (96%)
 rename Spigot-Server-Patches/{0094-Configurable-RCON-IP-address.patch => 0093-Configurable-RCON-IP-address.patch} (94%)
 rename Spigot-Server-Patches/{0095-Prevent-Fire-from-loading-chunks.patch => 0094-Prevent-Fire-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0096-Implement-PlayerLocaleChangeEvent.patch => 0095-Implement-PlayerLocaleChangeEvent.patch} (96%)
 rename Spigot-Server-Patches/{0097-EntityRegainHealthEvent-isFastRegen-API.patch => 0096-EntityRegainHealthEvent-isFastRegen-API.patch} (93%)
 rename Spigot-Server-Patches/{0098-Add-ability-to-configure-frosted_ice-properties.patch => 0097-Add-ability-to-configure-frosted_ice-properties.patch} (96%)
 rename Spigot-Server-Patches/{0099-remove-null-possibility-for-getServer-singleton.patch => 0098-remove-null-possibility-for-getServer-singleton.patch} (95%)
 rename Spigot-Server-Patches/{0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0099-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (96%)
 rename Spigot-Server-Patches/{0101-LootTable-API-Replenishable-Lootables-Feature.patch => 0100-LootTable-API-Replenishable-Lootables-Feature.patch} (98%)
 rename Spigot-Server-Patches/{0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (92%)
 rename Spigot-Server-Patches/{0103-System-property-for-disabling-watchdoge.patch => 0102-System-property-for-disabling-watchdoge.patch} (89%)
 rename Spigot-Server-Patches/{0104-Optimize-UserCache-Thread-Safe.patch => 0103-Optimize-UserCache-Thread-Safe.patch} (96%)
 rename Spigot-Server-Patches/{0105-Avoid-blocking-on-Network-Manager-creation.patch => 0104-Avoid-blocking-on-Network-Manager-creation.patch} (96%)
 rename Spigot-Server-Patches/{0106-Optional-TNT-doesn-t-move-in-water.patch => 0105-Optional-TNT-doesn-t-move-in-water.patch} (94%)
 rename Spigot-Server-Patches/{0107-Faster-redstone-torch-rapid-clock-removal.patch => 0106-Faster-redstone-torch-rapid-clock-removal.patch} (97%)
 rename Spigot-Server-Patches/{0108-Add-server-name-parameter.patch => 0107-Add-server-name-parameter.patch} (90%)
 rename Spigot-Server-Patches/{0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0108-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (95%)
 rename Spigot-Server-Patches/{0110-Fix-Double-World-Add-issues.patch => 0109-Fix-Double-World-Add-issues.patch} (91%)
 rename Spigot-Server-Patches/{0111-Fix-Old-Sign-Conversion.patch => 0110-Fix-Old-Sign-Conversion.patch} (95%)
 rename Spigot-Server-Patches/{0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0111-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (90%)
 rename Spigot-Server-Patches/{0113-More-informative-vehicle-moved-wrongly-message.patch => 0112-More-informative-vehicle-moved-wrongly-message.patch} (90%)
 rename Spigot-Server-Patches/{0114-Re-track-players-that-dismount-from-other-players.patch => 0113-Re-track-players-that-dismount-from-other-players.patch} (92%)
 rename Spigot-Server-Patches/{0115-Add-setting-for-proxy-online-mode-status.patch => 0114-Add-setting-for-proxy-online-mode-status.patch} (94%)
 rename Spigot-Server-Patches/{0116-Optimise-BlockState-s-hashCode-equals.patch => 0115-Optimise-BlockState-s-hashCode-equals.patch} (94%)
 rename Spigot-Server-Patches/{0117-Configurable-packet-in-spam-threshold.patch => 0116-Configurable-packet-in-spam-threshold.patch} (91%)
 rename Spigot-Server-Patches/{0118-Configurable-flying-kick-messages.patch => 0117-Configurable-flying-kick-messages.patch} (94%)
 rename Spigot-Server-Patches/{0119-Chunk-registration-fixes.patch => 0118-Chunk-registration-fixes.patch} (91%)
 rename Spigot-Server-Patches/{0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (89%)
 rename Spigot-Server-Patches/{0121-Auto-fix-bad-Y-levels-on-player-login.patch => 0120-Auto-fix-bad-Y-levels-on-player-login.patch} (90%)
 rename Spigot-Server-Patches/{0122-Option-to-remove-corrupt-tile-entities.patch => 0121-Option-to-remove-corrupt-tile-entities.patch} (92%)
 rename Spigot-Server-Patches/{0123-Add-EntityZapEvent.patch => 0122-Add-EntityZapEvent.patch} (94%)
 rename Spigot-Server-Patches/{0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0123-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (94%)
 rename Spigot-Server-Patches/{0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0124-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (94%)
 rename Spigot-Server-Patches/{0126-Cache-user-authenticator-threads.patch => 0125-Cache-user-authenticator-threads.patch} (96%)
 rename Spigot-Server-Patches/{0127-Optimise-removeQueue.patch => 0126-Optimise-removeQueue.patch} (97%)
 rename Spigot-Server-Patches/{0128-Allow-Reloading-of-Command-Aliases.patch => 0127-Allow-Reloading-of-Command-Aliases.patch} (93%)
 rename Spigot-Server-Patches/{0129-Add-source-to-PlayerExpChangeEvent.patch => 0128-Add-source-to-PlayerExpChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0130-Optimize-World.isLoaded-BlockPosition-Z.patch => 0129-Optimize-World.isLoaded-BlockPosition-Z.patch} (90%)
 rename Spigot-Server-Patches/{0131-Don-t-let-fishinghooks-use-portals.patch => 0130-Don-t-let-fishinghooks-use-portals.patch} (91%)
 rename Spigot-Server-Patches/{0132-Add-ProjectileCollideEvent.patch => 0131-Add-ProjectileCollideEvent.patch} (96%)
 rename Spigot-Server-Patches/{0133-Prevent-Pathfinding-out-of-World-Border.patch => 0132-Prevent-Pathfinding-out-of-World-Border.patch} (91%)
 rename Spigot-Server-Patches/{0134-Bound-Treasure-Maps-to-World-Border.patch => 0133-Bound-Treasure-Maps-to-World-Border.patch} (95%)
 rename Spigot-Server-Patches/{0135-Configurable-Cartographer-Treasure-Maps.patch => 0134-Configurable-Cartographer-Treasure-Maps.patch} (93%)
 rename Spigot-Server-Patches/{0136-Optimize-ItemStack.isEmpty.patch => 0135-Optimize-ItemStack.isEmpty.patch} (89%)
 rename Spigot-Server-Patches/{0137-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0136-Add-API-methods-to-control-if-armour-stands-can-move.patch} (93%)
 rename Spigot-Server-Patches/{0138-Properly-fix-item-duplication-bug.patch => 0137-Properly-fix-item-duplication-bug.patch} (87%)
 rename Spigot-Server-Patches/{0139-String-based-Action-Bar-API.patch => 0138-String-based-Action-Bar-API.patch} (94%)
 rename Spigot-Server-Patches/{0140-Firework-API-s.patch => 0139-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0141-PlayerTeleportEndGatewayEvent.patch => 0140-PlayerTeleportEndGatewayEvent.patch} (92%)
 rename Spigot-Server-Patches/{0142-Provide-E-TE-Chunk-count-stat-methods.patch => 0141-Provide-E-TE-Chunk-count-stat-methods.patch} (96%)
 rename Spigot-Server-Patches/{0143-Enforce-Sync-Player-Saves.patch => 0142-Enforce-Sync-Player-Saves.patch} (90%)
 rename Spigot-Server-Patches/{0144-Don-t-allow-entities-to-ride-themselves-572.patch => 0143-Don-t-allow-entities-to-ride-themselves-572.patch} (82%)
 rename Spigot-Server-Patches/{0145-Fix-block-break-desync.patch => 0144-Fix-block-break-desync.patch} (85%)
 rename Spigot-Server-Patches/{0146-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (99%)
 rename Spigot-Server-Patches/{0147-Cap-Entity-Collisions.patch => 0146-Cap-Entity-Collisions.patch} (93%)
 rename Spigot-Server-Patches/{0148-Remove-CraftScheduler-Async-Task-Debugger.patch => 0147-Remove-CraftScheduler-Async-Task-Debugger.patch} (95%)
 rename Spigot-Server-Patches/{0149-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (86%)
 rename Spigot-Server-Patches/{0150-Do-not-let-armorstands-drown.patch => 0149-Do-not-let-armorstands-drown.patch} (93%)
 rename Spigot-Server-Patches/{0151-Properly-handle-async-calls-to-restart-the-server.patch => 0150-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename Spigot-Server-Patches/{0152-Add-system-property-to-disable-book-size-limits.patch => 0151-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0153-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0152-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (92%)
 rename Spigot-Server-Patches/{0154-Add-configuration-option-to-prevent-player-names-fro.patch => 0153-Add-configuration-option-to-prevent-player-names-fro.patch} (92%)
 rename Spigot-Server-Patches/{0155-Use-TerminalConsoleAppender-for-console-improvements.patch => 0154-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0156-provide-a-configurable-option-to-disable-creeper-lin.patch => 0155-provide-a-configurable-option-to-disable-creeper-lin.patch} (92%)
 rename Spigot-Server-Patches/{0157-Item-canEntityPickup.patch => 0156-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0158-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0157-PlayerPickupItemEvent-setFlyAtPlayer.patch} (95%)
 rename Spigot-Server-Patches/{0159-PlayerAttemptPickupItemEvent.patch => 0158-PlayerAttemptPickupItemEvent.patch} (94%)
 rename Spigot-Server-Patches/{0160-Add-UnknownCommandEvent.patch => 0159-Add-UnknownCommandEvent.patch} (94%)
 rename Spigot-Server-Patches/{0161-Basic-PlayerProfile-API.patch => 0160-Basic-PlayerProfile-API.patch} (98%)
 rename Spigot-Server-Patches/{0162-Shoulder-Entities-Release-API.patch => 0161-Shoulder-Entities-Release-API.patch} (96%)
 rename Spigot-Server-Patches/{0163-Profile-Lookup-Events.patch => 0162-Profile-Lookup-Events.patch} (97%)
 rename Spigot-Server-Patches/{0164-Block-player-logins-during-server-shutdown.patch => 0163-Block-player-logins-during-server-shutdown.patch} (90%)
 rename Spigot-Server-Patches/{0165-Entity-fromMobSpawner.patch => 0164-Entity-fromMobSpawner.patch} (91%)
 rename Spigot-Server-Patches/{0166-Improve-the-Saddle-API-for-Horses.patch => 0165-Improve-the-Saddle-API-for-Horses.patch} (94%)
 rename Spigot-Server-Patches/{0167-Implement-ensureServerConversions-API.patch => 0166-Implement-ensureServerConversions-API.patch} (94%)
 rename Spigot-Server-Patches/{0168-Implement-getI18NDisplayName.patch => 0167-Implement-getI18NDisplayName.patch} (96%)
 rename Spigot-Server-Patches/{0169-ProfileWhitelistVerifyEvent.patch => 0168-ProfileWhitelistVerifyEvent.patch} (96%)
 rename Spigot-Server-Patches/{0170-Fix-this-stupid-bullshit.patch => 0169-Fix-this-stupid-bullshit.patch} (96%)
 rename Spigot-Server-Patches/{0171-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0170-Ocelot-despawns-should-honor-nametags-and-leash.patch} (89%)
 rename Spigot-Server-Patches/{0172-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0171-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (92%)
 rename Spigot-Server-Patches/{0173-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0172-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (92%)
 rename Spigot-Server-Patches/{0174-Allow-specifying-a-custom-authentication-servers-dow.patch => 0173-Allow-specifying-a-custom-authentication-servers-dow.patch} (94%)
 rename Spigot-Server-Patches/{0175-LivingEntity-setKiller.patch => 0174-LivingEntity-setKiller.patch} (93%)
 rename Spigot-Server-Patches/{0176-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0175-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0177-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0176-Handle-plugin-prefixes-using-Log4J-configuration.patch} (95%)
 rename Spigot-Server-Patches/{0178-Include-Log4J2-SLF4J-implementation.patch => 0177-Include-Log4J2-SLF4J-implementation.patch} (87%)
 rename Spigot-Server-Patches/{0179-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0178-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (95%)
 rename Spigot-Server-Patches/{0180-Add-PlayerJumpEvent.patch => 0179-Add-PlayerJumpEvent.patch} (96%)
 rename Spigot-Server-Patches/{0181-handle-PacketPlayInKeepAlive-async.patch => 0180-handle-PacketPlayInKeepAlive-async.patch} (92%)
 rename Spigot-Server-Patches/{0182-Expose-client-protocol-version-and-virtual-host.patch => 0181-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename Spigot-Server-Patches/{0183-revert-serverside-behavior-of-keepalives.patch => 0182-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0184-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0183-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (97%)
 rename Spigot-Server-Patches/{0185-Option-for-maximum-exp-value-when-merging-orbs.patch => 0184-Option-for-maximum-exp-value-when-merging-orbs.patch} (96%)
 rename Spigot-Server-Patches/{0186-Add-PlayerArmorChangeEvent.patch => 0185-Add-PlayerArmorChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0187-Prevent-logins-from-being-processed-when-the-player-.patch => 0186-Prevent-logins-from-being-processed-when-the-player-.patch} (91%)
 rename Spigot-Server-Patches/{0188-use-CB-BlockState-implementations-for-captured-block.patch => 0187-use-CB-BlockState-implementations-for-captured-block.patch} (94%)
 rename Spigot-Server-Patches/{0189-API-to-get-a-BlockState-without-a-snapshot.patch => 0188-API-to-get-a-BlockState-without-a-snapshot.patch} (96%)
 rename Spigot-Server-Patches/{0190-AsyncTabCompleteEvent.patch => 0189-AsyncTabCompleteEvent.patch} (97%)
 rename Spigot-Server-Patches/{0191-Avoid-NPE-in-PathfinderGoalTempt.patch => 0190-Avoid-NPE-in-PathfinderGoalTempt.patch} (89%)
 rename Spigot-Server-Patches/{0192-PlayerPickupExperienceEvent.patch => 0191-PlayerPickupExperienceEvent.patch} (92%)
 rename Spigot-Server-Patches/{0193-ExperienceOrbMergeEvent.patch => 0192-ExperienceOrbMergeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0194-Ability-to-apply-mending-to-XP-API.patch => 0193-Ability-to-apply-mending-to-XP-API.patch} (95%)
 rename Spigot-Server-Patches/{0195-Make-max-squid-spawn-height-configurable.patch => 0194-Make-max-squid-spawn-height-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0196-PreCreatureSpawnEvent.patch => 0195-PreCreatureSpawnEvent.patch} (97%)
 rename Spigot-Server-Patches/{0197-PlayerNaturallySpawnCreaturesEvent.patch => 0196-PlayerNaturallySpawnCreaturesEvent.patch} (92%)
 rename Spigot-Server-Patches/{0198-Add-setPlayerProfile-API-for-Skulls.patch => 0197-Add-setPlayerProfile-API-for-Skulls.patch} (96%)
 rename Spigot-Server-Patches/{0199-Fill-Profile-Property-Events.patch => 0198-Fill-Profile-Property-Events.patch} (95%)
 rename Spigot-Server-Patches/{0200-PlayerAdvancementCriterionGrantEvent.patch => 0199-PlayerAdvancementCriterionGrantEvent.patch} (90%)
 rename Spigot-Server-Patches/{0201-Add-ArmorStand-Item-Meta.patch => 0200-Add-ArmorStand-Item-Meta.patch} (99%)
 rename Spigot-Server-Patches/{0202-Extend-Player-Interact-cancellation.patch => 0201-Extend-Player-Interact-cancellation.patch} (97%)
 rename Spigot-Server-Patches/{0203-Tameable-getOwnerUniqueId-API.patch => 0202-Tameable-getOwnerUniqueId-API.patch} (91%)
 rename Spigot-Server-Patches/{0204-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0203-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (92%)
 rename Spigot-Server-Patches/{0205-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0204-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (92%)
 rename Spigot-Server-Patches/{0206-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0205-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0207-Disable-Explicit-Network-Manager-Flushing.patch => 0206-Disable-Explicit-Network-Manager-Flushing.patch} (94%)
 rename Spigot-Server-Patches/{0208-Implement-extended-PaperServerListPingEvent.patch => 0207-Implement-extended-PaperServerListPingEvent.patch} (97%)
 rename Spigot-Server-Patches/{0209-Improved-Async-Task-Scheduler.patch => 0208-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0210-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0209-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (96%)
 rename Spigot-Server-Patches/{0211-Player.setPlayerProfile-API.patch => 0210-Player.setPlayerProfile-API.patch} (97%)
 rename Spigot-Server-Patches/{0212-Fix-Dragon-Server-Crashes.patch => 0211-Fix-Dragon-Server-Crashes.patch} (92%)
 rename Spigot-Server-Patches/{0213-getPlayerUniqueId-API.patch => 0212-getPlayerUniqueId-API.patch} (94%)
 rename Spigot-Server-Patches/{0214-Make-player-data-saving-configurable.patch => 0213-Make-player-data-saving-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0215-Make-legacy-ping-handler-more-reliable.patch => 0214-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0216-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0215-Call-PaperServerListPingEvent-for-legacy-pings.patch} (98%)
 rename Spigot-Server-Patches/{0217-Flag-to-disable-the-channel-limit.patch => 0216-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0218-Add-method-to-open-already-placed-sign.patch => 0217-Add-method-to-open-already-placed-sign.patch} (92%)
 rename Spigot-Server-Patches/{0219-Configurable-sprint-interruption-on-attack.patch => 0218-Configurable-sprint-interruption-on-attack.patch} (93%)
 rename Spigot-Server-Patches/{0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0219-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (86%)
 rename Spigot-Server-Patches/{0221-EndermanEscapeEvent.patch => 0220-EndermanEscapeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0222-Enderman.teleportRandomly.patch => 0221-Enderman.teleportRandomly.patch} (91%)
 rename Spigot-Server-Patches/{0223-Block-Enderpearl-Travel-Exploit.patch => 0222-Block-Enderpearl-Travel-Exploit.patch} (94%)
 rename Spigot-Server-Patches/{0224-Expand-World.spawnParticle-API-and-add-Builder.patch => 0223-Expand-World.spawnParticle-API-and-add-Builder.patch} (98%)
 rename Spigot-Server-Patches/{0225-EndermanAttackPlayerEvent.patch => 0224-EndermanAttackPlayerEvent.patch} (93%)
 rename Spigot-Server-Patches/{0226-WitchConsumePotionEvent.patch => 0225-WitchConsumePotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0227-WitchThrowPotionEvent.patch => 0226-WitchThrowPotionEvent.patch} (94%)
 rename Spigot-Server-Patches/{0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0227-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (95%)
 rename Spigot-Server-Patches/{0229-WitchReadyPotionEvent.patch => 0228-WitchReadyPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0230-ItemStack-getMaxItemUseDuration.patch => 0229-ItemStack-getMaxItemUseDuration.patch} (91%)
 rename Spigot-Server-Patches/{0231-Implement-EntityTeleportEndGatewayEvent.patch => 0230-Implement-EntityTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-Server-Patches/{0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0231-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (93%)
 rename Spigot-Server-Patches/{0233-Fix-CraftEntity-hashCode.patch => 0232-Fix-CraftEntity-hashCode.patch} (94%)
 rename Spigot-Server-Patches/{0234-Configurable-Alternative-LootPool-Luck-Formula.patch => 0233-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename Spigot-Server-Patches/{0235-Print-Error-details-when-failing-to-save-player-data.patch => 0234-Print-Error-details-when-failing-to-save-player-data.patch} (89%)
 rename Spigot-Server-Patches/{0236-Make-shield-blocking-delay-configurable.patch => 0235-Make-shield-blocking-delay-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0236-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (93%)
 rename Spigot-Server-Patches/{0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0237-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (97%)
 rename Spigot-Server-Patches/{0239-PlayerReadyArrowEvent.patch => 0238-PlayerReadyArrowEvent.patch} (94%)
 rename Spigot-Server-Patches/{0240-Fire-EntityShootBowEvent-for-Illusioner.patch => 0239-Fire-EntityShootBowEvent-for-Illusioner.patch} (93%)
 rename Spigot-Server-Patches/{0241-Implement-EntityKnockbackByEntityEvent.patch => 0240-Implement-EntityKnockbackByEntityEvent.patch} (93%)
 rename Spigot-Server-Patches/{0242-Expand-Explosions-API.patch => 0241-Expand-Explosions-API.patch} (95%)
 rename Spigot-Server-Patches/{0243-LivingEntity-Hand-Raised-Item-Use-API.patch => 0242-LivingEntity-Hand-Raised-Item-Use-API.patch} (94%)
 rename Spigot-Server-Patches/{0244-RangedEntity-API.patch => 0243-RangedEntity-API.patch} (95%)
 rename Spigot-Server-Patches/{0245-Add-config-to-disable-ender-dragon-legacy-check.patch => 0244-Add-config-to-disable-ender-dragon-legacy-check.patch} (94%)
 rename Spigot-Server-Patches/{0246-Implement-World.getEntity-UUID-API.patch => 0245-Implement-World.getEntity-UUID-API.patch} (93%)
 rename Spigot-Server-Patches/{0247-InventoryCloseEvent-Reason-API.patch => 0246-InventoryCloseEvent-Reason-API.patch} (95%)
 rename Spigot-Server-Patches/{0248-Configurable-Bed-Search-Radius.patch => 0247-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0249-Vex-getSummoner-API.patch => 0248-Vex-getSummoner-API.patch} (92%)
 rename Spigot-Server-Patches/{0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0249-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (88%)
 rename Spigot-Server-Patches/{0251-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0250-Don-t-change-the-Entity-Random-seed-for-squids.patch} (88%)
 rename Spigot-Server-Patches/{0252-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0251-Re-add-vanilla-entity-warnings-for-duplicates.patch} (92%)
 rename Spigot-Server-Patches/{0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0252-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (90%)
 rename Spigot-Server-Patches/{0254-Use-asynchronous-Log4j-2-loggers.patch => 0253-Use-asynchronous-Log4j-2-loggers.patch} (96%)
 rename Spigot-Server-Patches/{0255-add-more-information-to-Entity.toString.patch => 0254-add-more-information-to-Entity.toString.patch} (89%)
 rename Spigot-Server-Patches/{0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0255-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (95%)
 rename Spigot-Server-Patches/{0257-EnderDragon-Events.patch => 0256-EnderDragon-Events.patch} (95%)
 rename Spigot-Server-Patches/{0258-PlayerElytraBoostEvent.patch => 0257-PlayerElytraBoostEvent.patch} (94%)
 rename Spigot-Server-Patches/{0259-PlayerLaunchProjectileEvent.patch => 0258-PlayerLaunchProjectileEvent.patch} (98%)
 rename Spigot-Server-Patches/{0260-Speedup-BlockPos-by-fixing-inlining.patch => 0259-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0261-Optimize-RegistryID.c.patch => 0260-Optimize-RegistryID.c.patch} (95%)
 rename Spigot-Server-Patches/{0262-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0261-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (92%)
 rename Spigot-Server-Patches/{0263-Vanished-players-don-t-have-rights.patch => 0262-Vanished-players-don-t-have-rights.patch} (98%)
 rename Spigot-Server-Patches/{0264-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0263-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (89%)
 rename Spigot-Server-Patches/{0265-Add-some-Debug-to-Chunk-Entity-slices.patch => 0264-Add-some-Debug-to-Chunk-Entity-slices.patch} (95%)
 rename Spigot-Server-Patches/{0266-EntityTransformedEvent.patch => 0265-EntityTransformedEvent.patch} (95%)
 rename Spigot-Server-Patches/{0267-SkeletonHorse-Additions.patch => 0266-SkeletonHorse-Additions.patch} (94%)
 rename Spigot-Server-Patches/{0268-Prevent-Saving-Bad-entities-to-chunks.patch => 0267-Prevent-Saving-Bad-entities-to-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0269-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0268-Don-t-call-getItemMeta-on-hasItemMeta.patch} (98%)
 rename Spigot-Server-Patches/{0270-Ignore-Dead-Entities-in-entityList-iteration.patch => 0269-Ignore-Dead-Entities-in-entityList-iteration.patch} (98%)
 rename Spigot-Server-Patches/{0271-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0270-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (98%)
 rename Spigot-Server-Patches/{0272-MC-111480-Start-Entity-ID-s-at-1.patch => 0271-MC-111480-Start-Entity-ID-s-at-1.patch} (91%)
 rename Spigot-Server-Patches/{0273-Implement-Expanded-ArmorStand-API.patch => 0272-Implement-Expanded-ArmorStand-API.patch} (97%)
 rename Spigot-Server-Patches/{0274-AnvilDamageEvent.patch => 0273-AnvilDamageEvent.patch} (94%)
 rename Spigot-Server-Patches/{0275-Add-TNTPrimeEvent.patch => 0274-Add-TNTPrimeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0276-Break-up-and-make-tab-spam-limits-configurable.patch => 0275-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0277-Add-hand-to-bucket-events.patch => 0276-Add-hand-to-bucket-events.patch} (94%)
 rename Spigot-Server-Patches/{0278-MC-135506-Experience-should-save-as-Integers.patch => 0277-MC-135506-Experience-should-save-as-Integers.patch} (92%)
 rename Spigot-Server-Patches/{0279-Fix-client-rendering-skulls-from-same-user.patch => 0278-Fix-client-rendering-skulls-from-same-user.patch} (96%)
 rename Spigot-Server-Patches/{0280-Add-Early-Warning-Feature-to-WatchDog.patch => 0279-Add-Early-Warning-Feature-to-WatchDog.patch} (97%)
 rename Spigot-Server-Patches/{0281-Make-EnderDragon-implement-Mob.patch => 0280-Make-EnderDragon-implement-Mob.patch} (93%)
 rename Spigot-Server-Patches/{0282-Detect-and-repair-corrupt-Region-Files.patch => 0281-Detect-and-repair-corrupt-Region-Files.patch} (98%)
 rename Spigot-Server-Patches/{0283-Use-ConcurrentHashMap-in-JsonList.patch => 0282-Use-ConcurrentHashMap-in-JsonList.patch} (97%)
 rename Spigot-Server-Patches/{0284-Use-a-Queue-for-Queueing-Commands.patch => 0283-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0285-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0284-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (95%)
 rename Spigot-Server-Patches/{0286-Allow-disabling-armour-stand-ticking.patch => 0285-Allow-disabling-armour-stand-ticking.patch} (98%)
 rename Spigot-Server-Patches/{0287-Optimize-BlockPosition-helper-methods.patch => 0286-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename Spigot-Server-Patches/{0288-Send-nearby-packets-from-world-player-list-not-serve.patch => 0287-Send-nearby-packets-from-world-player-list-not-serve.patch} (98%)
 rename Spigot-Server-Patches/{0289-Restore-vanlla-default-mob-spawn-range.patch => 0288-Restore-vanlla-default-mob-spawn-range.patch} (92%)
 rename Spigot-Server-Patches/{0290-Optimize-Hoppers.patch => 0289-Optimize-Hoppers.patch} (98%)
 rename Spigot-Server-Patches/{0291-Optimize-CraftBlockData-Creation.patch => 0290-Optimize-CraftBlockData-Creation.patch} (97%)
 rename Spigot-Server-Patches/{0292-Fix-MC-124320.patch => 0291-Fix-MC-124320.patch} (95%)
 rename Spigot-Server-Patches/{0293-Slime-Pathfinder-Events.patch => 0292-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0294-Configurable-speed-for-water-flowing-over-lava.patch => 0293-Configurable-speed-for-water-flowing-over-lava.patch} (96%)
 rename Spigot-Server-Patches/{0295-Optimize-RegistryMaterials.patch => 0294-Optimize-RegistryMaterials.patch} (94%)
 rename Spigot-Server-Patches/{0296-Add-PhantomPreSpawnEvent.patch => 0295-Add-PhantomPreSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0297-Add-More-Creeper-API.patch => 0296-Add-More-Creeper-API.patch} (94%)
 rename Spigot-Server-Patches/{0298-Inventory-removeItemAnySlot.patch => 0297-Inventory-removeItemAnySlot.patch} (95%)
 rename Spigot-Server-Patches/{0299-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0298-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (94%)
 rename Spigot-Server-Patches/{0300-Add-ray-tracing-methods-to-LivingEntity.patch => 0299-Add-ray-tracing-methods-to-LivingEntity.patch} (96%)
 rename Spigot-Server-Patches/{0301-Expose-attack-cooldown-methods-for-Player.patch => 0300-Expose-attack-cooldown-methods-for-Player.patch} (93%)
 rename Spigot-Server-Patches/{0302-Improve-death-events.patch => 0301-Improve-death-events.patch} (97%)
 rename Spigot-Server-Patches/{0303-Allow-chests-to-be-placed-with-NBT-data.patch => 0302-Allow-chests-to-be-placed-with-NBT-data.patch} (91%)
 rename Spigot-Server-Patches/{0304-Mob-Pathfinding-API.patch => 0303-Mob-Pathfinding-API.patch} (97%)
 rename Spigot-Server-Patches/{0305-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0304-Prevent-chunk-loading-from-Fluid-Flowing.patch} (97%)
 rename Spigot-Server-Patches/{0306-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0305-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0307-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0306-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (96%)
 rename Spigot-Server-Patches/{0308-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0307-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0309-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0308-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (96%)
 rename Spigot-Server-Patches/{0310-Implement-furnace-cook-speed-multiplier-API.patch => 0309-Implement-furnace-cook-speed-multiplier-API.patch} (96%)
 rename Spigot-Server-Patches/{0311-Support-Overriding-World-Seeds.patch => 0310-Support-Overriding-World-Seeds.patch} (96%)
 rename Spigot-Server-Patches/{0312-Optimize-Server-World-Map.patch => 0311-Optimize-Server-World-Map.patch} (98%)
 rename Spigot-Server-Patches/{0313-PreSpawnerSpawnEvent.patch => 0312-PreSpawnerSpawnEvent.patch} (94%)
 rename Spigot-Server-Patches/{0314-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0313-Catch-JsonParseException-in-Entity-and-TE-names.patch} (93%)
 rename Spigot-Server-Patches/{0315-Avoid-dimension-id-collisions.patch => 0314-Avoid-dimension-id-collisions.patch} (91%)
 rename Spigot-Server-Patches/{0316-Honor-EntityAgeable.ageLock.patch => 0315-Honor-EntityAgeable.ageLock.patch} (86%)
 rename Spigot-Server-Patches/{0317-Configurable-connection-throttle-kick-message.patch => 0316-Configurable-connection-throttle-kick-message.patch} (94%)
 rename Spigot-Server-Patches/{0318-Hook-into-CB-plugin-rewrites.patch => 0317-Hook-into-CB-plugin-rewrites.patch} (98%)
 rename Spigot-Server-Patches/{0319-Allow-setting-the-vex-s-summoner.patch => 0318-Allow-setting-the-vex-s-summoner.patch} (90%)
 rename Spigot-Server-Patches/{0320-Add-sun-related-API.patch => 0319-Add-sun-related-API.patch} (97%)
 rename Spigot-Server-Patches/{0321-Check-Drowned-for-Villager-Aggression-Config.patch => 0320-Check-Drowned-for-Villager-Aggression-Config.patch} (93%)
 rename Spigot-Server-Patches/{0322-Here-s-Johnny.patch => 0321-Here-s-Johnny.patch} (92%)
 rename Spigot-Server-Patches/{0323-Turtle-API.patch => 0322-Turtle-API.patch} (98%)
 rename Spigot-Server-Patches/{0324-Limit-lightning-strike-effect-distance.patch => 0323-Limit-lightning-strike-effect-distance.patch} (96%)
 rename Spigot-Server-Patches/{0325-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0324-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (94%)
 rename Spigot-Server-Patches/{0326-Call-player-spectator-target-events.patch => 0325-Call-player-spectator-target-events.patch} (96%)
 rename Spigot-Server-Patches/{0327-Add-Velocity-IP-Forwarding-Support.patch => 0326-Add-Velocity-IP-Forwarding-Support.patch} (97%)
 rename Spigot-Server-Patches/{0328-Add-more-Witch-API.patch => 0327-Add-more-Witch-API.patch} (98%)
 rename Spigot-Server-Patches/{0329-Fix-MC-93764.patch => 0328-Fix-MC-93764.patch} (86%)
 rename Spigot-Server-Patches/{0330-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0329-Add-option-to-prevent-players-from-moving-into-unloa.patch} (96%)
 rename Spigot-Server-Patches/{0331-Reset-players-airTicks-on-respawn.patch => 0330-Reset-players-airTicks-on-respawn.patch} (84%)
 rename Spigot-Server-Patches/{0332-Strip-private-area-unicode-characters-from-signs.patch => 0331-Strip-private-area-unicode-characters-from-signs.patch} (97%)
 rename Spigot-Server-Patches/{0333-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0332-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (96%)
 rename Spigot-Server-Patches/{0334-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0333-Use-more-reasonable-thread-count-default-for-bootstr.patch} (89%)
 rename Spigot-Server-Patches/{0335-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0334-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (94%)
 rename Spigot-Server-Patches/{0336-Optimize-World-Time-Updates.patch => 0335-Optimize-World-Time-Updates.patch} (96%)
 rename Spigot-Server-Patches/{0337-Restore-custom-InventoryHolder-support.patch => 0336-Restore-custom-InventoryHolder-support.patch} (95%)
 rename Spigot-Server-Patches/{0338-Use-Vanilla-Minecart-Speeds.patch => 0337-Use-Vanilla-Minecart-Speeds.patch} (91%)
 rename Spigot-Server-Patches/{0339-Fix-SpongeAbsortEvent-handling.patch => 0338-Fix-SpongeAbsortEvent-handling.patch} (93%)
 rename Spigot-Server-Patches/{0340-Don-t-allow-digging-into-unloaded-chunks.patch => 0339-Don-t-allow-digging-into-unloaded-chunks.patch} (87%)
 rename Spigot-Server-Patches/{0341-Optimize-redstone-algorithm.patch => 0340-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0342-force-entity-dismount-during-teleportation.patch => 0341-force-entity-dismount-during-teleportation.patch} (92%)
 rename Spigot-Server-Patches/{0343-Book-Size-Limits.patch => 0342-Book-Size-Limits.patch} (96%)
 rename Spigot-Server-Patches/{0344-Make-the-default-permission-message-configurable.patch => 0343-Make-the-default-permission-message-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0345-Add-more-Zombie-API.patch => 0344-Add-more-Zombie-API.patch} (96%)
 rename Spigot-Server-Patches/{0346-Prevent-rayTrace-from-loading-chunks.patch => 0345-Prevent-rayTrace-from-loading-chunks.patch} (93%)
 rename Spigot-Server-Patches/{0347-Handle-Large-Packets-disconnecting-client.patch => 0346-Handle-Large-Packets-disconnecting-client.patch} (95%)
 rename Spigot-Server-Patches/{0348-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0347-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (96%)
 rename Spigot-Server-Patches/{0349-Add-PlayerConnectionCloseEvent.patch => 0348-Add-PlayerConnectionCloseEvent.patch} (97%)
 rename Spigot-Server-Patches/{0350-Prevent-Enderman-from-loading-chunks.patch => 0349-Prevent-Enderman-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0351-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0350-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (96%)
 rename Spigot-Server-Patches/{0352-Fix-PlayerEditBookEvent.patch => 0351-Fix-PlayerEditBookEvent.patch} (94%)
 rename Spigot-Server-Patches/{0353-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0352-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (90%)
 rename Spigot-Server-Patches/{0354-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0353-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (96%)
 rename Spigot-Server-Patches/{0355-Block-Entity-remove-from-being-called-on-Players.patch => 0354-Block-Entity-remove-from-being-called-on-Players.patch} (93%)
 rename Spigot-Server-Patches/{0356-Allow-Saving-of-Oversized-Chunks.patch => 0355-Allow-Saving-of-Oversized-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0357-BlockDestroyEvent.patch => 0356-BlockDestroyEvent.patch} (95%)
 rename Spigot-Server-Patches/{0358-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0357-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (96%)
 rename Spigot-Server-Patches/{0359-Fix-sign-edit-memory-leak.patch => 0358-Fix-sign-edit-memory-leak.patch} (91%)
 rename Spigot-Server-Patches/{0360-Limit-Client-Sign-length-more.patch => 0359-Limit-Client-Sign-length-more.patch} (94%)
 rename Spigot-Server-Patches/{0361-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0360-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (93%)
 rename Spigot-Server-Patches/{0362-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0361-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (95%)
 rename Spigot-Server-Patches/{0363-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0362-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (95%)
 rename Spigot-Server-Patches/{0364-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0363-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (89%)
 rename Spigot-Server-Patches/{0365-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0364-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (87%)
 rename Spigot-Server-Patches/{0366-Add-LivingEntity-getTargetEntity.patch => 0365-Add-LivingEntity-getTargetEntity.patch} (95%)
 rename Spigot-Server-Patches/{0367-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0366-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (94%)
 rename Spigot-Server-Patches/{0368-Entity-getEntitySpawnReason.patch => 0367-Entity-getEntitySpawnReason.patch} (93%)
 rename Spigot-Server-Patches/{0369-Update-entity-Metadata-for-all-tracked-players.patch => 0368-Update-entity-Metadata-for-all-tracked-players.patch} (89%)
 rename Spigot-Server-Patches/{0370-Fire-event-on-GS4-query.patch => 0369-Fire-event-on-GS4-query.patch} (98%)
 rename Spigot-Server-Patches/{0371-Implement-PlayerPostRespawnEvent.patch => 0370-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename Spigot-Server-Patches/{0372-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0371-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (93%)
 rename Spigot-Server-Patches/{0373-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0372-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (93%)
 rename Spigot-Server-Patches/{0374-Server-Tick-Events.patch => 0373-Server-Tick-Events.patch} (93%)
 rename Spigot-Server-Patches/{0375-PlayerDeathEvent-getItemsToKeep.patch => 0374-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0376-Allow-login-events-to-fire-only-after-the-server-plu.patch => 0375-Allow-login-events-to-fire-only-after-the-server-plu.patch} (95%)
 rename Spigot-Server-Patches/{0377-Make-region-files-more-reliable-to-write-to.patch => 0376-Make-region-files-more-reliable-to-write-to.patch} (98%)
 rename Spigot-Server-Patches/{0378-Optimize-GameRules-to-use-LinkedHashMap.patch => 0377-Optimize-GameRules-to-use-LinkedHashMap.patch} (93%)
 rename Spigot-Server-Patches/{0379-Optimize-Captured-TileEntity-Lookup.patch => 0378-Optimize-Captured-TileEntity-Lookup.patch} (93%)
 rename Spigot-Server-Patches/{0380-Add-Heightmap-API.patch => 0379-Add-Heightmap-API.patch} (97%)
 rename Spigot-Server-Patches/{0381-Handle-bad-chunks-more-gracefully.patch => 0380-Handle-bad-chunks-more-gracefully.patch} (96%)
 rename Spigot-Server-Patches/{0382-Mob-Spawner-API-Enhancements.patch => 0381-Mob-Spawner-API-Enhancements.patch} (97%)
 rename Spigot-Server-Patches/{0383-Per-Player-View-Distance-API-placeholders.patch => 0382-Per-Player-View-Distance-API-placeholders.patch} (95%)
 rename Spigot-Server-Patches/{0384-Async-Chunk-placeholder.patch => 0383-Async-Chunk-placeholder.patch} (97%)
 rename Spigot-Server-Patches/{0385-Fix-CB-call-to-changed-postToMainThread-method.patch => 0384-Fix-CB-call-to-changed-postToMainThread-method.patch} (88%)
 rename Spigot-Server-Patches/{0386-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0385-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (92%)
 rename Spigot-Server-Patches/{0387-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0386-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (93%)
 rename Spigot-Server-Patches/{0389-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0387-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0390-Duplicate-UUID-Resolve-Option.patch => 0388-Duplicate-UUID-Resolve-Option.patch} (97%)
 delete mode 100644 Spigot-Server-Patches/0388-Elide-lock-in-DataWatcher.patch
 rename Spigot-Server-Patches/{0391-improve-CraftWorld-isChunkLoaded.patch => 0389-improve-CraftWorld-isChunkLoaded.patch} (96%)
 rename Spigot-Server-Patches/{0392-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0390-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (99%)
 rename Spigot-Server-Patches/{0393-Fix-some-generation-concurrency-issues.patch => 0391-Fix-some-generation-concurrency-issues.patch} (98%)
 rename Spigot-Server-Patches/{0394-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0392-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (89%)
 rename Spigot-Server-Patches/{0395-ChunkMapDistance-CME.patch => 0393-ChunkMapDistance-CME.patch} (54%)
 rename Spigot-Server-Patches/{0396-Actually-Limit-Natural-Spawns-To-Limit.patch => 0394-Actually-Limit-Natural-Spawns-To-Limit.patch} (98%)
 rename Spigot-Server-Patches/{0397-Implement-CraftBlockSoundGroup.patch => 0395-Implement-CraftBlockSoundGroup.patch} (95%)
 rename Spigot-Server-Patches/{0398-Chunk-debug-command.patch => 0396-Chunk-debug-command.patch} (99%)
 rename Spigot-Server-Patches/{0399-incremental-chunk-saving.patch => 0397-incremental-chunk-saving.patch} (96%)
 rename Spigot-Server-Patches/{0400-Catch-exceptions-from-dispenser-entity-spawns.patch => 0398-Catch-exceptions-from-dispenser-entity-spawns.patch} (92%)
 rename Spigot-Server-Patches/{0401-Fix-World-isChunkGenerated-calls.patch => 0399-Fix-World-isChunkGenerated-calls.patch} (98%)
 rename Spigot-Server-Patches/{0402-Show-blockstate-location-if-we-failed-to-read-it.patch => 0400-Show-blockstate-location-if-we-failed-to-read-it.patch} (93%)
 rename Spigot-Server-Patches/{0403-Fix-MC-154214.patch => 0401-Fix-MC-154214.patch} (95%)
 rename Spigot-Server-Patches/{0404-Log-other-thread-in-DataPaletteBlock-lock-failure.patch => 0402-Log-other-thread-in-DataPaletteBlock-lock-failure.patch} (95%)
 rename Spigot-Server-Patches/{0405-Use-ChunkStatus-cache-when-saving-protochunks.patch => 0403-Use-ChunkStatus-cache-when-saving-protochunks.patch} (88%)
 rename Spigot-Server-Patches/{0406-Anti-Xray.patch => 0404-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0407-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0405-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (97%)

diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
index 3588f0d67..c9c8f0977 100644
--- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
+++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
@@ -1,4 +1,4 @@
-From 11521fdaa1e83af71aafecd95498e04d133f2d69 Mon Sep 17 00:00:00 2001
+From d7435d6dc5cfbf22a2d1d079aa142b7a997f2156 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 01:40:13 -0400
 Subject: [PATCH] Add MinecraftKey Information to Objects
@@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects
 Stores the reference to the objects respective MinecraftKey
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 5626ae4e3a..360abc05e4 100644
+index 5626ae4e3..360abc05e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -175,7 +175,7 @@ public class PaperCommand extends Command {
@@ -19,7 +19,7 @@ index 5626ae4e3a..360abc05e4 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 5f560d93a2..85bb97ee34 100644
+index 845536e4d..11b273b1a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -31,7 +31,7 @@ index 5f560d93a2..85bb97ee34 100644
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -1731,12 +1731,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1732,12 +1732,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
@@ -65,7 +65,7 @@ index 5f560d93a2..85bb97ee34 100644
  
      protected abstract void a(NBTTagCompound nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index f603950b2e..eaacc9bff8 100644
+index f603950b2..eaacc9bff 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -238,6 +238,7 @@ public class EntityTypes<T extends Entity> {
@@ -78,7 +78,7 @@ index f603950b2e..eaacc9bff8 100644
      }
 diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
 new file mode 100644
-index 0000000000..743142d030
+index 000000000..743142d03
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/KeyedObject.java
 @@ -0,0 +1,9 @@
@@ -92,7 +92,7 @@ index 0000000000..743142d030
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 33dec830ea..7f480b3b3e 100644
+index 33dec830e..7f480b3b3 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -11,7 +11,7 @@ import org.bukkit.inventory.InventoryHolder;
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
index df378ab5c..2a38537d8 100644
--- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
+++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -1,4 +1,4 @@
-From f6c6445c4fbbe78e58f0cdfb01cf9be18e04ce00 Mon Sep 17 00:00:00 2001
+From e0eb58b3af41c6a327560737d75f9673739f78af Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2a6ae10a11..24d69778f0 100644
+index 2a6ae10a1..24d69778f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -29,7 +29,7 @@ public class Chunk implements IChunkAccess {
@@ -90,7 +90,7 @@ index 2a6ae10a11..24d69778f0 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7e347c7c99..0c7bf3ae3f 100644
+index 11b273b1a..b21fa66ae 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -133,7 +133,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 7e347c7c99..0c7bf3ae3f 100644
      public int chunkX; public int getChunkX() { return chunkX; } // Paper - OBFHELPER
      public int chunkY; public int getChunkY() { return chunkY; } // Paper - OBFHELPER
      public int chunkZ; public int getChunkZ() { return chunkZ; } // Paper - OBFHELPER
-@@ -1732,6 +1732,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1733,6 +1733,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      // Paper start
@@ -143,7 +143,7 @@ index 7e347c7c99..0c7bf3ae3f 100644
      private String entityKeyString;
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 8f9820f492..e8a90e01f5 100644
+index 7f480b3b3..2efaf516f 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -51,6 +51,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -163,7 +163,7 @@ index 8f9820f492..e8a90e01f5 100644
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f22959ee15..a98f6f3389 100644
+index f22959ee1..a98f6f338 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -137,6 +137,7 @@ import net.minecraft.server.EntityZombieVillager;
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 9eeb9d491..9d5685fdc 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 3eed1e9f0fc42e4d7cc5ef8e2943d2f5975d2cee Mon Sep 17 00:00:00 2001
+From faf6de3f329e5baee5994a5edc4e4c95c020a8f5 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
@@ -344,7 +344,7 @@ index f3c5c729f..ab9b7bbd3 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 710d40b43..9b3b598d8 100644
+index b500f6e59..534636889 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -137,11 +137,13 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -562,7 +562,7 @@ index c088ff969..c7ea4ec4f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b7c07b416..ea6cf39ba 100644
+index b21fa66ae..43abdf41f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -584,7 +584,7 @@ index b7c07b416..ea6cf39ba 100644
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -495,7 +496,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -496,7 +497,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@@ -592,7 +592,7 @@ index b7c07b416..ea6cf39ba 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().b(vec3d));
              this.recalcPosition();
-@@ -660,7 +660,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -661,7 +661,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              this.world.getMethodProfiler().exit();
          }
@@ -797,7 +797,7 @@ index f9ec2b068..d0419119b 100644
          this.methodProfiler.exit();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index b5ba3fcb0..85da52e2c 100644
+index 070cfc61e..ec7824baf 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,7 +1,9 @@
@@ -810,7 +810,7 @@ index b5ba3fcb0..85da52e2c 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Queues;
  import com.google.common.collect.Sets;
-@@ -439,8 +441,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -464,8 +466,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
  
      private CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> f(ChunkCoordIntPair chunkcoordintpair) {
          return CompletableFuture.supplyAsync(() -> {
@@ -824,7 +824,7 @@ index b5ba3fcb0..85da52e2c 100644
  
                  if (nbttagcompound != null) {
                      boolean flag = nbttagcompound.hasKeyOfType("Level", 10) && nbttagcompound.getCompound("Level").hasKeyOfType("Status", 8);
-@@ -477,7 +482,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -502,7 +507,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          });
  
          return completablefuture.thenComposeAsync((either) -> {
@@ -833,7 +833,7 @@ index b5ba3fcb0..85da52e2c 100644
                  try {
                      CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture1 = chunkstatus.a(this.world, this.chunkGenerator, this.definedStructureManager, this.lightEngine, (ichunkaccess) -> {
                          return this.c(playerchunk);
-@@ -530,6 +535,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -555,6 +560,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
              ChunkStatus chunkstatus = PlayerChunk.getChunkStatus(playerchunk.getTicketLevel());
  
              return !chunkstatus.b(ChunkStatus.FULL) ? PlayerChunk.UNLOADED_CHUNK_ACCESS : either.mapLeft((ichunkaccess) -> {
@@ -841,7 +841,7 @@ index b5ba3fcb0..85da52e2c 100644
                  ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
                  Chunk chunk;
  
-@@ -574,6 +580,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -599,6 +605,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  }
  
                  return chunk;
@@ -849,7 +849,7 @@ index b5ba3fcb0..85da52e2c 100644
              });
          }, (runnable) -> {
              Mailbox mailbox = this.mailboxMain;
-@@ -967,6 +974,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -992,6 +999,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
  
          PlayerChunkMap.EntityTracker playerchunkmap_entitytracker;
          ObjectIterator objectiterator;
@@ -857,7 +857,7 @@ index b5ba3fcb0..85da52e2c 100644
  
          for (objectiterator = this.trackedEntities.values().iterator(); objectiterator.hasNext(); playerchunkmap_entitytracker.trackerEntry.a()) {
              playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next();
-@@ -984,13 +992,16 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1009,13 +1017,16 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  playerchunkmap_entitytracker.e = sectionposition1;
              }
          }
@@ -875,7 +875,7 @@ index b5ba3fcb0..85da52e2c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d40600c10..fa37c19c6 100644
+index 80a80ed47..d6550af41 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;
@@ -902,7 +902,7 @@ index d40600c10..fa37c19c6 100644
  
      }
  
-@@ -1651,7 +1650,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1657,7 +1656,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -911,7 +911,7 @@ index d40600c10..fa37c19c6 100644
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1662,7 +1661,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1668,7 +1667,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -920,7 +920,7 @@ index d40600c10..fa37c19c6 100644
              return;
          }
  
-@@ -1675,7 +1674,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1681,7 +1680,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 81237ba97..68d529c5d 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,11 +1,11 @@
-From 124f2ebcda485739ff4e7772dc5dfc8bdb680d42 Mon Sep 17 00:00:00 2001
+From ed171c8fbb759e34cb7970a7a668b9d032c0c853 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3f734327c0..1ed58f4bba 100644
+index 3f734327c..1ed58f4bb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -114,4 +114,14 @@ public class PaperWorldConfig {
@@ -24,10 +24,10 @@ index 3f734327c0..1ed58f4bba 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 49f64e1507..187374666b 100644
+index 43abdf41f..716892c72 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1837,6 +1837,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1838,6 +1838,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(itemstack, 0.0F);
      }
  
@@ -36,7 +36,7 @@ index 49f64e1507..187374666b 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 7b7048090d..7fb0c0e068 100644
+index 7b7048090..7fb0c0e06 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -88,6 +88,16 @@ public class EntityFallingBlock extends Entity {
@@ -57,7 +57,7 @@ index 7b7048090d..7fb0c0e068 100644
                  blockposition = new BlockPosition(this);
                  boolean flag = this.block.getBlock() instanceof BlockConcretePowder;
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 775192a598..e988abd67c 100644
+index 775192a59..e988abd67 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -57,6 +57,11 @@ public class EntityTNTPrimed extends Entity {
diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
index dd3c1b0da..aedfba0f6 100644
--- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From 81ae322c6e25e4776ad972fd967a4152790f8fa4 Mon Sep 17 00:00:00 2001
+From 8cafbd1f887537f35f8cca7b94f917260a08c634 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 617e7d3a71..e5f5dbe980 100644
+index 716892c72..8f97aa296 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index 617e7d3a71..e5f5dbe980 100644
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1595,6 +1596,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1596,6 +1597,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  this.bukkitEntity.storeBukkitValues(nbttagcompound);
              }
              // CraftBukkit end
@@ -28,7 +28,7 @@ index 617e7d3a71..e5f5dbe980 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1717,6 +1723,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1718,6 +1724,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.getBukkitEntity().readBukkitValues(nbttagcompound);
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index 617e7d3a71..e5f5dbe980 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1794,6 +1807,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1795,6 +1808,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -51,7 +51,7 @@ index 617e7d3a71..e5f5dbe980 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 7fb0c0e068..9d86beda9e 100644
+index 7fb0c0e06..9d86beda9 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -253,6 +253,14 @@ public class EntityFallingBlock extends Entity {
@@ -70,7 +70,7 @@ index 7fb0c0e068..9d86beda9e 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index e988abd67c..f2ee53ab90 100644
+index e988abd67..f2ee53ab9 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -104,6 +104,14 @@ public class EntityTNTPrimed extends Entity {
@@ -89,7 +89,7 @@ index e988abd67c..f2ee53ab90 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index ce510c4867..b7c94fe238 100644
+index ce510c486..b7c94fe23 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -161,6 +161,7 @@ public class NBTTagList extends NBTList<NBTBase> {
@@ -101,7 +101,7 @@ index ce510c4867..b7c94fe238 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 69af071e60..458c14e1d1 100644
+index 69af071e6..458c14e1d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1104,6 +1104,11 @@ public class WorldServer extends World {
@@ -117,7 +117,7 @@ index 69af071e60..458c14e1d1 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a98f6f3389..d1d37c06bf 100644
+index a98f6f338..d1d37c06b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1009,4 +1009,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
index d6d1275c8..cd984ae38 100644
--- a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
@@ -1,11 +1,11 @@
-From 07d9bf17efeb0de32a8d0d7ab72d6c139d1d51e8 Mon Sep 17 00:00:00 2001
+From a0f544fdc476d10b40e8524b8ed958d13fa4fb1a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1ed58f4bba..a797a57671 100644
+index 1ed58f4bb..a797a5767 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -124,4 +124,19 @@ public class PaperWorldConfig {
@@ -29,10 +29,10 @@ index 1ed58f4bba..a797a57671 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0bfa78bd22..32ed5ac429 100644
+index 8f97aa296..1af797b66 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -397,9 +397,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -398,9 +398,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.fallDistance *= 0.5F;
          }
  
@@ -48,7 +48,7 @@ index 0bfa78bd22..32ed5ac429 100644
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -409,6 +415,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -410,6 +416,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.world.getMethodProfiler().exit();
      }
  
@@ -66,7 +66,7 @@ index 0bfa78bd22..32ed5ac429 100644
      protected void E() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -484,6 +501,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -485,6 +502,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fireTicks = 0;
      }
  
@@ -75,7 +75,7 @@ index 0bfa78bd22..32ed5ac429 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index ff5d128176..e1a684b370 100644
+index ff5d12817..e1a684b37 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -182,9 +182,15 @@ public abstract class EntityMinecartAbstract extends Entity {
diff --git a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
index 976087b96..907e651be 100644
--- a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,4 +1,4 @@
-From 02d36a1ddf62541417ea624258a0019b01584fc4 Mon Sep 17 00:00:00 2001
+From 0e886139b4309506fbf412f759388adf5e9e712d Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
@@ -77,10 +77,10 @@ index cf0e1a6a0..f04a9d18c 100644
  
                  this.c();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 85da52e2c..312845ec0 100644
+index ec7824baf..c352c71d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -1090,10 +1090,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1115,10 +1115,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          private final Entity tracker;
          private final int trackingDistance;
          private SectionPosition e;
@@ -97,7 +97,7 @@ index 85da52e2c..312845ec0 100644
              this.tracker = entity;
              this.trackingDistance = i;
              this.e = SectionPosition.a(entity);
-@@ -1175,7 +1179,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1200,7 +1204,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                      entityplayer.removeQueue.remove(Integer.valueOf(this.tracker.getId()));
                      // CraftBukkit end
  
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 88dc581d2..cd1948a08 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 5a1511dd4ec61e4cc6a70e8b11cd1d8b7a7af630 Mon Sep 17 00:00:00 2001
+From 5af5ec5c5b6a59f8b838c9d126e7945edaa383e6 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 fa37c19c69..4ca45743d0 100644
+index d6550af41..58e7cede6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1582,6 +1582,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1588,6 +1588,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index fa37c19c69..4ca45743d0 100644
          } else if (this.player.getChatFlags() == 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 3083538088..58428bfbf7 100644
+index cbee3453c..905fc64e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -707,6 +707,29 @@ public final class CraftServer implements Server {
@@ -82,7 +82,7 @@ index 3083538088..58428bfbf7 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index ddef523ea8..70f8d42992 100644
+index ddef523ea..70f8d4299 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -13,6 +13,7 @@ public class ServerShutdownThread extends Thread {
@@ -94,7 +94,7 @@ index ddef523ea8..70f8d42992 100644
          } finally {
              try {
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index aeed769725..9f7d2ef932 100644
+index aeed76972..9f7d2ef93 100644
 --- a/src/main/java/org/spigotmc/AsyncCatcher.java
 +++ b/src/main/java/org/spigotmc/AsyncCatcher.java
 @@ -6,6 +6,7 @@ public class AsyncCatcher
@@ -106,7 +106,7 @@ index aeed769725..9f7d2ef932 100644
      public static void catchOp(String reason)
      {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index e7b953ca31..ccea803f58 100644
+index e7b953ca3..ccea803f5 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -43,6 +43,7 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch
index c2d2473c1..b5e6ed1cb 100644
--- a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 4e1cc41ed39216510254b9cda8fe10e8a62b1d03 Mon Sep 17 00:00:00 2001
+From 599de7111c22e14f4eb714ace7d8b832e772723a Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -80,7 +80,7 @@ index f6f5b72de..ec64391a4 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 60b73bff8..43da95e60 100644
+index 534636889..cafa244fd 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -14,6 +14,9 @@ import java.util.function.BooleanSupplier;
@@ -121,10 +121,10 @@ index 2cb0962ff..21a8ed323 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 312845ec0..d4122b893 100644
+index c352c71d0..b5ae705d9 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -649,6 +649,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -674,6 +674,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  this.world.checkSession();
              } catch (ExceptionWorldConflict exceptionworldconflict) {
                  PlayerChunkMap.LOGGER.error("Couldn't save chunk; already in use by another instance of Minecraft?", exceptionworldconflict);
@@ -132,7 +132,7 @@ index 312845ec0..d4122b893 100644
                  return false;
              }
  
-@@ -676,6 +677,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -701,6 +702,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  return true;
              } catch (Exception exception) {
                  PlayerChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception);
diff --git a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
index 9261e23db..cf20a8695 100644
--- a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From bf39f6cb0640074c94979d20d689f918d54010d7 Mon Sep 17 00:00:00 2001
+From 85c606fd896531c2bccb34cc7c8d54584a7a9083 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 94f5c90b3c..30f0dcfd51 100644
+index 94f5c90b3..30f0dcfd5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -196,4 +196,9 @@ public class PaperWorldConfig {
@@ -25,10 +25,10 @@ index 94f5c90b3c..30f0dcfd51 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 32ed5ac429..39ca7d5870 100644
+index 1af797b66..09aaea7e8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2262,6 +2262,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2263,6 +2263,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase getScoreboardTeam() {
@@ -37,7 +37,7 @@ index 32ed5ac429..39ca7d5870 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6cb95a6606..0b21c0b8dd 100644
+index 6cb95a660..0b21c0b8d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -582,6 +582,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
index c7c7b52a8..fdf8b8619 100644
--- a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 3429ac03afa9b65b7903b944b3bb4789abd980aa Mon Sep 17 00:00:00 2001
+From cb101e53b32e46961baa2986c56a7b1037e7ff1f 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 4ca45743d0..e4a273dbe2 100644
+index 58e7cede6..8d325db4a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1347,7 +1347,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1353,7 +1353,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
@@ -22,7 +22,7 @@ index 4ca45743d0..e4a273dbe2 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 f4b3b7ff0b..2e0621b889 100644
+index f4b3b7ff0..2e0621b88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -134,6 +134,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0081-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0080-Do-not-load-chunks-for-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0081-Do-not-load-chunks-for-Pathfinding.patch
rename to Spigot-Server-Patches/0080-Do-not-load-chunks-for-Pathfinding.patch
index 9669d97a9..fd0393e6a 100644
--- a/Spigot-Server-Patches/0081-Do-not-load-chunks-for-Pathfinding.patch
+++ b/Spigot-Server-Patches/0080-Do-not-load-chunks-for-Pathfinding.patch
@@ -1,11 +1,11 @@
-From ccce787782826e77e8f33819ff36465866a59e67 Mon Sep 17 00:00:00 2001
+From 3a28632a712e12127804f4157859dc49c0f32b36 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
-index ccbc1dde09..34e743716b 100644
+index ccbc1dde0..34e743716 100644
 --- a/src/main/java/net/minecraft/server/ChunkCache.java
 +++ b/src/main/java/net/minecraft/server/ChunkCache.java
 @@ -25,7 +25,7 @@ public class ChunkCache implements IWorldReader {
@@ -27,7 +27,7 @@ index ccbc1dde09..34e743716b 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index a9f17b0318..8b05b8acd8 100644
+index a9f17b031..8b05b8acd 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -22,7 +22,7 @@ public abstract class NavigationAbstract {
@@ -40,7 +40,7 @@ index a9f17b0318..8b05b8acd8 100644
      public NavigationAbstract(EntityInsentient entityinsentient, World world) {
          this.g = Vec3D.a;
 diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
-index 359d9a11c0..262fa55850 100644
+index 359d9a11c..262fa5585 100644
 --- a/src/main/java/net/minecraft/server/Pathfinder.java
 +++ b/src/main/java/net/minecraft/server/Pathfinder.java
 @@ -12,7 +12,7 @@ public class Pathfinder {
@@ -53,7 +53,7 @@ index 359d9a11c0..262fa55850 100644
      public Pathfinder(PathfinderAbstract pathfinderabstract, int i) {
          this.e = pathfinderabstract;
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index 593f13af49..80fcb66e3e 100644
+index 593f13af4..80fcb66e3 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -355,7 +355,8 @@ public class PathfinderNormal extends PathfinderAbstract {
diff --git a/Spigot-Server-Patches/0080-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0080-Use-Optimized-Collections.patch
deleted file mode 100644
index d65145b7b..000000000
--- a/Spigot-Server-Patches/0080-Use-Optimized-Collections.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7d21779eafcbb18471dbd1ac5e8c16ca633be01c Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 30 Mar 2016 02:13:24 -0400
-Subject: [PATCH] Use Optimized Collections
-
-Swap out CraftBukkit LongObjectHashMap with Long2ObjectOpenHashMap
-Swap out Integer key HashMap for a Int2ObjectOpenHashMap For ChunkProviderServer
-
-Amaranth, the creator of LongObjectHashMap, tested it vs fastutil and determined fastutil to be 3x faster
-and could not create anything faster than fastutil.
-
-These collections are super fast as seen
-http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
-
-diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 79a240cd1d..f224043d8e 100644
---- a/src/main/java/net/minecraft/server/DataWatcher.java
-+++ b/src/main/java/net/minecraft/server/DataWatcher.java
-@@ -12,6 +12,7 @@ import java.util.Map;
- import java.util.concurrent.locks.ReadWriteLock;
- import java.util.concurrent.locks.ReentrantReadWriteLock;
- import javax.annotation.Nullable;
-+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; // Paper
- import org.apache.commons.lang3.ObjectUtils;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
-@@ -21,7 +22,7 @@ public class DataWatcher {
-     private static final Logger LOGGER = LogManager.getLogger();
-     private static final Map<Class<? extends Entity>, Integer> b = Maps.newHashMap();
-     private final Entity c;
--    private final Map<Integer, DataWatcher.Item<?>> d = Maps.newHashMap();
-+    private final Int2ObjectOpenHashMap<DataWatcher.Item<?>> d = new Int2ObjectOpenHashMap<>(); // Paper
-     private final ReadWriteLock e = new ReentrantReadWriteLock();
-     private boolean f = true;
-     private boolean g;
--- 
-2.22.0
-
diff --git a/Spigot-Server-Patches/0082-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0081-Do-not-load-chunks-for-light-checks.patch
similarity index 90%
rename from Spigot-Server-Patches/0082-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0081-Do-not-load-chunks-for-light-checks.patch
index e98fb8ef6..0e35a24e0 100644
--- a/Spigot-Server-Patches/0082-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0081-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 32de69162e7f552d0a6f307b2152ebe10cd7b1db Mon Sep 17 00:00:00 2001
+From 317532f24f529ff717533f65beadc821a7a62bc7 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 light checks
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 93a061b6b2..2878370b02 100644
+index 1ffa8b42b..35fb686d8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -592,6 +592,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0083-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch
similarity index 89%
rename from Spigot-Server-Patches/0083-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch
index b9b4c8156..8e415bcad 100644
--- a/Spigot-Server-Patches/0083-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,11 +1,11 @@
-From 4b155f15b82fed071c998c7a7f94cc626a48473f Mon Sep 17 00:00:00 2001
+From e7e9594d32eab8f5653501e1ed7aec5e623bb583 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 680adbdeb0..3f7697b39c 100644
+index 680adbdeb..3f7697b39 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 680adbdeb0..3f7697b39c 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 e4a273dbe2..41a6204022 100644
+index 8d325db4a..a6bb6a511 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1926,6 +1926,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1932,6 +1932,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
              }
          }
diff --git a/Spigot-Server-Patches/0084-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 91%
rename from Spigot-Server-Patches/0084-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 02665fa3b..b2bc1df2d 100644
--- a/Spigot-Server-Patches/0084-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From 7b48935e8080f1a2ecc44b302019c446f1d386a0 Mon Sep 17 00:00:00 2001
+From e15d195695a11539d6e7f28301510015c02cb00c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 35bda2e1d6..cce5305fbe 100644
+index 35bda2e1d..cce5305fb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -162,6 +162,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0085-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0084-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 92%
rename from Spigot-Server-Patches/0085-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0084-Configurable-Grass-Spread-Tick-Rate.patch
index f425cefd0..ffb7f53fd 100644
--- a/Spigot-Server-Patches/0085-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0084-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,11 +1,11 @@
-From 4666ae7ccda402cbd3e5a985180fd1066802a8ee Mon Sep 17 00:00:00 2001
+From 6678516453891bfdc84262f66cf700e7ac95474d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bcf4dc52..27141033 100644
+index bcf4dc52a..271410337 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -239,4 +239,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index bcf4dc52..27141033 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
-index ddca19b4..377a57c8 100644
+index ddca19b46..377a57c89 100644
 --- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
 +++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
 @@ -29,6 +29,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow {
diff --git a/Spigot-Server-Patches/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 89%
rename from Spigot-Server-Patches/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index a440dd425..b55a5542a 100644
--- a/Spigot-Server-Patches/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,11 +1,11 @@
-From ba156592cd5a6108470ade8575dfa3197fd14969 Mon Sep 17 00:00:00 2001
+From 0f2946da63e4535f27443aca7732bb5ff9415eac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2878370b02..cde463c5a5 100644
+index 35fb686d8..b1ce9b874 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -510,6 +510,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0087-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0086-Remove-Debug-checks-from-DataBits.patch
similarity index 95%
rename from Spigot-Server-Patches/0087-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0086-Remove-Debug-checks-from-DataBits.patch
index 96c2bf9a7..0acf622bc 100644
--- a/Spigot-Server-Patches/0087-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0086-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From db48c9962e15f3db9990a7c37086dd5329bc013e Mon Sep 17 00:00:00 2001
+From 6200eb779aea5a7a90e6e77adee16a5ec273b9ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
@@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png
 After: http://i.imgur.com/nJ46crB.png
 
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index 409dc837c6..4194acc8b9 100644
+index 409dc837c..4194acc8b 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -14,7 +14,7 @@ public class DataBits {
diff --git a/Spigot-Server-Patches/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 93%
rename from Spigot-Server-Patches/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 99320d8a2..858510f5c 100644
--- a/Spigot-Server-Patches/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From b591eede0c629fce99e6ab697f74c4e6f78205f9 Mon Sep 17 00:00:00 2001
+From e40c08b3fbb3d17216aa807c6111cc15157fc0d4 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
@@ -12,7 +12,7 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves at some point in the future.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 27141033..aeeb7c24 100644
+index 271410337..aeeb7c24e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -245,4 +245,9 @@ public class PaperWorldConfig {
@@ -26,10 +26,10 @@ index 27141033..aeeb7c24 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 41a62040..bbc5acd7 100644
+index a6bb6a511..c4384bbee 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1660,7 +1660,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1666,7 +1666,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      return;
                  }
  
@@ -48,7 +48,7 @@ index 41a62040..bbc5acd7 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index cce5305f..d368b397 100644
+index cce5305fb..d368b3975 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -177,7 +177,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0089-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0089-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch
index c3eb35f86..69edb8a0e 100644
--- a/Spigot-Server-Patches/0089-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 9a32c010911a6ffe57cb6d8c3a2e9f5c0c05a855 Mon Sep 17 00:00:00 2001
+From c2cf15f3bb28ed63f7ba3e882b98cccd64630e95 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d0d61fd290..57f2499cad 100644
+index d0d61fd29..57f2499ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -764,6 +764,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0090-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0089-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0090-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0089-Remove-unused-World-Tile-Entity-List.patch
index 7cfc71b46..47b18f3f1 100644
--- a/Spigot-Server-Patches/0090-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0089-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 2b06ba42451cff97992fac44f050d6464bb37e47 Mon Sep 17 00:00:00 2001
+From e4a968963a687d98049c628e230dacbdd1011fcd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b1ce9b874a..f396ca6914 100644
+index b1ce9b874..f396ca691 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0091-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0090-Don-t-tick-Skulls-unused-code.patch
similarity index 90%
rename from Spigot-Server-Patches/0091-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0090-Don-t-tick-Skulls-unused-code.patch
index 16a82db5d..fda2d8e0b 100644
--- a/Spigot-Server-Patches/0091-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0090-Don-t-tick-Skulls-unused-code.patch
@@ -1,11 +1,11 @@
-From 0025a3bfd3735ff7afba0a6cad766d6cc7f63853 Mon Sep 17 00:00:00 2001
+From a8a2a5f526e820f15592fbe10e45217f427d428a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 99442bb130..177cceb77f 100644
+index 99442bb13..177cceb77 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback;
diff --git a/Spigot-Server-Patches/0092-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0091-Configurable-Player-Collision.patch
similarity index 96%
rename from Spigot-Server-Patches/0092-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0091-Configurable-Player-Collision.patch
index 90e9c994d..cc93eb2b9 100644
--- a/Spigot-Server-Patches/0092-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0091-Configurable-Player-Collision.patch
@@ -1,11 +1,11 @@
-From effe1e7b1ad8af4be3337ade2fcb8f16949a5463 Mon Sep 17 00:00:00 2001
+From c0d681f2d2654d66987c76f82fba905b96076db8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0cef1853f5..dc3438890b 100644
+index 0cef1853f..dc3438890 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -223,4 +223,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 0cef1853f5..dc3438890b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a87df2b6fb..ccfe1b4c3e 100644
+index a87df2b6f..ccfe1b4c3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -436,6 +436,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -44,7 +44,7 @@ index a87df2b6fb..ccfe1b4c3e 100644
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index b0740965a4..6b1a914d2f 100644
+index b0740965a..6b1a914d2 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -96,7 +96,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -57,7 +57,7 @@ index b0740965a4..6b1a914d2f 100644
              packetdataserializer.a(this.c);
              packetdataserializer.a(this.d);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d368b39751..ee5297dc38 100644
+index d368b3975..ee5297dc3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -72,6 +72,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0092-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 96%
rename from Spigot-Server-Patches/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0092-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index fba4e3398..6e82037bb 100644
--- a/Spigot-Server-Patches/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0092-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 1bb24963838f96a264bc36978f8883fd89a93abf Mon Sep 17 00:00:00 2001
+From bc570b6f9591c86611478036b2c3afb749b3cc34 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 756330a6ca..66dda900b6 100644
+index 756330a6c..66dda900b 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -73,8 +73,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
diff --git a/Spigot-Server-Patches/0094-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0093-Configurable-RCON-IP-address.patch
similarity index 94%
rename from Spigot-Server-Patches/0094-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0093-Configurable-RCON-IP-address.patch
index 456949892..d7b42d73c 100644
--- a/Spigot-Server-Patches/0094-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0093-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From dac290fc1064262ef182ff4588e2785ac711b11c Mon Sep 17 00:00:00 2001
+From 1fdbd7f48b5093cd1390e999ba1bfab46a5e46a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address
 For servers with multiple IP's, ability to bind to a specific interface.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-index 4af81c8866..fb092a9416 100644
+index 4af81c886..fb092a941 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 @@ -53,6 +53,8 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -30,7 +30,7 @@ index 4af81c8866..fb092a9416 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java
-index d7e81a6d99..729455ce53 100644
+index d7e81a6d9..729455ce5 100644
 --- a/src/main/java/net/minecraft/server/PropertyManager.java
 +++ b/src/main/java/net/minecraft/server/PropertyManager.java
 @@ -127,8 +127,8 @@ public abstract class PropertyManager<T extends PropertyManager<T>> {
@@ -45,7 +45,7 @@ index d7e81a6d99..729455ce53 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
-index e48d6dcd74..2ce490be00 100644
+index e48d6dcd7..2ce490be0 100644
 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
 @@ -25,7 +25,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
diff --git a/Spigot-Server-Patches/0095-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0094-Prevent-Fire-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0095-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0094-Prevent-Fire-from-loading-chunks.patch
index b94446646..fd5727858 100644
--- a/Spigot-Server-Patches/0095-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0094-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 4780e1505f743eb1526bbcec50fe2335e97f03a9 Mon Sep 17 00:00:00 2001
+From 067640ae81f0a55d2a5deb5a9703b7c7a39629ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall
 bad behavior.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 81e9717ae5..49e3d7284b 100644
+index 81e9717ae..49e3d7284 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -163,6 +163,7 @@ public class BlockFire extends Block {
diff --git a/Spigot-Server-Patches/0096-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0096-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch
index eb0f32b5b..1c0120aca 100644
--- a/Spigot-Server-Patches/0096-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From ce568e38db92b01e6d6d0ebbc36065948e7dd780 Mon Sep 17 00:00:00 2001
+From eb26cb49b8c0b9ca1bb297eec904b50998e3e56c Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 462c666735..c5dbcbe590 100644
+index 462c66673..c5dbcbe59 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
@@ -40,7 +40,7 @@ index 462c666735..c5dbcbe590 100644
          this.cl = packetplayinsettings.e();
          this.getDataWatcher().set(EntityPlayer.bt, (byte) packetplayinsettings.f());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 57f2499cad..d854d48446 100644
+index 57f2499ca..d854d4844 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1758,8 +1758,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0097-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0096-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0097-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0096-EntityRegainHealthEvent-isFastRegen-API.patch
index 087c54695..7c36bdee8 100644
--- a/Spigot-Server-Patches/0097-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0096-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From e8835e988373b740a16bfb2a83ba9318a2f531b7 Mon Sep 17 00:00:00 2001
+From b93ae0b6d950cf48acc1044579ab0284fb734df6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 18e152b8fb..45c024ca24 100644
+index 18e152b8f..45c024ca2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -969,10 +969,16 @@ public abstract class EntityLiving extends Entity {
@@ -28,7 +28,7 @@ index 18e152b8fb..45c024ca24 100644
              if (this.valid) {
                  this.world.getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index 739b8fd189..28b04f35e6 100644
+index 739b8fd18..28b04f35e 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
 @@ -69,7 +69,7 @@ public class FoodMetaData {
diff --git a/Spigot-Server-Patches/0098-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0097-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 96%
rename from Spigot-Server-Patches/0098-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0097-Add-ability-to-configure-frosted_ice-properties.patch
index 0def9c122..5c8071dde 100644
--- a/Spigot-Server-Patches/0098-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0097-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,11 +1,11 @@
-From 89826be687bb81888aa5e4bf0be877287f761010 Mon Sep 17 00:00:00 2001
+From 7a007d2550ff79c4527828c92933958978c49ad5 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index aeeb7c24..409a84b5 100644
+index aeeb7c24e..409a84b52 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -250,4 +250,14 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index aeeb7c24..409a84b5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 1a0c2eea..39c3bbc9 100644
+index 1a0c2eeaa..39c3bbc9c 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -13,6 +13,7 @@ public class BlockIceFrost extends BlockIce {
diff --git a/Spigot-Server-Patches/0099-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch
similarity index 95%
rename from Spigot-Server-Patches/0099-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch
index 62f31fb01..8426c6c09 100644
--- a/Spigot-Server-Patches/0099-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 961fbdba0788ff2d563f2cdc35159670061a1ab4 Mon Sep 17 00:00:00 2001
+From 46c11def326856f9e47d21b9abc6ba7a4b6b4cfa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ccfe1b4c3e..1dda1fee9f 100644
+index ccfe1b4c3..1dda1fee9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -59,6 +59,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot
diff --git a/Spigot-Server-Patches/0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0099-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 96%
rename from Spigot-Server-Patches/0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0099-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index d834fa530..471664668 100644
--- a/Spigot-Server-Patches/0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0099-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From e06128b6420b69d097ae32d57ee1089c36dcc268 Mon Sep 17 00:00:00 2001
+From 943f8772a86f10285c6d500e548491814fe895ac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1a41a9c1d9..1a1b1dd1e8 100644
+index 1a41a9c1d..1a1b1dd1e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -590,6 +590,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index 1a41a9c1d9..1a1b1dd1e8 100644
              return entityitem;
          }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index fc08158937..090d3dbd31 100644
+index fc0815893..090d3dbd3 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -31,6 +31,7 @@ public class WorldMap extends PersistentBase {
@@ -102,7 +102,7 @@ index fc08158937..090d3dbd31 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 28a6a62dfc..d0ab361904 100644
+index 28a6a62df..d0ab36190 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1047,6 +1047,7 @@ public class WorldServer extends World {
@@ -114,7 +114,7 @@ index 28a6a62dfc..d0ab361904 100644
                              }
                          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a131781..5768cd512e 100644
+index 256a13178..5768cd512 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
diff --git a/Spigot-Server-Patches/0101-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 98%
rename from Spigot-Server-Patches/0101-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch
index 94cb6b2bd..19529813e 100644
--- a/Spigot-Server-Patches/0101-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 5b9f1c0cf86171c228e366a87ba0f53e6ba45d09 Mon Sep 17 00:00:00 2001
+From ec30f15d57b2f8c46583afcf3fcf75e9cd27638a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 409a84b523..134c4f7a36 100644
+index 409a84b52..134c4f7a3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -260,4 +260,26 @@ public class PaperWorldConfig {
@@ -43,7 +43,7 @@ index 409a84b523..134c4f7a36 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
 new file mode 100644
-index 0000000000..d6fce3112e
+index 000000000..d6fce3112
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -82,7 +82,7 @@ index 0000000000..d6fce3112e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
 new file mode 100644
-index 0000000000..5e637782d5
+index 000000000..5e637782d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
 @@ -0,0 +1,28 @@
@@ -116,7 +116,7 @@ index 0000000000..5e637782d5
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
 new file mode 100644
-index 0000000000..856843fc91
+index 000000000..856843fc9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
 @@ -0,0 +1,71 @@
@@ -193,7 +193,7 @@ index 0000000000..856843fc91
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 new file mode 100644
-index 0000000000..b5401eaf97
+index 000000000..b5401eaf9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 @@ -0,0 +1,179 @@
@@ -378,7 +378,7 @@ index 0000000000..b5401eaf97
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
 new file mode 100644
-index 0000000000..f9fbc221bd
+index 000000000..f9fbc221b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
 @@ -0,0 +1,64 @@
@@ -448,7 +448,7 @@ index 0000000000..f9fbc221bd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 new file mode 100644
-index 0000000000..d50410532c
+index 000000000..d50410532
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 @@ -0,0 +1,67 @@
@@ -520,7 +520,7 @@ index 0000000000..d50410532c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index db7297aa04..15e7bfc47b 100644
+index 337b03a03..47446a74e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -532,7 +532,7 @@ index db7297aa04..15e7bfc47b 100644
  
      public CraftEntity getBukkitEntity() {
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index c223e18125..cf1c5d754c 100644
+index c223e1812..cf1c5d754 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
@@ -591,7 +591,7 @@ index c223e18125..cf1c5d754c 100644
  
              if (entityhuman != null) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index 39ebc7218c..a346eba52b 100644
+index 39ebc7218..a346eba52 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -6,8 +6,9 @@ import javax.annotation.Nullable;
@@ -646,7 +646,7 @@ index 39ebc7218c..a346eba52b 100644
  
              if (entityhuman != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 2831419446..17d80b5c6e 100644
+index 283141944..17d80b5c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -64,7 +64,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -659,7 +659,7 @@ index 2831419446..17d80b5c6e 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 6beb992622..019fa71181 100644
+index 6beb99262..019fa7118 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -11,8 +11,9 @@ import org.bukkit.craftbukkit.CraftWorld;
@@ -674,7 +674,7 @@ index 6beb992622..019fa71181 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-index e1ad26a242..678aa09d47 100644
+index e1ad26a24..678aa09d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
 @@ -1,5 +1,6 @@
@@ -703,7 +703,7 @@ index e1ad26a242..678aa09d47 100644
          getSnapshot().setLootTable(key, seed);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index e05624e643..ab4807b2cd 100644
+index e05624e64..ab4807b2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -723,7 +723,7 @@ index e05624e643..ab4807b2cd 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-index 2d776b520b..fcc9787848 100644
+index 2d776b520..fcc978784 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
 @@ -47,7 +47,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
@@ -736,7 +736,7 @@ index 2d776b520b..fcc9787848 100644
          getHandle().setLootTable(newKey, seed);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index 334bd5bb3f..f5b31237fc 100644
+index 334bd5bb3..f5b31237f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 92%
rename from Spigot-Server-Patches/0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 1d566883f..99a4628bd 100644
--- a/Spigot-Server-Patches/0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,11 +1,11 @@
-From 634403cc9477224cb29aec45f4851368c85cccb3 Mon Sep 17 00:00:00 2001
+From 67287a0553617ecd063e0328812389e8741a5ca4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dc3438890b..cbfe12734d 100644
+index dc3438890..cbfe12734 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -228,4 +228,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index dc3438890b..cbfe12734d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
-index fab5962e2a..de7ac6c205 100644
+index fab5962e2..de7ac6c20 100644
 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
 +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
 @@ -174,6 +174,7 @@ public class PersistentScoreboard extends PersistentBase {
diff --git a/Spigot-Server-Patches/0103-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0102-System-property-for-disabling-watchdoge.patch
similarity index 89%
rename from Spigot-Server-Patches/0103-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0102-System-property-for-disabling-watchdoge.patch
index d39e5ee64..50a994456 100644
--- a/Spigot-Server-Patches/0103-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0102-System-property-for-disabling-watchdoge.patch
@@ -1,11 +1,11 @@
-From ec896ab8fe94d7c7070fe71aa32c8f42e28d91bb Mon Sep 17 00:00:00 2001
+From 9708222bc4a17ecae0b74e1e953f16e0d4497d67 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
 
 
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 56f5f54bd1..9532aada82 100644
+index 56f5f54bd..9532aada8 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -57,7 +57,7 @@ public class WatchdogThread extends Thread
diff --git a/Spigot-Server-Patches/0104-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch
similarity index 96%
rename from Spigot-Server-Patches/0104-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch
index 75e01d5de..6aaced1e8 100644
--- a/Spigot-Server-Patches/0104-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From a9721e0704e80f7086fde3be20241a9f138bdb6b Mon Sep 17 00:00:00 2001
+From be64a5db5bd0d3a37ba2de71bba177043ba85e0d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1dda1fee9f..065062c616 100644
+index 1dda1fee9..065062c61 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -740,7 +740,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -23,7 +23,7 @@ index 1dda1fee9f..065062c616 100644
          // Spigot end
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 57d053e9ff..ea02567554 100644
+index 57d053e9f..ea0256755 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,8 +43,8 @@ public class UserCache {
diff --git a/Spigot-Server-Patches/0105-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0104-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 96%
rename from Spigot-Server-Patches/0105-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0104-Avoid-blocking-on-Network-Manager-creation.patch
index a80a78e2e..a6467a479 100644
--- a/Spigot-Server-Patches/0105-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0104-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 270adc7982223bfce1adc8bfc952132e8473f6a8 Mon Sep 17 00:00:00 2001
+From 568f1455637b9a8c6eabd0f1bab621884689c23b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 42c654a1da..e7ed6af9cb 100644
+index 42c654a1d..e7ed6af9c 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -39,6 +39,15 @@ public class ServerConnection {
diff --git a/Spigot-Server-Patches/0106-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch
similarity index 94%
rename from Spigot-Server-Patches/0106-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch
index 32b53e9ff..8c3949864 100644
--- a/Spigot-Server-Patches/0106-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From baba0544534dd230dfbaa893c0c0ccb436b17b79 Mon Sep 17 00:00:00 2001
+From d437aee2a6ae591a9afe60a79cfd009b33765585 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 134c4f7a36..241149c9f2 100644
+index 134c4f7a3..241149c9f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,10 +32,10 @@ index 134c4f7a36..241149c9f2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 15e7bfc47b..579d15b45e 100644
+index 47446a74e..2a65a6685 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2697,6 +2697,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2698,6 +2698,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bE() {
@@ -49,7 +49,7 @@ index 15e7bfc47b..579d15b45e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index f2ee53ab90..dc0d944ea0 100644
+index f2ee53ab9..dc0d944ea 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -80,7 +80,27 @@ public class EntityTNTPrimed extends Entity {
@@ -94,7 +94,7 @@ index f2ee53ab90..dc0d944ea0 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index f04a9d18c4..cd7e0299ac 100644
+index f04a9d18c..cd7e0299a 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -36,7 +36,7 @@ public class EntityTrackerEntry {
diff --git a/Spigot-Server-Patches/0107-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0106-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 97%
rename from Spigot-Server-Patches/0107-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0106-Faster-redstone-torch-rapid-clock-removal.patch
index c8a12f74e..6c77ef982 100644
--- a/Spigot-Server-Patches/0107-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0106-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 59e9d3e9052037b0cb8707da5818135844cd8c2c Mon Sep 17 00:00:00 2001
+From 3d14572f7a9ba30b0eae0daf0a239b60e3ebc457 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
-index a99f979eff..919ba8a14d 100644
+index a99f979ef..919ba8a14 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
@@ -77,7 +77,7 @@ index a99f979eff..919ba8a14d 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f6cb4d45eb..ec69c25394 100644
+index f396ca691..4ce18f85b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -99,6 +99,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0108-Add-server-name-parameter.patch b/Spigot-Server-Patches/0107-Add-server-name-parameter.patch
similarity index 90%
rename from Spigot-Server-Patches/0108-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0107-Add-server-name-parameter.patch
index 478997c2a..b945aea37 100644
--- a/Spigot-Server-Patches/0108-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0107-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From 4d858c9be7f60c1edfd18695e09e3b9bb1191046 Mon Sep 17 00:00:00 2001
+From 5ea1c896146e882a1c8debaf9578405d40cf1ed1 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 7f5ea764d7..c5d5121fd9 100644
+index 484f1995a..ad1da9ddd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -136,6 +136,14 @@ public class Main {
diff --git a/Spigot-Server-Patches/0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0108-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 95%
rename from Spigot-Server-Patches/0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0108-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 7aeebe0f9..3c135c4b4 100644
--- a/Spigot-Server-Patches/0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0108-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From bf98b78eaa30cea4b0790456ae8abcf32081d9d9 Mon Sep 17 00:00:00 2001
+From 7ef1b66691b9ff7a782e4903c8e5f6b31bba08bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
 Also fix view distance lookup
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 9ecbc8e3e6..0421052d21 100644
+index 9ecbc8e3e..0421052d2 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -563,8 +563,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -24,7 +24,7 @@ index 9ecbc8e3e6..0421052d21 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 92acd504ad..ee1b0a8846 100644
+index 92acd504a..ee1b0a884 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -207,8 +207,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0110-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0109-Fix-Double-World-Add-issues.patch
similarity index 91%
rename from Spigot-Server-Patches/0110-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0109-Fix-Double-World-Add-issues.patch
index 19a494854..2c5894c3e 100644
--- a/Spigot-Server-Patches/0110-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0109-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 58e45655ecd32572a107bc7ce748ffefd05f52f2 Mon Sep 17 00:00:00 2001
+From 8adb94be4ba737d0211814d78363b2b3927a9b0a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d0ab361904..4ba5b00aef 100644
+index d0ab36190..4ba5b00ae 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -937,6 +937,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0111-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch
similarity index 95%
rename from Spigot-Server-Patches/0111-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch
index 888418cae..909e9ccac 100644
--- a/Spigot-Server-Patches/0111-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From ade11e22d59483ca6d66ec1c828a4f723f44e4d6 Mon Sep 17 00:00:00 2001
+From 599276513a14e0ed0db9767795ca02f258ab5fdf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion
    This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
 
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index 7bcd9786a2..775ec63890 100644
+index 7bcd9786a..775ec6389 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -203,9 +203,11 @@ public class DefinedStructure {
@@ -25,7 +25,7 @@ index 7bcd9786a2..775ec63890 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index e1db243165..af6977dcdc 100644
+index e1db24316..af6977dcd 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -37,7 +37,7 @@ index e1db243165..af6977dcdc 100644
      @Nullable
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 914f4e6da2..ddf8f46596 100644
+index 914f4e6da..ddf8f4659 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -58,13 +58,14 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0111-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 90%
rename from Spigot-Server-Patches/0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0111-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 20beabc5f..fcae8e4c2 100644
--- a/Spigot-Server-Patches/0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0111-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,11 +1,11 @@
-From 4ac81c1e86b4f273d6a420bee1d3f6d199c78c43 Mon Sep 17 00:00:00 2001
+From bb8c40312cc74d634ee982f9df515eb7b072f4dc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index ea02567554..b0d883d493 100644
+index ea0256755..b0d883d49 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -86,7 +86,7 @@ public class UserCache {
diff --git a/Spigot-Server-Patches/0113-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch
similarity index 90%
rename from Spigot-Server-Patches/0113-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch
index 4fafa8ad6..36d3852b3 100644
--- a/Spigot-Server-Patches/0113-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From ad2ef25c9755f2a4327d11762dc61d0bb21b247e Mon Sep 17 00:00:00 2001
+From 43a5570007eaa8674bbce1e96544fba27dbd0e54 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bbc5acd7fe..7c0d487d79 100644
+index c4384bbee..be2fe04a9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -361,7 +361,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0114-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch
similarity index 92%
rename from Spigot-Server-Patches/0114-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch
index 1156eefe9..a0e4c906c 100644
--- a/Spigot-Server-Patches/0114-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch
@@ -1,11 +1,11 @@
-From 78742615c480b6d54afdd2fa44545208a1fcfd39 Mon Sep 17 00:00:00 2001
+From 6c34034efcc75beb19e063096f73cc95a0995b8f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c5dbcbe590..2d29e9d866 100644
+index c5dbcbe59..2d29e9d86 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -980,6 +980,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0115-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0114-Add-setting-for-proxy-online-mode-status.patch
similarity index 94%
rename from Spigot-Server-Patches/0115-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0114-Add-setting-for-proxy-online-mode-status.patch
index 04c545540..a6011fc58 100644
--- a/Spigot-Server-Patches/0115-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0114-Add-setting-for-proxy-online-mode-status.patch
@@ -1,11 +1,11 @@
-From c837896c267faa0566bbc967676a54323933f5a9 Mon Sep 17 00:00:00 2001
+From 034805841cca15ab64c5afcd20a1b40847100b57 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cbfe12734d..1daa2e4535 100644
+index cbfe12734..1daa2e453 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
@@ -31,7 +31,7 @@ index cbfe12734d..1daa2e4535 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 21a8ed3231..0794aff5b7 100644
+index 21a8ed323..0794aff5b 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -58,7 +58,8 @@ public class NameReferencingFileConverter {
@@ -45,7 +45,7 @@ index 21a8ed3231..0794aff5b7 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5d50baa038..5a77ee9f71 100644
+index facd9c8ad..0d9e98914 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1357,7 +1357,8 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0116-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0115-Optimise-BlockState-s-hashCode-equals.patch
similarity index 94%
rename from Spigot-Server-Patches/0116-Optimise-BlockState-s-hashCode-equals.patch
rename to Spigot-Server-Patches/0115-Optimise-BlockState-s-hashCode-equals.patch
index 0c0e36549..f86f709b0 100644
--- a/Spigot-Server-Patches/0116-Optimise-BlockState-s-hashCode-equals.patch
+++ b/Spigot-Server-Patches/0115-Optimise-BlockState-s-hashCode-equals.patch
@@ -1,4 +1,4 @@
-From 01c9e8a7af6982d935d845f14ccf21a561d72c14 Mon Sep 17 00:00:00 2001
+From 8b1b9b76920b2208bf6b134392699f93f12812d8 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockState's hashCode/equals
@@ -9,7 +9,7 @@ object identity checks safely.
 Use a simpler optimized hashcode
 
 diff --git a/src/main/java/net/minecraft/server/BlockState.java b/src/main/java/net/minecraft/server/BlockState.java
-index 77b25317aa..be7e10d859 100644
+index 77b25317a..be7e10d85 100644
 --- a/src/main/java/net/minecraft/server/BlockState.java
 +++ b/src/main/java/net/minecraft/server/BlockState.java
 @@ -28,23 +28,13 @@ public abstract class BlockState<T extends Comparable<T>> implements IBlockState
@@ -41,7 +41,7 @@ index 77b25317aa..be7e10d859 100644
  
      public int c() {
 diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java
-index 31cb8ac841..3f085c7d65 100644
+index 31cb8ac84..3f085c7d6 100644
 --- a/src/main/java/net/minecraft/server/BlockStateBoolean.java
 +++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java
 @@ -30,8 +30,7 @@ public class BlockStateBoolean extends BlockState<Boolean> {
@@ -55,7 +55,7 @@ index 31cb8ac841..3f085c7d65 100644
              return true;
          } else if (object instanceof BlockStateBoolean && super.equals(object)) {
 diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 59d86fc66e..82a1fac6f1 100644
+index 59d86fc66..82a1fac6f 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
 @@ -49,8 +49,7 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@@ -69,7 +69,7 @@ index 59d86fc66e..82a1fac6f1 100644
              return true;
          } else if (object instanceof BlockStateEnum && super.equals(object)) {
 diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java
-index 6861c2b058..74ef699520 100644
+index 6861c2b05..74ef69952 100644
 --- a/src/main/java/net/minecraft/server/BlockStateInteger.java
 +++ b/src/main/java/net/minecraft/server/BlockStateInteger.java
 @@ -38,8 +38,7 @@ public class BlockStateInteger extends BlockState<Integer> {
diff --git a/Spigot-Server-Patches/0117-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch
similarity index 91%
rename from Spigot-Server-Patches/0117-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch
index a59638721..163b3d50f 100644
--- a/Spigot-Server-Patches/0117-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From 138c139b0ac064487751809cf99976ea857e2a81 Mon Sep 17 00:00:00 2001
+From f9ce5a3aec563f3b0d461b1d708e83538092f17b 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 1daa2e4535..5d0645c829 100644
+index 1daa2e453..5d0645c82 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -243,4 +243,13 @@ public class PaperConfig {
@@ -23,10 +23,10 @@ index 1daa2e4535..5d0645c829 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7c0d487d79..31b8524c40 100644
+index be2fe04a9..cfd34f516 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1220,13 +1220,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1226,13 +1226,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
diff --git a/Spigot-Server-Patches/0118-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch
similarity index 94%
rename from Spigot-Server-Patches/0118-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch
index 8f34e8db3..2fdc8a857 100644
--- a/Spigot-Server-Patches/0118-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From 2d4dff0ea534d2b92e7c2699f8532d830219e053 Mon Sep 17 00:00:00 2001
+From 680b0199706bd0c2dd2fe8d1049639b3ab4597ed Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5d0645c829..b5a50afd24 100644
+index 5d0645c82..b5a50afd2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -252,4 +252,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 5d0645c829..b5a50afd24 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 31b8524c40..49d2299eff 100644
+index cfd34f516..bf09c3939 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0119-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0118-Chunk-registration-fixes.patch
similarity index 91%
rename from Spigot-Server-Patches/0119-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0118-Chunk-registration-fixes.patch
index fe100e023..1f550103b 100644
--- a/Spigot-Server-Patches/0119-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0118-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 05f6bfc3adf98f785d098f84f809be59eebd28d0 Mon Sep 17 00:00:00 2001
+From ec685ceb20ffab12b02d5d83414fe27e24f579f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4ba5b00aef..690f530416 100644
+index 4ba5b00ae..690f53041 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -625,7 +625,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 89%
rename from Spigot-Server-Patches/0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index a961f0819..7ae98c148 100644
--- a/Spigot-Server-Patches/0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,11 +1,11 @@
-From 984cd1145835040e82bfcfe67a83a4976cb2ab4b Mon Sep 17 00:00:00 2001
+From e80bcc2cdb86f9d14f7fbab055861b4429e26236 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-index 1ed9a4e32e..9eb9801376 100644
+index 1ed9a4e32..9eb980137 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 @@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {
diff --git a/Spigot-Server-Patches/0121-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0120-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 90%
rename from Spigot-Server-Patches/0121-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0120-Auto-fix-bad-Y-levels-on-player-login.patch
index 610743955..5f116ea0a 100644
--- a/Spigot-Server-Patches/0121-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0120-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 170a97e6bab63ff70fa39bc14cd51375fdb6b74d Mon Sep 17 00:00:00 2001
+From cdf2b5d7860c49e030f00eb18980fee17cc69726 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2d29e9d866..7b0c89ce7a 100644
+index 2d29e9d86..7b0c89ce7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -193,6 +193,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0122-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0121-Option-to-remove-corrupt-tile-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0122-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0121-Option-to-remove-corrupt-tile-entities.patch
index 0edd192ce..6c19bc9b8 100644
--- a/Spigot-Server-Patches/0122-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0121-Option-to-remove-corrupt-tile-entities.patch
@@ -1,11 +1,11 @@
-From 36120b6b82c98025a294225f8ffe6b837a3c3c1c Mon Sep 17 00:00:00 2001
+From ea60900a8d77be0c965014324fc93dc5657d4be1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 241149c9..849872f6 100644
+index 241149c9f..849872f66 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -291,4 +291,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 241149c9..849872f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3d366dde..cacef3ac 100644
+index 3d366ddeb..cacef3ac9 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -533,6 +533,12 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0123-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0123-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
index 883df50bc..311a58c5a 100644
--- a/Spigot-Server-Patches/0123-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From d3f655a1ce1d75488a5ab18caf0020b0743a86ae Mon Sep 17 00:00:00 2001
+From 97f0e2e694712db3a4bc8febda96ed6e44a5a87f Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 23621a0dc9..0d099d2fd6 100644
+index 23621a0dc..0d099d2fd 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -168,6 +168,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 23621a0dc9..0d099d2fd6 100644
          if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
              return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 14125f519d..5e56447e7d 100644
+index 14125f519..5e56447e7 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -618,6 +618,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,7 +39,7 @@ index 14125f519d..5e56447e7d 100644
          entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
          entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bb5c5aa3d6..cf1abd1875 100644
+index bb5c5aa3d..cf1abd187 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1014,6 +1014,14 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0123-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 94%
rename from Spigot-Server-Patches/0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0123-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index f322005c7..d0fd6e9b3 100644
--- a/Spigot-Server-Patches/0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0123-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From b69e373bb7de1abeaae748b3ae900241fddd39f1 Mon Sep 17 00:00:00 2001
+From 89bcce52afb8d49807203290ef7753aefc06685b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 65b616481e..8183a61c9d 100644
+index 65b616481..8183a61c9 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -227,7 +227,12 @@ public class BlockChest extends BlockTileEntity implements IBlockWaterlogged {
diff --git a/Spigot-Server-Patches/0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0124-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 94%
rename from Spigot-Server-Patches/0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0124-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 0d61f645f..51f511890 100644
--- a/Spigot-Server-Patches/0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0124-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From 0aff1d3524bc0a9c96f8b913c3d382a4803bc2da Mon Sep 17 00:00:00 2001
+From 328ec5b1b2c4b56d24a60aeb5858cf54b7f4aa21 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 849872f6..11b0f11a 100644
+index 849872f66..11b0f11a8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -30,7 +30,7 @@ index 849872f6..11b0f11a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 9d86beda..44dd99ea 100644
+index 9d86beda9..44dd99ea2 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -232,6 +232,15 @@ public class EntityFallingBlock extends Entity {
diff --git a/Spigot-Server-Patches/0126-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0125-Cache-user-authenticator-threads.patch
similarity index 96%
rename from Spigot-Server-Patches/0126-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0125-Cache-user-authenticator-threads.patch
index 9c0dc170b..79bc4b3f3 100644
--- a/Spigot-Server-Patches/0126-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0125-Cache-user-authenticator-threads.patch
@@ -1,11 +1,11 @@
-From 6ee6eb5ba5a2da7dcc4fcbeb187d1a61d01d28e1 Mon Sep 17 00:00:00 2001
+From dbbca49137c950788a787394a49de39d64f46a90 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index b85b048ace..22d5c7d20a 100644
+index b85b048ac..22d5c7d20 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -92,6 +92,12 @@ public class LoginListener implements PacketLoginInListener {
diff --git a/Spigot-Server-Patches/0127-Optimise-removeQueue.patch b/Spigot-Server-Patches/0126-Optimise-removeQueue.patch
similarity index 97%
rename from Spigot-Server-Patches/0127-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0126-Optimise-removeQueue.patch
index a180d5b4e..c84432417 100644
--- a/Spigot-Server-Patches/0127-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0126-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From ed828ddc907f52c204ea2f7118569aa7093b0c58 Mon Sep 17 00:00:00 2001
+From 98d8191eba1f6029f5ebae24b943dcb60151a8ab Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7b0c89ce7a..fc4b3945d6 100644
+index 7b0c89ce7..fc4b3945d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
diff --git a/Spigot-Server-Patches/0128-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch
similarity index 93%
rename from Spigot-Server-Patches/0128-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch
index 6be52a183..a8ce40ce2 100644
--- a/Spigot-Server-Patches/0128-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 6f1a57a5faa8da68f8508196f78780bbb66b88d3 Mon Sep 17 00:00:00 2001
+From 5c80b1af654f2ab86eac1b897c4436a67cdc693e Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5a77ee9f71..c1d308db73 100644
+index 0d9e98914..9b4e957d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2076,5 +2076,24 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0129-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0129-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
index 41c14dc9f..251914c30 100644
--- a/Spigot-Server-Patches/0129-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From b145b409818c3a79f83f36cd1b6e7edef34969ad Mon Sep 17 00:00:00 2001
+From 0f18a6843159010c7875f1b721be24a86f41e33a Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 26a3a1d03a..a4cd502bca 100644
+index 26a3a1d03..a4cd502bc 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -190,7 +190,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 26a3a1d03a..a4cd502bca 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index cf1abd1875..445f2aef95 100644
+index cf1abd187..445f2aef9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -106,6 +106,7 @@ import org.bukkit.entity.ThrownPotion;
diff --git a/Spigot-Server-Patches/0130-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 90%
rename from Spigot-Server-Patches/0130-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
index 914fd856f..e1ec10f34 100644
--- a/Spigot-Server-Patches/0130-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From faa1b636f4ab2334b575232edef0fb8e30468b61 Mon Sep 17 00:00:00 2001
+From afe90ec5ec5202911c92ff2b497d734b76057256 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ec69c25394..9142edd4f8 100644
+index 4ce18f85b..cfdb6b57f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -209,6 +209,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0131-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch
similarity index 91%
rename from Spigot-Server-Patches/0131-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch
index 1c5d1d22d..e5b48a3ef 100644
--- a/Spigot-Server-Patches/0131-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From 60eab5063789e0ce5d62881948cad28c890e40d7 Mon Sep 17 00:00:00 2001
+From 700d379ba7196379a92553b35172a62cdeb80fa7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 44709d5d46..58f7bb658f 100644
+index 2a65a6685..187fea130 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 44709d5d46..58f7bb658f 100644
      public DimensionManager dimension;
      protected BlockPosition al;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 84e6d660d3..74b726937e 100644
+index 84e6d660d..74b726937 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -163,6 +163,12 @@ public class EntityFishingHook extends Entity {
diff --git a/Spigot-Server-Patches/0132-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0132-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
index 95ba8bfd9..3d977bb9f 100644
--- a/Spigot-Server-Patches/0132-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 9e59579b000cb3ac3240be5bdb9c9725d22892a1 Mon Sep 17 00:00:00 2001
+From 3671296a8a75f9614ab53495d951e3cb1c79cfde Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 44ea39e3d1..fa46dedb83 100644
+index 44ea39e3d..fa46dedb8 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -184,6 +184,16 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -26,7 +26,7 @@ index 44ea39e3d1..fa46dedb83 100644
                      this.a((MovingObjectPosition) object);
                      this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 1a9fee8da1..14c4394933 100644
+index 1a9fee8da..14c439493 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -67,7 +67,16 @@ public abstract class EntityFireball extends Entity {
@@ -48,7 +48,7 @@ index 1a9fee8da1..14c4394933 100644
  
                  // CraftBukkit start - Fire ProjectileHitEvent
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 74b726937e..05fa5cd6af 100644
+index 74b726937..05fa5cd6a 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -217,7 +217,16 @@ public class EntityFishingHook extends Entity {
@@ -70,7 +70,7 @@ index 74b726937e..05fa5cd6af 100644
              if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) {
                  this.hooked = ((MovingObjectPositionEntity) movingobjectposition).getEntity();
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index d1710259ce..5f0cb4c33d 100644
+index d1710259c..5f0cb4c33 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -102,7 +102,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -92,7 +92,7 @@ index d1710259ce..5f0cb4c33d 100644
                  this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
              } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 445f2aef95..a33a9fd792 100644
+index 445f2aef9..a33a9fd79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1118,6 +1118,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0133-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0132-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 91%
rename from Spigot-Server-Patches/0133-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0132-Prevent-Pathfinding-out-of-World-Border.patch
index 25d59e7b1..8bbfe11a6 100644
--- a/Spigot-Server-Patches/0133-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0132-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 562c5614110ce24da2f2e220cfa45786010c56b7 Mon Sep 17 00:00:00 2001
+From 55841be6ae2c51e34ba14f337cbbf0ff7c352696 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 8b05b8acd8..65b38d75b4 100644
+index 8b05b8acd..65b38d75b 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -95,6 +95,7 @@ public abstract class NavigationAbstract {
diff --git a/Spigot-Server-Patches/0134-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0133-Bound-Treasure-Maps-to-World-Border.patch
similarity index 95%
rename from Spigot-Server-Patches/0134-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0133-Bound-Treasure-Maps-to-World-Border.patch
index c7d442e7c..1715eae5b 100644
--- a/Spigot-Server-Patches/0134-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0133-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From a9da592db6a1b23e9f7cbc6702363dcce57ea9e3 Mon Sep 17 00:00:00 2001
+From f1df25df924b5fe017bb7cadcc6b633a7ca8b231 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 464e1e101a..7b2eace75c 100644
+index 464e1e101..7b2eace75 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -103,6 +103,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 464e1e101a..7b2eace75c 100644
  
                                  if (structurestart != null && structurestart.e()) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 1388610a7b..8902581376 100644
+index 1388610a7..890258137 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -24,6 +24,18 @@ public class WorldBorder {
diff --git a/Spigot-Server-Patches/0135-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0134-Configurable-Cartographer-Treasure-Maps.patch
similarity index 93%
rename from Spigot-Server-Patches/0135-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0134-Configurable-Cartographer-Treasure-Maps.patch
index 6a69dd165..f3121003d 100644
--- a/Spigot-Server-Patches/0135-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0134-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 55c729d5270871627095d17fdf129e70801059ce Mon Sep 17 00:00:00 2001
+From ea4b1c7e6c9ea1cff1f6a48fa97087f63531c4d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 11b0f11a..46d52522 100644
+index 11b0f11a8..46d525223 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -305,4 +305,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 11b0f11a..46d52522 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
-index 2a4e4f78..0b663236 100644
+index 2a4e4f785..0b6632369 100644
 --- a/src/main/java/net/minecraft/server/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
 @@ -89,6 +89,7 @@ public class VillagerTrades {
diff --git a/Spigot-Server-Patches/0136-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0135-Optimize-ItemStack.isEmpty.patch
similarity index 89%
rename from Spigot-Server-Patches/0136-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0135-Optimize-ItemStack.isEmpty.patch
index cc213dd88..6918dab55 100644
--- a/Spigot-Server-Patches/0136-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0135-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From ca5d889e447186ee476dd04b849c5ba3a319be9b Mon Sep 17 00:00:00 2001
+From 679bef409a36a11aecd5edb2bf998581b3f324de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 5bc078d314..09d0de48e8 100644
+index 5bc078d31..09d0de48e 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -145,7 +145,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0137-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 93%
rename from Spigot-Server-Patches/0137-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 4024c44f5..257cb8f49 100644
--- a/Spigot-Server-Patches/0137-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 92409889b996769785a3bda1db6c605081dec4a4 Mon Sep 17 00:00:00 2001
+From 66befc2b6f14be3178930d89c6d392a763f8bba3 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 2ba9cc9fec..ccdd0d27e3 100644
+index 2ba9cc9fe..ccdd0d27e 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index 2ba9cc9fec..ccdd0d27e3 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ade..124c3185bc 100644
+index 2b66a08ad..124c3185b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0138-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch
similarity index 87%
rename from Spigot-Server-Patches/0138-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch
index 93fc4f554..e6156cdee 100644
--- a/Spigot-Server-Patches/0138-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From cfcdc41816f6c2f0160bcf7c24b2637d4f9001b6 Mon Sep 17 00:00:00 2001
+From 91e39c858f06734d31882e3027101fcd628e30df 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fc4b3945d6..18c71640f5 100644
+index fc4b3945d..18c71640f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1796,7 +1796,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,10 +19,10 @@ index fc4b3945d6..18c71640f5 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 49d2299eff..6632b80d2a 100644
+index bf09c3939..fd8d30e5c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2544,7 +2544,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2550,7 +2550,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      }
  
      public final boolean isDisconnected() {
diff --git a/Spigot-Server-Patches/0139-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0139-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch
index a6e48e552..028098232 100644
--- a/Spigot-Server-Patches/0139-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 78844c50d111bbf2057a4e8d314f9a5950440823 Mon Sep 17 00:00:00 2001
+From f9190f756fad99e0f3dd79bfabfbbf310d7ffc29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index c96f3ed176..1f6a126329 100644
+index c96f3ed17..1f6a12632 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,7 +42,7 @@ index c96f3ed176..1f6a126329 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d854d48446..d064153829 100644
+index d854d4844..d06415382 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -217,6 +217,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0140-Firework-API-s.patch b/Spigot-Server-Patches/0139-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0140-Firework-API-s.patch
rename to Spigot-Server-Patches/0139-Firework-API-s.patch
index a864b3b5a..7152ad1e4 100644
--- a/Spigot-Server-Patches/0140-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0139-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From 87cebc52b802b5c19db5d61c746477912f5c360f Mon Sep 17 00:00:00 2001
+From 6f4d52fa199a856189faa704379f3d029192a50c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 25851b70ca..ffd379c970 100644
+index 25851b70c..ffd379c97 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 25851b70ca..ffd379c970 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 37caa79cba..aea46ffae5 100644
+index 37caa79cb..aea46ffae 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -17,6 +17,7 @@ public class ItemFireworks extends Item {
@@ -78,7 +78,7 @@ index 37caa79cba..aea46ffae5 100644
                      itemstack.subtract(1);
                  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 3f6d2676e7..b1fd18151b 100644
+index 3f6d2676e..b1fd18151 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -112,7 +112,7 @@ public class NBTTagCompound implements NBTBase {
@@ -91,7 +91,7 @@ index 3f6d2676e7..b1fd18151b 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 6b69be7421..37374ae5b3 100644
+index 6b69be742..37374ae5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity;
diff --git a/Spigot-Server-Patches/0141-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0140-PlayerTeleportEndGatewayEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0141-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0140-PlayerTeleportEndGatewayEvent.patch
index 5e9fceae6..a9f7a60b8 100644
--- a/Spigot-Server-Patches/0141-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0140-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From af4af9976fb10b41c436513723fa9f58c7bc3baf Mon Sep 17 00:00:00 2001
+From 453ea87e48a77798e95881e9c9f593066e3875c6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 2f44cf89f9..1783f59140 100644
+index 2f44cf89f..1783f5914 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -132,7 +132,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/0142-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 96%
rename from Spigot-Server-Patches/0142-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch
index d08d28e91..81819e824 100644
--- a/Spigot-Server-Patches/0142-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From c324ae58d965aec89dd4d918918ec037cc0b6c93 Mon Sep 17 00:00:00 2001
+From 0e442d6b5fbc3a3a88968a73c8df876d1a6a386d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
diff --git a/Spigot-Server-Patches/0143-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch
similarity index 90%
rename from Spigot-Server-Patches/0143-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch
index 01774b9b7..102047ec3 100644
--- a/Spigot-Server-Patches/0143-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 3680d942009e273966790b51f05ee712053bb431 Mon Sep 17 00:00:00 2001
+From 7b82841465226946c7984c2825385fe912d96c59 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ee5297dc38..ccf8b7c707 100644
+index ee5297dc3..ccf8b7c70 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -930,11 +930,13 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0144-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0143-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 82%
rename from Spigot-Server-Patches/0144-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0143-Don-t-allow-entities-to-ride-themselves-572.patch
index b7a8bd78b..5d843238e 100644
--- a/Spigot-Server-Patches/0144-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0143-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,14 +1,14 @@
-From 9b3f4c490e738a0d2f35ebf3b8faa6d5d454b9b2 Mon Sep 17 00:00:00 2001
+From ec3b684b139bf03519280a5324d5cf789fa9f1f6 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 58f7bb658f..f541011a34 100644
+index 187fea130..f2be5b5a3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2042,6 +2042,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2043,6 +2043,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected boolean addPassenger(Entity entity) { // CraftBukkit
diff --git a/Spigot-Server-Patches/0145-Fix-block-break-desync.patch b/Spigot-Server-Patches/0144-Fix-block-break-desync.patch
similarity index 85%
rename from Spigot-Server-Patches/0145-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0144-Fix-block-break-desync.patch
index 64024222d..b3a736f5d 100644
--- a/Spigot-Server-Patches/0145-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0144-Fix-block-break-desync.patch
@@ -1,14 +1,14 @@
-From 775d003e54e71a05b075395faad7fc6c01db7fe9 Mon Sep 17 00:00:00 2001
+From a978054018377ce66278733588ac849ca3176b24 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 6632b80d2a..ac8ab28a35 100644
+index fd8d30e5c..b34a0fb35 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1179,6 +1179,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1185,6 +1185,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
                  if (d3 > 36.0D) {
diff --git a/Spigot-Server-Patches/0146-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 99%
rename from Spigot-Server-Patches/0146-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 78215fe6d..b559563b9 100644
--- a/Spigot-Server-Patches/0146-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 59b6fccbd75443a0847e020792494948d01d6023 Mon Sep 17 00:00:00 2001
+From 4af485139828a7c37975ecab287553f2db10eb96 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
diff --git a/Spigot-Server-Patches/0147-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch
similarity index 93%
rename from Spigot-Server-Patches/0147-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch
index e2809c18f..165dedfcf 100644
--- a/Spigot-Server-Patches/0147-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 62fd9a8d1859a5ac7cddfefd35368fc9ed0135a8 Mon Sep 17 00:00:00 2001
+From e33ae307a120190c1dd440ba9e099ec6f3f7418c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 46d52522..de8362dd 100644
+index 46d525223..de8362ddd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -315,4 +315,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 46d52522..de8362dd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5407b3f1..a5b9cd6b 100644
+index f2be5b5a3..4dd2df808 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 5407b3f1..a5b9cd6b 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index cb2f3eb4..76954047 100644
+index cb2f3eb45..769540479 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2559,8 +2559,11 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0148-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 95%
rename from Spigot-Server-Patches/0148-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
index c6c27e1af..89bcfaf4c 100644
--- a/Spigot-Server-Patches/0148-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 04af820e49a344152ec1bd0a9daf4f2c44aea781 Mon Sep 17 00:00:00 2001
+From c6eda3f2ed18dd7cb6c375e143ec729bef2d7729 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 552daf4376..e102be583c 100644
+index 552daf437..e102be583 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/Spigot-Server-Patches/0149-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 86%
rename from Spigot-Server-Patches/0149-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 4926526c7..ff9dcb8ef 100644
--- a/Spigot-Server-Patches/0149-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,14 +1,14 @@
-From 30af74c2627fbed188f8faa0d2055df0d293a699 Mon Sep 17 00:00:00 2001
+From 6774c84e4671225b9edb7d8f94e4aa589d376d82 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 808c178157..6960e46ec6 100644
+index b5ae705d9..71494ecb3 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -79,7 +79,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -104,7 +104,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          this.v = new AtomicInteger();
          this.playerMap = new PlayerMap();
          this.trackedEntities = new Int2ObjectOpenHashMap();
@@ -17,7 +17,7 @@ index 808c178157..6960e46ec6 100644
          this.definedStructureManager = definedstructuremanager;
          this.x = worldserver.getWorldProvider().getDimensionManager().a(file);
          this.world = worldserver;
-@@ -322,7 +322,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -347,7 +347,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          // Spigot start
          org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
          activityAccountant.startActivity(0.5);
@@ -26,7 +26,7 @@ index 808c178157..6960e46ec6 100644
          // Spigot end
          while (longiterator.hasNext()) { // Spigot
              long j = longiterator.nextLong();
-@@ -344,7 +344,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -369,7 +369,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
  
          Runnable runnable;
  
diff --git a/Spigot-Server-Patches/0150-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0149-Do-not-let-armorstands-drown.patch
similarity index 93%
rename from Spigot-Server-Patches/0150-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0149-Do-not-let-armorstands-drown.patch
index ab486a3d3..d0f1e90e1 100644
--- a/Spigot-Server-Patches/0150-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0149-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 96957aa18534d0571cfc8b389b7920d040aede63 Mon Sep 17 00:00:00 2001
+From e69cd7f468280194fb62e08f23f504f7862c187c 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 ccdd0d27e3..62a878d13d 100644
+index ccdd0d27e..62a878d13 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -798,5 +798,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index ccdd0d27e3..62a878d13d 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 7695404790..3961ae1710 100644
+index 769540479..3961ae171 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -223,6 +223,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0151-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from Spigot-Server-Patches/0151-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch
index 2445cea9f..4dc272fd0 100644
--- a/Spigot-Server-Patches/0151-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 1b30ad8c9df9c5d7f37cbfc77ce0a143cf30a5d9 Mon Sep 17 00:00:00 2001
+From badadfda257f57e9e0512be166f7e8b2d5734d0f 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 065062c616..36d29b3324 100644
+index 065062c61..36d29b332 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -78,6 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -73,7 +73,7 @@ index 065062c616..36d29b3324 100644
      // Spigot Start
      private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ccf8b7c707..d23e4e5e3d 100644
+index ccf8b7c70..d23e4e5e3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1041,10 +1041,15 @@ public abstract class PlayerList {
@@ -102,7 +102,7 @@ index ccf8b7c707..d23e4e5e3d 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index ccea803f58..aefea3a9a8 100644
+index ccea803f5..aefea3a9a 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,86 +46,134 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0152-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0151-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0152-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0151-Add-system-property-to-disable-book-size-limits.patch
index 600df7424..6382b9bdf 100644
--- a/Spigot-Server-Patches/0152-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0151-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From 683df218036ebc78192dc9c8a02c55b80d8667c3 Mon Sep 17 00:00:00 2001
+From 0323ec893471d8f4c46be213fb7052f27089692a 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
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index fe8e6dcb77..f8a3c9718d 100644
+index fe8e6dcb7..f8a3c9718 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
diff --git a/Spigot-Server-Patches/0153-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0152-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 92%
rename from Spigot-Server-Patches/0153-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0152-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index a5ae5a645..74ba54f3f 100644
--- a/Spigot-Server-Patches/0153-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0152-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 46521311a789974ef5c4375a1988382829afac90 Mon Sep 17 00:00:00 2001
+From 7e2d4c45595801a4ddf9575d68a62a65d23091b9 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
@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index de8362dd..54d67994 100644
+index de8362ddd..54d679944 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -321,4 +321,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index de8362dd..54d67994 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1a1b1dd1..0974135c 100644
+index 1a1b1dd1e..0974135c6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -436,7 +436,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,10 +39,10 @@ index 1a1b1dd1..0974135c 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ac8ab28a..175f685d 100644
+index b34a0fb35..f7d487bb6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1787,6 +1787,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1793,6 +1793,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
          switch (packetplayinentityaction.c()) {
              case START_SNEAKING:
                  this.player.setSneaking(true);
diff --git a/Spigot-Server-Patches/0154-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0153-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 92%
rename from Spigot-Server-Patches/0154-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0153-Add-configuration-option-to-prevent-player-names-fro.patch
index 6f5aa773b..ddf354684 100644
--- a/Spigot-Server-Patches/0154-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0153-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 60d7135cda6fa76b14df19f35394a3f55bc21cdd Mon Sep 17 00:00:00 2001
+From eb27f8f1c3b57c94ede68718f517ff4f285afd64 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 b5a50afd24..11d2a1013b 100644
+index b5a50afd2..11d2a1013 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -259,4 +259,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index b5a50afd24..11d2a1013b 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c1d308db73..d9860ede39 100644
+index 9b4e957d6..79b2f0f57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2095,5 +2095,10 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0155-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0155-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch
index 8520f33b0..28a13ec62 100644
--- a/Spigot-Server-Patches/0155-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 4017231219e4793a0f35488cca945da08f29e40e Mon Sep 17 00:00:00 2001
+From 103b8778f1616489f464d9b206a0dae38b9ac2d6 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 75c1b84f6a..58ccbaa1ae 100644
+index 75c1b84f6..58ccbaa1a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -75,7 +75,7 @@ index 75c1b84f6a..58ccbaa1ae 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..cd6e259239
+index 000000000..cd6e25923
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -121,7 +121,7 @@ index 0000000000..cd6e259239
 +}
 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 6e1509c2c1..26b35855e1 100644
+index 6e1509c2c..26b35855e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -85,6 +85,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index 6e1509c2c1..26b35855e1 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 36d29b3324..f340f4bfe3 100644
+index 36d29b332..f340f4bfe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -48,7 +48,7 @@ import org.apache.commons.lang3.Validate;
@@ -244,7 +244,7 @@ index 36d29b3324..f340f4bfe3 100644
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d23e4e5e3d..6a77707983 100644
+index d23e4e5e3..6a7770798 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -76,8 +76,7 @@ public abstract class PlayerList {
@@ -258,7 +258,7 @@ index d23e4e5e3d..6a77707983 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 d9860ede39..beef3848de 100644
+index 79b2f0f57..a8d1a2f1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,7 +41,6 @@ import java.util.function.Consumer;
@@ -284,7 +284,7 @@ index d9860ede39..beef3848de 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 c5d5121fd9..4aebe53f8a 100644
+index ad1da9ddd..d2bdd7c73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,7 @@ import java.util.logging.Logger;
@@ -326,7 +326,7 @@ index c5d5121fd9..4aebe53f8a 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 fdf2f075e2..0000000000
+index fdf2f075e..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,72 +0,0 @@
@@ -403,7 +403,7 @@ index fdf2f075e2..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index befcc19f9b..5510266fb1 100644
+index befcc19f9..5510266fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -4,20 +4,31 @@ import java.util.Collections;
@@ -486,7 +486,7 @@ index befcc19f9b..5510266fb1 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 70f8d42992..449e99d1b6 100644
+index 70f8d4299..449e99d1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread {
@@ -500,7 +500,7 @@ index 70f8d42992..449e99d1b6 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 f267f99f96..0000000000
+index f267f99f9..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,57 +0,0 @@
@@ -562,7 +562,7 @@ index f267f99f96..0000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 490a9acc70..08b6bb7f97 100644
+index 490a9acc7..08b6bb7f9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
diff --git a/Spigot-Server-Patches/0156-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0155-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 92%
rename from Spigot-Server-Patches/0156-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0155-provide-a-configurable-option-to-disable-creeper-lin.patch
index 33db53a61..3d7eb28eb 100644
--- a/Spigot-Server-Patches/0156-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0155-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 7ec93aa70065fa717931aa932dc71f6dcf90cbd1 Mon Sep 17 00:00:00 2001
+From 694c0300246c075a6f2b926b60f83c9c852140f7 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
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 54d6799442..4d0d4cbe4e 100644
+index 54d679944..4d0d4cbe4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -327,4 +327,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 54d6799442..4d0d4cbe4e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 7ee854e946..8f5f97a223 100644
+index 7ee854e94..8f5f97a22 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -226,7 +226,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0157-Item-canEntityPickup.patch b/Spigot-Server-Patches/0156-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0157-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0156-Item-canEntityPickup.patch
index 8942ac734..86c0a1182 100644
--- a/Spigot-Server-Patches/0157-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0156-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From d6ffd0ce568969f209eda0a4b772fac3c99cb791 Mon Sep 17 00:00:00 2001
+From 02db19d0526850a5513db4a9433794486e981ed5 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 4fa345db65..c20374d77b 100644
+index 4fa345db6..c20374d77 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -511,6 +511,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index 4fa345db65..c20374d77b 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 0569ad9af8..c0b81223f1 100644
+index 0569ad9af..c0b81223f 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -19,6 +19,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index 0569ad9af8..c0b81223f1 100644
      public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index cc593fbc99..3f552b5905 100644
+index cc593fbc9..3f552b590 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
diff --git a/Spigot-Server-Patches/0158-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0157-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0158-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0157-PlayerPickupItemEvent-setFlyAtPlayer.patch
index f7cf60028..6c5170e6b 100644
--- a/Spigot-Server-Patches/0158-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0157-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From cc323d545a6848f3374ffea305558da5eb91451c Mon Sep 17 00:00:00 2001
+From 1a93d53038435493ae5a76b56555011cd1ee2e77 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 c0b81223f1..1baff88c4a 100644
+index c0b81223f..1baff88c4 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -318,6 +318,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0159-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0158-PlayerAttemptPickupItemEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0159-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0158-PlayerAttemptPickupItemEvent.patch
index 8692759a8..3cd7914f3 100644
--- a/Spigot-Server-Patches/0159-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0158-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From 9baa44b04f58ad80dbb3d6c5889b5c56e45a7063 Mon Sep 17 00:00:00 2001
+From 0f1ba434f613344fbc4695c30fbba356ad18bc28 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 1baff88c4a..f1f86ef8b5 100644
+index 1baff88c4..f1f86ef8b 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -8,6 +8,7 @@ import javax.annotation.Nullable;
diff --git a/Spigot-Server-Patches/0160-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0159-Add-UnknownCommandEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0160-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0159-Add-UnknownCommandEvent.patch
index 40f0b3ccb..aa06c2463 100644
--- a/Spigot-Server-Patches/0160-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0159-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From d7c84591b23bd225c387c798abff3b8aa3fe4fb5 Mon Sep 17 00:00:00 2001
+From 633f79e3f1621746dbcf0a0aa6e2f835b0323440 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 beef3848de..9487d471ef 100644
+index a8d1a2f1b..9972ca6ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -77,6 +77,7 @@ import net.minecraft.server.WorldServer;
diff --git a/Spigot-Server-Patches/0161-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0161-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch
index 02c377fdb..7d74d3139 100644
--- a/Spigot-Server-Patches/0161-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 27395e537f801c166c1fc6e9aefb362be68dd724 Mon Sep 17 00:00:00 2001
+From 9d0d2b30be170aeca39eacbb5feccdb3c6df4664 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 1f6a126329..6d278a0da5 100644
+index 1f6a12632..6d278a0da 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 1f6a126329..6d278a0da5 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 f340f4bfe3..c229651b50 100644
+index f340f4bfe..c229651b5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1244,7 +1244,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -450,7 +450,7 @@ index f340f4bfe3..c229651b50 100644
          return this.minecraftSessionService;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index b0d883d493..1d4bf64b1b 100644
+index b0d883d49..1d4bf64b1 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 b0d883d493..1d4bf64b1b 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 9487d471ef..b102076a2b 100644
+index 9972ca6ab..2f70d0627 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -196,6 +196,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
diff --git a/Spigot-Server-Patches/0162-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0162-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch
index d95525993..4e82d7577 100644
--- a/Spigot-Server-Patches/0162-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From f008ff982451ce9641423b9acb9da537cfc40543 Mon Sep 17 00:00:00 2001
+From 0260deaff7988780863ae225424d00209d0bfdc4 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/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0974135c65..d1f01bb640 100644
+index 0974135c6..d1f01bb64 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1781,20 +1781,45 @@ public abstract class EntityHuman extends EntityLiving {
@@ -59,7 +59,7 @@ index 0974135c65..d1f01bb640 100644
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 5cc5074a5e..e4d9300be2 100644
+index 5cc5074a5..e4d9300be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -664,6 +664,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0163-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0162-Profile-Lookup-Events.patch
similarity index 97%
rename from Spigot-Server-Patches/0163-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0162-Profile-Lookup-Events.patch
index 0d33120e8..ac8859c22 100644
--- a/Spigot-Server-Patches/0163-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0162-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From f6a2b66f0e5156d76a1d731c48bba727b1207c09 Mon Sep 17 00:00:00 2001
+From ec335e5cf002193d782def24ab0d161b66153e51 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
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
-index 3bcdb8f93f..bb9894318e 100644
+index 3bcdb8f93..bb9894318 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -1,17 +1,68 @@
diff --git a/Spigot-Server-Patches/0164-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0163-Block-player-logins-during-server-shutdown.patch
similarity index 90%
rename from Spigot-Server-Patches/0164-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0163-Block-player-logins-during-server-shutdown.patch
index 3db70dc20..fd81e45a9 100644
--- a/Spigot-Server-Patches/0164-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0163-Block-player-logins-during-server-shutdown.patch
@@ -1,11 +1,11 @@
-From a9e916ddd30419bc82b0938d310b646b840df645 Mon Sep 17 00:00:00 2001
+From ea0babba02771d72151b9692c5ce02fe9ad853aa 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
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 22d5c7d20a..91b6f1de80 100644
+index 22d5c7d20..91b6f1de8 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener {
diff --git a/Spigot-Server-Patches/0165-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch
similarity index 91%
rename from Spigot-Server-Patches/0165-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch
index f250b57ae..b67ff06ac 100644
--- a/Spigot-Server-Patches/0165-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From 31c3e212cbb80c9baae344907996eb3169799122 Mon Sep 17 00:00:00 2001
+From d8dc04b6f30e2587ea3298941140f903ce0e7d19 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 187441e87d..83b6bfeb43 100644
+index 4dd2df808..433972025 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index 187441e87d..83b6bfeb43 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1634,6 +1635,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1635,6 +1636,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (this.origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index 187441e87d..83b6bfeb43 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1762,6 +1767,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1763,6 +1768,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (!originTag.isEmpty()) {
                  origin = new Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
              }
@@ -37,7 +37,7 @@ index 187441e87d..83b6bfeb43 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 13e62e3d7f..4bd511dd7c 100644
+index 13e62e3d7..4bd511dd7 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -133,6 +133,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index 13e62e3d7f..4bd511dd7c 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 ed496d03ae..b000bc8c71 100644
+index ed496d03a..b000bc8c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1047,5 +1047,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0166-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0166-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch
index cf71ffc86..73c5561c0 100644
--- a/Spigot-Server-Patches/0166-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 071b823ed588b9674e461e2cd86eac137df94bde Mon Sep 17 00:00:00 2001
+From 38a48da2e69d4ff804616f0533ea238d0ef1b43a 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
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 09016e3547..9952db3eb5 100644
+index 09016e354..9952db3eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@@ -27,7 +27,7 @@ index 09016e3547..9952db3eb5 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 63991bf4be..9a47a1adc1 100644
+index 63991bf4b..9a47a1adc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory;
@@ -41,7 +41,7 @@ index 63991bf4be..9a47a1adc1 100644
          super(inventory);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 new file mode 100644
-index 0000000000..99cfbaf90b
+index 000000000..99cfbaf90
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 @@ -0,0 +1,15 @@
diff --git a/Spigot-Server-Patches/0167-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0167-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch
index c7e15575f..871ade764 100644
--- a/Spigot-Server-Patches/0167-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From a2308328bb98c2efa4845f173fa77fc653209fa9 Mon Sep 17 00:00:00 2001
+From 881e728b2d73b2e1fc2b974ea554b03b26ca7393 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
diff --git a/Spigot-Server-Patches/0168-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch
similarity index 96%
rename from Spigot-Server-Patches/0168-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch
index 8acf09b17..149634a95 100644
--- a/Spigot-Server-Patches/0168-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From aa9e4653f6594c2c7f44078afea4129c87ecdce4 Mon Sep 17 00:00:00 2001
+From f13614046f40648258e7472353c7b21c0f88c177 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
diff --git a/Spigot-Server-Patches/0169-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0169-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch
index d02af5b4d..32a68f4ba 100644
--- a/Spigot-Server-Patches/0169-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch
@@ -1,11 +1,11 @@
-From e02110d4745e02e359c48da4a50f3cb83a052ef4 Mon Sep 17 00:00:00 2001
+From 576e17ccad9de416655b035f5ac05f8645416fc5 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 6a77707983..a167843bfb 100644
+index 6a7770798..a167843bf 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -521,9 +521,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0170-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch
similarity index 96%
rename from Spigot-Server-Patches/0170-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch
index d8041f0bc..c0ae1347d 100644
--- a/Spigot-Server-Patches/0170-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 12223c520ad7731a8e3433a52d370f56feeb1f58 Mon Sep 17 00:00:00 2001
+From 709bb372b87f6478be5717d270cd81223c460db7 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
diff --git a/Spigot-Server-Patches/0171-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0170-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 89%
rename from Spigot-Server-Patches/0171-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0170-Ocelot-despawns-should-honor-nametags-and-leash.patch
index a423a6ca6..cb6f90874 100644
--- a/Spigot-Server-Patches/0171-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0170-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,11 +1,11 @@
-From 35e77793dd39c7699a40e87fb7a39359baf2a0c5 Mon Sep 17 00:00:00 2001
+From 06483bd2137b5de16b38caa67e46aabf6d3fd094 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 f50efe782a..0f1c259595 100644
+index f50efe782..0f1c25959 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -82,7 +82,7 @@ public class EntityOcelot extends EntityAnimal {
diff --git a/Spigot-Server-Patches/0172-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0171-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 92%
rename from Spigot-Server-Patches/0172-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0171-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 384345a49..afabf6739 100644
--- a/Spigot-Server-Patches/0172-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0171-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From 04b5b085feab5f37a904100407e28d2fd8a1e7c8 Mon Sep 17 00:00:00 2001
+From 699a56bea1a38f6d317cf7c4dc340ef1a2937f16 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
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 4bd511dd7c..59bd9ccd70 100644
+index 4bd511dd7..59bd9ccd7 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -139,6 +139,9 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0173-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0172-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 92%
rename from Spigot-Server-Patches/0173-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0172-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 83a6bc40e..aea7398cf 100644
--- a/Spigot-Server-Patches/0173-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0172-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From 1a7a9a51b43e095130857564bbcdb0f68fcebcda Mon Sep 17 00:00:00 2001
+From e306b1f60ec0dd3ebadefca87ae7a67b4cf38ab1 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 9142edd4f8..4498a21073 100644
+index cfdb6b57f..002fdd768 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -734,7 +734,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0174-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0173-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 94%
rename from Spigot-Server-Patches/0174-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0173-Allow-specifying-a-custom-authentication-servers-dow.patch
index d0c0877d7..bf1669b7c 100644
--- a/Spigot-Server-Patches/0174-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0173-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 858c91ba3c061e0005949dbbf7c269e9d2833289 Mon Sep 17 00:00:00 2001
+From 165f8cf515e55863064f67c20f7797e9936ad918 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 11d2a1013b..11f08c2b73 100644
+index 11d2a1013..11f08c2b7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -27,7 +27,7 @@ index 11d2a1013b..11f08c2b73 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 91b6f1de80..398f67f4b6 100644
+index 91b6f1de8..398f67f4b 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -242,6 +242,10 @@ public class LoginListener implements PacketLoginInListener {
diff --git a/Spigot-Server-Patches/0175-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0174-LivingEntity-setKiller.patch
similarity index 93%
rename from Spigot-Server-Patches/0175-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0174-LivingEntity-setKiller.patch
index ed9a23dd9..7636b3244 100644
--- a/Spigot-Server-Patches/0175-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0174-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From a7f048ab79c856fbd66d9771917961fcdf0849a3 Mon Sep 17 00:00:00 2001
+From 304a36f415dcc5530b321815a2fe6f48c79191dc 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3961ae1710..31e3bf0edf 100644
+index 3961ae171..31e3bf0ed 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -76,7 +76,7 @@ public abstract class EntityLiving extends Entity {
@@ -18,7 +18,7 @@ index 3961ae1710..31e3bf0edf 100644
      protected int ticksFarFromPlayer;
      protected float aT;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index aa50435bec..42cc158824 100644
+index aa50435be..42cc15882 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -304,6 +304,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0176-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0175-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0176-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0175-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 5980e49e5..1782dbacb 100644
--- a/Spigot-Server-Patches/0176-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0175-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From acbb8800c69c6b08ac98fd6b56f92730baf8936b Mon Sep 17 00:00:00 2001
+From 47c7a823f8bb02c915e51a9e0fea989318c661d4 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 58ccbaa1ae..85fa0d9833 100644
+index 58ccbaa1a..85fa0d983 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,11 @@
@@ -28,7 +28,7 @@ index 58ccbaa1ae..85fa0d9833 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 26b35855e1..c093747bb2 100644
+index 26b35855e..c093747bb 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -137,8 +137,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0177-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0176-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 95%
rename from Spigot-Server-Patches/0177-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0176-Handle-plugin-prefixes-using-Log4J-configuration.patch
index ae08ccecc..50787583f 100644
--- a/Spigot-Server-Patches/0177-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0176-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 9f209f9fdb0f1db65d06fc642e2734d923c69c26 Mon Sep 17 00:00:00 2001
+From 6274ed4beb01d620d286d631208e21977133d642 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 85fa0d9833..5558921cd7 100644
+index 85fa0d983..5558921cd 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,7 +61,7 @@
@@ -28,7 +28,7 @@ index 85fa0d9833..5558921cd7 100644
          <dependency>
              <groupId>org.apache.logging.log4j</groupId>
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index fc6cb9306a..bd601333ee 100644
+index fc6cb9306..bd601333e 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -291,7 +291,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index fc6cb9306a..bd601333ee 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f97..9f8334376f 100644
+index 08b6bb7f9..9f8334376 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,10 +2,22 @@
diff --git a/Spigot-Server-Patches/0178-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0177-Include-Log4J2-SLF4J-implementation.patch
similarity index 87%
rename from Spigot-Server-Patches/0178-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0177-Include-Log4J2-SLF4J-implementation.patch
index 7d4c1cf86..4967cd32d 100644
--- a/Spigot-Server-Patches/0178-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0177-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From de30ec478a00e6fccbb8039b4d9f5fcd5f0b0a44 Mon Sep 17 00:00:00 2001
+From d51166fad157707f92dbc777e8bb27dcbe987b1d 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 5558921cd7..4ead093278 100644
+index 5558921cd..4ead09327 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,12 @@
diff --git a/Spigot-Server-Patches/0179-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0178-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 95%
rename from Spigot-Server-Patches/0179-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0178-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 6467e1667..95f440a7d 100644
--- a/Spigot-Server-Patches/0179-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0178-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 82fd6103c48845be28830291ff3beb861b79fa4f Mon Sep 17 00:00:00 2001
+From c9f4d39e4d82c6184244bcb0930fb9e217bfd216 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
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f8334376f..6711e6dff9 100644
+index 9f8334376..6711e6dff 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,7 +5,8 @@
diff --git a/Spigot-Server-Patches/0180-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0180-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch
index 594b7afc5..3f7ee0d50 100644
--- a/Spigot-Server-Patches/0180-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From 0140510111bb6ade378f031f5e2e73d48125a6af Mon Sep 17 00:00:00 2001
+From 356e3a97ae6553c4cdbd3dc780da703fe717a246 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 175f685d27..a04577fc00 100644
+index f7d487bb6..b743d4f5e 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/0181-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch
similarity index 92%
rename from Spigot-Server-Patches/0181-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch
index 159e42254..da5e63aef 100644
--- a/Spigot-Server-Patches/0181-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 1ef7f2174a1803599715615c8adc4c30910af694 Mon Sep 17 00:00:00 2001
+From cf4ab77812dee87bc6c484bfe8bf228acc25ff79 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 a04577fc00..c6a5b00f4f 100644
+index b743d4f5e..f658be09c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2507,14 +2507,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2513,14 +2513,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/Spigot-Server-Patches/0182-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0181-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from Spigot-Server-Patches/0182-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0181-Expose-client-protocol-version-and-virtual-host.patch
index 439a22213..cdf87e9e0 100644
--- a/Spigot-Server-Patches/0182-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0181-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 4cf6d5926062d486f4a50f535729040c2f737f20 Mon Sep 17 00:00:00 2001
+From 49d2d347eb0097c129e8ac08eb90979d6db794b2 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 66dda900b6..07d85e5353 100644
+index 66dda900b..07d85e535 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 66dda900b6..07d85e5353 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d4c59baf8f..ae60f757e3 100644
+index d4c59baf8..ae60f757e 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 d4c59baf8f..ae60f757e3 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 4f008e4723..8545146fb1 100644
+index 4f008e472..8545146fb 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 4f008e4723..8545146fb1 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 d064153829..9d2a8a2da0 100644
+index d06415382..9d2a8a2da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -184,6 +184,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0183-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0183-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch
index ab515c418..73e201832 100644
--- a/Spigot-Server-Patches/0183-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 1a9949e280b4bebe540a442cee90614fd94c2bd7 Mon Sep 17 00:00:00 2001
+From 4de4c0efd42b156dd967471f5919c14b99f148f8 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 c6a5b00f4f..eb720814b2 100644
+index f658be09c..8c9d09e97 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 {
diff --git a/Spigot-Server-Patches/0184-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0183-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 97%
rename from Spigot-Server-Patches/0184-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0183-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 44056df2e..c071f41cb 100644
--- a/Spigot-Server-Patches/0184-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0183-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From eefa48f2de222faf1d041b776efaf9875b7099ac Mon Sep 17 00:00:00 2001
+From c2b855ad1bdf8d35808470af87415eb11f9bf87b 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 d1f01bb640..3b978528ba 100644
+index d1f01bb64..3b978528b 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -941,6 +941,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index d1f01bb640..3b978528ba 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4498a21073..ed78bba710 100644
+index 002fdd768..dc95fe907 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -671,6 +671,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0184-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 96%
rename from Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0184-Option-for-maximum-exp-value-when-merging-orbs.patch
index 799f8cb99..da6e8584d 100644
--- a/Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0184-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,11 +1,11 @@
-From 03fed9dc5253768447be963f64d68a5b6d878c5e Mon Sep 17 00:00:00 2001
+From fd01c1197ce06a475905315bb53b5b98534ad936 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 4d0d4cbe..b3d8fe9c 100644
+index 4d0d4cbe4..b3d8fe9c6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -333,4 +333,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 4d0d4cbe..b3d8fe9c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a33a9fd7..85a9dd5a 100644
+index a33a9fd79..85a9dd5ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -529,16 +529,32 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0186-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0185-Add-PlayerArmorChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0186-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0185-Add-PlayerArmorChangeEvent.patch
index ed3b6ac27..2b4c55446 100644
--- a/Spigot-Server-Patches/0186-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0185-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From bf32bf3a52c0b61c1ecef7ac8e4f2bda54cbc8b6 Mon Sep 17 00:00:00 2001
+From ac64242cb9351362f1c196aa499c09c4be763db4 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 31e3bf0edf..1157a9eb63 100644
+index 31e3bf0ed..1157a9eb6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index 31e3bf0edf..1157a9eb63 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index 02a7ae6785..60b235f16f 100644
+index 02a7ae678..60b235f16 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
diff --git a/Spigot-Server-Patches/0187-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0186-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 91%
rename from Spigot-Server-Patches/0187-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0186-Prevent-logins-from-being-processed-when-the-player-.patch
index ef14f9ead..3b207ee7a 100644
--- a/Spigot-Server-Patches/0187-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0186-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 4ecf4e7620ffd03508de14868a4ead9c60538684 Mon Sep 17 00:00:00 2001
+From e3f535b6ef8adbd665651c6432177a7a079c5ac6 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 398f67f4b6..fe912e0eb1 100644
+index 398f67f4b..fe912e0eb 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener {
diff --git a/Spigot-Server-Patches/0188-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0187-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 94%
rename from Spigot-Server-Patches/0188-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0187-use-CB-BlockState-implementations-for-captured-block.patch
index e87a1d9fd..e5f13313f 100644
--- a/Spigot-Server-Patches/0188-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0187-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From 2782a4c62845d813bea905849ed8f34e4b24429e Mon Sep 17 00:00:00 2001
+From 4255c309221377575a5d5ca547d370e565e63ee6 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 ed78bba710..985b459efe 100644
+index dc95fe907..b9570ea92 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -348,7 +348,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0188-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 96%
rename from Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0188-API-to-get-a-BlockState-without-a-snapshot.patch
index 80e8ebfa3..33d122d44 100644
--- a/Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0188-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From d08fa6cbd867dc75be22acfc1100e39b99b3c968 Mon Sep 17 00:00:00 2001
+From 3fff2c50966bb9c1c4e9e8a29c5f6d4783e24501 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
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index af6977dcdc..c72b013868 100644
+index af6977dcd..c72b01386 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -230,7 +230,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -39,7 +39,7 @@ index af6977dcdc..c72b013868 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 2bc0b2e093..166c918d73 100644
+index 2bc0b2e09..166c918d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -312,6 +312,20 @@ public class CraftBlock implements Block {
@@ -64,7 +64,7 @@ index 2bc0b2e093..166c918d73 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 17d80b5c6e..f6401e2cde 100644
+index 17d80b5c6..f6401e2cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -26,20 +26,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -114,7 +114,7 @@ index 17d80b5c6e..f6401e2cde 100644
  
      private T createSnapshot(T tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 15022ada0c..af15656cc4 100644
+index 15022ada0..af15656cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
diff --git a/Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0189-AsyncTabCompleteEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0189-AsyncTabCompleteEvent.patch
index 5a73976cd..0e1909e8e 100644
--- a/Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0189-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 65568a36e514757c020d6a6b2dd6c6bba3376a83 Mon Sep 17 00:00:00 2001
+From 14db645ac522a22543f78944e555c3f320db9bed 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 eb720814b2..0a9fc4653a 100644
+index 8c9d09e97..21d42ab9d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -520,10 +520,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -72,7 +72,7 @@ index eb720814b2..0a9fc4653a 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b102076a2b..4e0d1ec0d3 100644
+index 2f70d0627..2a2b28441 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1667,7 +1667,7 @@ public final class CraftServer implements Server {
@@ -85,7 +85,7 @@ index b102076a2b..4e0d1ec0d3 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 5510266fb1..a51202ed53 100644
+index 5510266fb..a51202ed5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
diff --git a/Spigot-Server-Patches/0191-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0190-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 89%
rename from Spigot-Server-Patches/0191-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0190-Avoid-NPE-in-PathfinderGoalTempt.patch
index 233bcf32a..54f5c17f5 100644
--- a/Spigot-Server-Patches/0191-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0190-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,11 +1,11 @@
-From fa19402a942ab8272ab9c930fc1e81089f34ec87 Mon Sep 17 00:00:00 2001
+From ff5541a03601804d2ebb129189050015e3bf35c4 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 1bf5d6c08b..0b036f29cf 100644
+index 1bf5d6c08..0b036f29c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
diff --git a/Spigot-Server-Patches/0192-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0191-PlayerPickupExperienceEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0192-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0191-PlayerPickupExperienceEvent.patch
index b3cb68953..fda6a5c0b 100644
--- a/Spigot-Server-Patches/0192-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0191-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 71af057dab772c879a4292fd4a17994677fc95cf Mon Sep 17 00:00:00 2001
+From 9aed4e9e561bd1824cadb8bd7095bdd6941b61fe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 214ecdb884..8c25695669 100644
+index 214ecdb88..8c2569566 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -219,7 +219,7 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0192-ExperienceOrbMergeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0192-ExperienceOrbMergeEvent.patch
index 060236894..debefcee4 100644
--- a/Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0192-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From fc1ff1410e553f1f59fb536a3ca3dc7216ecfd87 Mon Sep 17 00:00:00 2001
+From 426522cbfdb03eef95524413ada590b5fedc7b25 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 85a9dd5abb..aedff6fcfd 100644
+index 85a9dd5ab..aedff6fcf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -539,7 +539,7 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0193-Ability-to-apply-mending-to-XP-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0193-Ability-to-apply-mending-to-XP-API.patch
index 2cfe7fa12..d7c72fe44 100644
--- a/Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0193-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 52e2098f3f1c39e11e215086de44578ee0b064cc Mon Sep 17 00:00:00 2001
+From c5579073dc8e3321aac94fdfa3adcf55b32eb834 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 8c658079f7..16e6d95cf1 100644
+index 8c658079f..16e6d95cf 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -241,6 +241,11 @@ public class EnchantmentManager {
@@ -26,7 +26,7 @@ index 8c658079f7..16e6d95cf1 100644
      public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
          Map<EnumItemSlot, ItemStack> map = enchantment.a(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 8c25695669..6a5954889e 100644
+index 8c2569566..6a5954889 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -251,10 +251,12 @@ public class EntityExperienceOrb extends Entity {
@@ -43,7 +43,7 @@ index 8c25695669..6a5954889e 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 9d2a8a2da0..d8ce699e3e 100644
+index 9d2a8a2da..d8ce699e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1063,8 +1063,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0195-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0194-Make-max-squid-spawn-height-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0195-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0194-Make-max-squid-spawn-height-configurable.patch
index 73c07061d..ae2cc4237 100644
--- a/Spigot-Server-Patches/0195-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0194-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 0fb85f0712c4d30a3f74b2b493c14509356e2289 Mon Sep 17 00:00:00 2001
+From 4d925697fd5b650cc2bc7b653993e85bb6225131 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
@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b3d8fe9c..7287bf7d 100644
+index b3d8fe9c6..7287bf7d9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -339,4 +339,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index b3d8fe9c..7287bf7d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 338c203b..aafb7df0 100644
+index 338c203b3..aafb7df0c 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0196-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0195-PreCreatureSpawnEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0196-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0195-PreCreatureSpawnEvent.patch
index f632950d4..045c1532c 100644
--- a/Spigot-Server-Patches/0196-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0195-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 0c3441dbdb5e6791987dd56d478fe17474049c6a Mon Sep 17 00:00:00 2001
+From 99cf553c28be7dfe122a00533b9bad68baae8b06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 59bd9ccd70..6f5d8b0315 100644
+index 59bd9ccd7..6f5d8b031 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -104,6 +104,28 @@ public abstract class MobSpawnerAbstract {
@@ -48,7 +48,7 @@ index 59bd9ccd70..6f5d8b0315 100644
                              entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch);
                              return entity1;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 4aa65c1934..4458b48ee8 100644
+index 4aa65c193..4458b48ee 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -38,7 +38,7 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0196-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0196-PlayerNaturallySpawnCreaturesEvent.patch
index 69b42f99a..4bfd820da 100644
--- a/Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0196-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From ade0c873db8b95683bd6e1dd75a8fc316742f1fb Mon Sep 17 00:00:00 2001
+From 7e8abd496c43334132b6c4001fca6f95c41e2011 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,10 +9,10 @@ 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/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index aed9e7e45..c9bac0523 100644
+index 71494ecb3..398630bb4 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -760,12 +760,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -785,12 +785,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          chunkRange = (chunkRange > world.spigotConfig.viewDistance) ? (byte) world.spigotConfig.viewDistance : chunkRange;
          chunkRange = (chunkRange > 8) ? 8 : chunkRange;
  
diff --git a/Spigot-Server-Patches/0198-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0197-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 96%
rename from Spigot-Server-Patches/0198-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0197-Add-setPlayerProfile-API-for-Skulls.patch
index ab3b1a0fc..74a33918f 100644
--- a/Spigot-Server-Patches/0198-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0197-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From 68a9556bb6b0193a47a7d1d6f5f5736fd062d333 Mon Sep 17 00:00:00 2001
+From e2045a0e6938776f9c9ab0a0897ace9b4427587a 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 a4bc7f9701..2dd2f476f0 100644
+index a4bc7f970..2dd2f476f 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 a4bc7f9701..2dd2f476f0 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 0136e1bfe1..aee97b9f03 100644
+index 0136e1bfe..aee97b9f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory;
diff --git a/Spigot-Server-Patches/0199-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0198-Fill-Profile-Property-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0199-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0198-Fill-Profile-Property-Events.patch
index 58b40efeb..c8438d6da 100644
--- a/Spigot-Server-Patches/0199-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0198-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From aff6cee764bddf59930a139a81b6343aa15682bc Mon Sep 17 00:00:00 2001
+From 1bc7a40db9fa007d1cd40d9a1dfb8daef19ecfde 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
@@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results.
 This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
-index 4b2a67423f..61cfdf73c8 100644
+index 4b2a67423..61cfdf73c 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0200-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0199-PlayerAdvancementCriterionGrantEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0200-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0199-PlayerAdvancementCriterionGrantEvent.patch
index d01856fe0..5b97474cb 100644
--- a/Spigot-Server-Patches/0200-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0199-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,11 +1,11 @@
-From 0e3401a294b9c8b69789d8c62b985d6696b066ec Mon Sep 17 00:00:00 2001
+From f7eb0740cc9a900d887c626266752ca42e1f5cf3 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
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index e8a69e18e3..1833310c1f 100644
+index e8a69e18e..1833310c1 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -276,6 +276,12 @@ public class AdvancementDataPlayer {
diff --git a/Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0200-Add-ArmorStand-Item-Meta.patch
similarity index 99%
rename from Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0200-Add-ArmorStand-Item-Meta.patch
index f22985339..5dc5573cb 100644
--- a/Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0200-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From cc0c4439a566c30f847a5941d1f381163fe7071e Mon Sep 17 00:00:00 2001
+From 0bac19a94d325c1ec051fd683298d44d478cb580 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
diff --git a/Spigot-Server-Patches/0202-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0201-Extend-Player-Interact-cancellation.patch
similarity index 97%
rename from Spigot-Server-Patches/0202-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0201-Extend-Player-Interact-cancellation.patch
index a68cc1d17..b3f32448c 100644
--- a/Spigot-Server-Patches/0202-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0201-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From 134726eb24f6e5bbf0d6f2af3bd5946d7469404c Mon Sep 17 00:00:00 2001
+From 6fc018a25a1a61411a89428084fcaf9c8d38eb05 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 e306b138db..89a13b88bb 100644
+index e306b138d..89a13b88b 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 {
diff --git a/Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0202-Tameable-getOwnerUniqueId-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0202-Tameable-getOwnerUniqueId-API.patch
index ad9d5ac47..98307f699 100644
--- a/Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0202-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 0ac0b4152f839162f71bb98e12e0fc8c2a1fc439 Mon Sep 17 00:00:00 2001
+From e70d2a2d324a327f19e69150135778aebf863f3e 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
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 9952db3eb5..1aea5f3f05 100644
+index 9952db3eb..1aea5f3f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -21,7 +21,7 @@ index 9952db3eb5..1aea5f3f05 100644
          return getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index 5dfa40dda1..407b95cafd 100644
+index 5dfa40dda..407b95caf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
diff --git a/Spigot-Server-Patches/0204-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0203-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 92%
rename from Spigot-Server-Patches/0204-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0203-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 85666fdec..18bd306b7 100644
--- a/Spigot-Server-Patches/0204-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0203-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,11 +1,11 @@
-From e72f8157523f1c73fb244b9068ff74076d0d0672 Mon Sep 17 00:00:00 2001
+From 19f4ef8235ba23d8e11c0aff936595232764a0b4 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.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c3e61bdfe3..32bfe0e462 100644
+index 7287bf7d9..94ffba97b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -182,6 +182,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index c3e61bdfe3..32bfe0e462 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 3b978528ba..3a01cbe014 100644
+index 3b978528b..3a01cbe01 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -981,6 +981,7 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0205-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0204-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 92%
rename from Spigot-Server-Patches/0205-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0204-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index 992f7f5b8..ee49846f0 100644
--- a/Spigot-Server-Patches/0205-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0204-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 8b96543a76cc08b48fe326604b18352ab2a5171b Mon Sep 17 00:00:00 2001
+From 9940fd53e86d6b1cd2376b8a249e5bac76529366 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
 
 
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index 5a9ac3960d..fd31b9a6dc 100644
+index 5a9ac3960..fd31b9a6d 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
diff --git a/Spigot-Server-Patches/0206-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0205-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0206-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0205-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 0ee5b60f0..8de8398e6 100644
--- a/Spigot-Server-Patches/0206-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0205-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,11 +1,11 @@
-From 7ac8c7e353cf5f3913550f1e8e3ff711c6590a45 Mon Sep 17 00:00:00 2001
+From 8974cecfb3fff6d5ed1682c3b1e090cbc83668a3 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 39c3bbc9cf..881dfb1235 100644
+index 39c3bbc9c..881dfb123 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -26,7 +26,8 @@ public class BlockIceFrost extends BlockIce {
diff --git a/Spigot-Server-Patches/0207-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0206-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 94%
rename from Spigot-Server-Patches/0207-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0206-Disable-Explicit-Network-Manager-Flushing.patch
index 8a94ba597..bfbe585f7 100644
--- a/Spigot-Server-Patches/0207-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0206-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 71cd602aff4b675890553c5817cd9ac7c1ba4c99 Mon Sep 17 00:00:00 2001
+From e35a1d6f383a4a69dfa9567882bb7eb3aa207ff4 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
@@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index ae60f757e3..efd02bd67d 100644
+index ae60f757e..efd02bd67 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -65,6 +65,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0207-Implement-extended-PaperServerListPingEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0207-Implement-extended-PaperServerListPingEvent.patch
index 81442c419..6abdbff6d 100644
--- a/Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0207-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 41e69d35aa968bc6b8dc3b3a31e5cb233d88b3b3 Mon Sep 17 00:00:00 2001
+From 5497bba3c0008d8a69db1b0663a7b880cae9ff10 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 new file mode 100644
-index 0000000000..c1a8e295b6
+index 000000000..c1a8e295b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 @@ -0,0 +1,31 @@
@@ -43,7 +43,7 @@ index 0000000000..c1a8e295b6
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 new file mode 100644
-index 0000000000..a2a409e635
+index 000000000..a2a409e63
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 @@ -0,0 +1,11 @@
@@ -60,7 +60,7 @@ index 0000000000..a2a409e635
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 new file mode 100644
-index 0000000000..a85466bc7e
+index 000000000..a85466bc7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
@@ -177,7 +177,7 @@ index 0000000000..a85466bc7e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c229651b50..946803e2be 100644
+index c229651b5..946803e2b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,8 @@
@@ -199,7 +199,7 @@ index c229651b50..946803e2be 100644
  
              for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index b247a18b9e..ba1c76c1a5 100644
+index b247a18b9..ba1c76c1a 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -32,6 +32,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -222,7 +222,7 @@ index b247a18b9e..ba1c76c1a5 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index aa125a52dc..ea52e89bd9 100644
+index aa125a52d..ea52e89bd 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -29,6 +29,7 @@ public class ServerPing {
@@ -247,7 +247,7 @@ index aa125a52dc..ea52e89bd9 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index bd601333ee..6c5430ff94 100644
+index bd601333e..6c5430ff9 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -290,7 +290,7 @@ public class SpigotConfig
diff --git a/Spigot-Server-Patches/0209-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0208-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0209-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0208-Improved-Async-Task-Scheduler.patch
index ae572da91..438ee69c3 100644
--- a/Spigot-Server-Patches/0209-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0208-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From 38ef37404d0a30c16796943f663c48d508d276e5 Mon Sep 17 00:00:00 2001
+From 6a7216197de13c68cd62d61a774f008a65f6ce8d 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
@@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 0000000000..3c1992e212
+index 000000000..3c1992e21
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +1,122 @@
@@ -159,7 +159,7 @@ index 0000000000..3c1992e212
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e102be583c..5db848de14 100644
+index e102be583..5db848de1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/Spigot-Server-Patches/0210-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0209-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 96%
rename from Spigot-Server-Patches/0210-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0209-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index f43f52b2b..af312c9bd 100644
--- a/Spigot-Server-Patches/0210-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0209-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From d15c15def5935bf31a84e867e7372ea817970d57 Mon Sep 17 00:00:00 2001
+From 9ce1e0fe22971473b06177acef0213738233ff58 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index fe912e0eb1..7c3b9c0b97 100644
+index fe912e0eb..7c3b9c0b9 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0210-Player.setPlayerProfile-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0210-Player.setPlayerProfile-API.patch
index 47c004860..ca13a9579 100644
--- a/Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0210-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From fbd1e663fc3466166abda5a828f35e4b2cf60930 Mon Sep 17 00:00:00 2001
+From 31c2b8881ad43dd6b609bbf4ddf6d0cd0f201fe1 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 3a01cbe014..1c73572c40 100644
+index 3a01cbe01..1c73572c4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -65,7 +65,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 3a01cbe014..1c73572c40 100644
      private final ItemCooldown bY;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 7c3b9c0b97..d4d752ddb4 100644
+index 7c3b9c0b9..d4d752ddb 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 {
@@ -48,7 +48,7 @@ index 7c3b9c0b97..d4d752ddb4 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 d8ce699e3e..28f97f9b0b 100644
+index d8ce699e3..28f97f9b0 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 @@
diff --git a/Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0211-Fix-Dragon-Server-Crashes.patch
similarity index 92%
rename from Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0211-Fix-Dragon-Server-Crashes.patch
index cad9987a6..47132f779 100644
--- a/Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0211-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From e8c906ae42b88262f4e92c026b98820cc5e250f8 Mon Sep 17 00:00:00 2001
+From 04eb83fd24ed63bb6dcd8b7b2fedeec27b3a944d 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
@@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge,
 it will infinitely keep looking for non air and eventually crash.
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index cfe84f4d48..4ab310cd6b 100644
+index cfe84f4d4..4ab310cd6 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -53,7 +53,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
diff --git a/Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0212-getPlayerUniqueId-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0212-getPlayerUniqueId-API.patch
index 94c826885..cca0be87e 100644
--- a/Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0212-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 81900170c60aaebe9e350c240181afbb39606b93 Mon Sep 17 00:00:00 2001
+From b961c21fb194ba2152c5ea568c9fbf7c5d0d7f23 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 4e0d1ec0d3..26de8263dd 100644
+index 2a2b28441..e3be79bb3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1360,6 +1360,26 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0213-Make-player-data-saving-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0213-Make-player-data-saving-configurable.patch
index f2812ab75..11ddbd80c 100644
--- a/Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0213-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From 4c08907d29c45dfa8ca04220ee2eb3a23024bcd4 Mon Sep 17 00:00:00 2001
+From c7396eebae33d10868f2c5f86b76cc3c4beb066a 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 11f08c2b73..4169ec9a58 100644
+index 11f08c2b7..4169ec9a5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -270,4 +270,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 11f08c2b73..4169ec9a58 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a0254d8e51..e60e10c57d 100644
+index a0254d8e5..e60e10c57 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData {
diff --git a/Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0214-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0214-Make-legacy-ping-handler-more-reliable.patch
index 24657fdaa..b07809222 100644
--- a/Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0214-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From e13bda55e016863f9efe159833297a0a7f4adb54 Mon Sep 17 00:00:00 2001
+From 8a8df625cfb339c8912d12aa9d77e4cc123ada86 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 9ee5a1ff02..063efe9bbe 100644
+index 9ee5a1ff0..063efe9bb 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 {
diff --git a/Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0215-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 98%
rename from Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0215-Call-PaperServerListPingEvent-for-legacy-pings.patch
index aac20c0e9..2523b1727 100644
--- a/Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0215-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From 4aca7c3c2a763638adf3e61872d00bb70c36dfce Mon Sep 17 00:00:00 2001
+From 09533cdd58bffe6c96fe610ab8f9ae065b82d689 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 0000000000..74c012fd40
+index 000000000..74c012fd4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +1,73 @@
@@ -84,7 +84,7 @@ index 0000000000..74c012fd40
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 063efe9bbe..4a49fe4cc6 100644
+index 063efe9bb..4a49fe4cc 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0216-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0216-Flag-to-disable-the-channel-limit.patch
index 3daf12b04..c0e824e97 100644
--- a/Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0216-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From dc03357a8942aaa3568bd3bcea22d657b103a5bc Mon Sep 17 00:00:00 2001
+From d5db63c3b4deaadbfdc7c9eb5189ae80c840df77 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 28f97f9b0b..9ff2281c15 100644
+index 28f97f9b0..9ff2281c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0217-Add-method-to-open-already-placed-sign.patch
similarity index 92%
rename from Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0217-Add-method-to-open-already-placed-sign.patch
index f557c7071..494af9001 100644
--- a/Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0217-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From c05f9bf900cc8143ba0ddf32482e87e6b505a04b Mon Sep 17 00:00:00 2001
+From 8be1f2ad1f0f1054949bb44f75b02d542ae46142 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 e4d9300be2..6acb15043e 100644
+index e4d9300be..6acb15043 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -763,4 +763,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0218-Configurable-sprint-interruption-on-attack.patch
similarity index 93%
rename from Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0218-Configurable-sprint-interruption-on-attack.patch
index ebd016026..fcca920c9 100644
--- a/Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0218-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From ec69b4b3607d31885183b742038210348c9d7afc Mon Sep 17 00:00:00 2001
+From a847eaf752b338f703f1d08c7d91bcab5f318b0d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 94ffba97..0b6e812d 100644
+index 94ffba97b..0b6e812d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -349,4 +349,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 94ffba97..0b6e812d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1c73572c..4ff6cba6 100644
+index 1c73572c4..4ff6cba65 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1030,7 +1030,11 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0219-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 86%
rename from Spigot-Server-Patches/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0219-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 100fc1d0c..2eb098567 100644
--- a/Spigot-Server-Patches/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0219-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,14 +1,14 @@
-From 43c7f6f43a04232a14c43c800f17f260743d4378 Mon Sep 17 00:00:00 2001
+From 1dd58ac6a0b3aef0240e47811220c5a170f3a8bc 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 0a9fc4653a..7ee0a88234 100644
+index 21d42ab9d..e6b8b68f1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2522,7 +2522,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2528,7 +2528,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
diff --git a/Spigot-Server-Patches/0221-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0220-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0221-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0220-EndermanEscapeEvent.patch
index 305a64b81..5b33ec06f 100644
--- a/Spigot-Server-Patches/0221-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0220-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 1cf9ec2ad9bf5b15fb78fba68f2c1584d99cf4ef Mon Sep 17 00:00:00 2001
+From 8642239a246dccd8c5ab3af9377a3a3d431447fe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 0fb7793bdb..db351a2494 100644
+index 0fb7793bd..db351a249 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0221-Enderman.teleportRandomly.patch
similarity index 91%
rename from Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0221-Enderman.teleportRandomly.patch
index 42ef22f65..211e052bd 100644
--- a/Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0221-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From d47adfc0d1daebab680e9b7e1b14c52ddeb096b2 Mon Sep 17 00:00:00 2001
+From 46b573b157ceb2c9994bcb946552d960fb6cd84d 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()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index db351a2494..d136b07f3e 100644
+index db351a249..d136b07f3 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -190,6 +190,7 @@ public class EntityEnderman extends EntityMonster {
@@ -18,7 +18,7 @@ index db351a2494..d136b07f3e 100644
          double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D;
          double d1 = this.locY + (double) (this.random.nextInt(64) - 32);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 970efabd37..0c5f359346 100644
+index 970efabd3..0c5f35934 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
diff --git a/Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0222-Block-Enderpearl-Travel-Exploit.patch
similarity index 94%
rename from Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0222-Block-Enderpearl-Travel-Exploit.patch
index 75c4568e1..8f63ff742 100644
--- a/Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0222-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 15bbcdbb65b854e61ee1c7a96a1d4793eece540d Mon Sep 17 00:00:00 2001
+From a56701c6bf479e9b7ed07282debc18406dab7943 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
@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0b6e812d..da105500 100644
+index 0b6e812d8..da1055003 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -354,4 +354,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 0b6e812d..da105500 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 5f0cb4c3..f2f4b2d9 100644
+index 5f0cb4c33..f2f4b2d92 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -205,6 +205,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0224-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0223-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 98%
rename from Spigot-Server-Patches/0224-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0223-Expand-World.spawnParticle-API-and-add-Builder.patch
index 701da10d3..583a0f127 100644
--- a/Spigot-Server-Patches/0224-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0223-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 6ac1e8e270a7ad9de1eb93139c4f0a4da362b5a3 Mon Sep 17 00:00:00 2001
+From 821a3693cc4df4304ff5b9842c2fc1b2a47238fb 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
diff --git a/Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0224-EndermanAttackPlayerEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0224-EndermanAttackPlayerEvent.patch
index cb09e71e5..97b7cbc25 100644
--- a/Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0224-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 9d3e6458c04dfe59712729e81a5bad126c30a6e3 Mon Sep 17 00:00:00 2001
+From 91674c0167a23b2222b383801afb300402ce6b34 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index d136b07f3e..ad65200dca 100644
+index d136b07f3..ad65200dc 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -138,7 +138,15 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0225-WitchConsumePotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0225-WitchConsumePotionEvent.patch
index 922f6f590..44ddbc7bd 100644
--- a/Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0225-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From 8642105153addd151d1712e184000b267a91f16b Mon Sep 17 00:00:00 2001
+From 40f489a7bc55fbf06102f8360714b0e32f2a6aa5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index cc7b026b44..6e9d341584 100644
+index cc7b026b4..6e9d34158 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -88,7 +88,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0226-WitchThrowPotionEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0226-WitchThrowPotionEvent.patch
index 3c3e7e343..59eeedd38 100644
--- a/Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0226-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 2c48cd90874f88dec40312f4c4b2f804891227db Mon Sep 17 00:00:00 2001
+From 6eb3a390b680b6384894afbe77f421e28a3b967e 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 6e9d341584..0c641d915d 100644
+index 6e9d34158..0c641d915 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0227-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 95%
rename from Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0227-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 826391db5..3faf54bbe 100644
--- a/Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0227-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 0d65af9a1975db2ee35df680e76d1f4ace5d9bee Mon Sep 17 00:00:00 2001
+From 423beb68d535b72ed9cc78ceaad808579edcd882 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
diff --git a/Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0228-WitchReadyPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0228-WitchReadyPotionEvent.patch
index 129a9f8bf..325c68217 100644
--- a/Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0228-WitchReadyPotionEvent.patch
@@ -1,11 +1,11 @@
-From dfad001781fe947acd0822392498719bc0167250 Mon Sep 17 00:00:00 2001
+From ae421885ee7a0da3bd1423a3f077abbcf915ecb9 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 0c641d915d..d383b0ab41 100644
+index 0c641d915..d383b0ab4 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -121,7 +121,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0229-ItemStack-getMaxItemUseDuration.patch
similarity index 91%
rename from Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0229-ItemStack-getMaxItemUseDuration.patch
index 2a50f0a93..00bc87e4e 100644
--- a/Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0229-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From d3828a5bc616aec9126c60faad9deecf4c37d5b5 Mon Sep 17 00:00:00 2001
+From 3920bea85b2955becc157a606af909fee4e75b62 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 09d0de48e8..90c7182554 100644
+index 09d0de48e..90c718255 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -545,6 +545,7 @@ public final class ItemStack {
@@ -18,7 +18,7 @@ index 09d0de48e8..90c7182554 100644
          return this.getItem().f_(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 6e018396e6..bd85d9ec49 100644
+index c45fe35e0..e6aac0cff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack {
diff --git a/Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0230-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0230-Implement-EntityTeleportEndGatewayEvent.patch
index 29ba12e84..c937c961b 100644
--- a/Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0230-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,11 +1,11 @@
-From f973058e7aea93b92fc6f60795f1ac00bf55ec5f Mon Sep 17 00:00:00 2001
+From 235f79947e3a2b578b579d5907788a48f918bad7 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 1783f59140..e28461f18a 100644
+index 1783f5914..e28461f18 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -144,8 +144,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0231-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 93%
rename from Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0231-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index aab934057..eb875729c 100644
--- a/Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0231-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 7ce33fe3f489a1a853b2952822d72287ed920e85 Mon Sep 17 00:00:00 2001
+From 5df19965bdf97ee2eff64c257742e3437fed1e04 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 8f5f97a223..6be155edc7 100644
+index 8f5f97a22..6be155edc 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 {
diff --git a/Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0232-Fix-CraftEntity-hashCode.patch
similarity index 94%
rename from Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0232-Fix-CraftEntity-hashCode.patch
index 5efe44f04..8987286f8 100644
--- a/Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0232-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 99807033d0da819bc2879859945fc415e30c760a Mon Sep 17 00:00:00 2001
+From f9a05ebd2db189dede6cbe67b9690d330218d01b 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 b000bc8c71..1cd3448e57 100644
+index b000bc8c7..1cd3448e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -720,14 +720,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0233-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0233-Configurable-Alternative-LootPool-Luck-Formula.patch
index 24047e87d..560ce958a 100644
--- a/Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0233-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From 97cf8b21984196a1757626fed942ba2fb869343d Mon Sep 17 00:00:00 2001
+From b16cf91d853e7cd69b578cdf65c4a60073480ae5 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 4169ec9a58..eeef7d330b 100644
+index 4169ec9a5..eeef7d330 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -279,4 +279,12 @@ public class PaperConfig {
@@ -53,7 +53,7 @@ index 4169ec9a58..eeef7d330b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java
-index 1016325bd7..2c979e0b74 100644
+index 1016325bd..2c979e0b7 100644
 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java
 @@ -13,8 +13,8 @@ import org.apache.commons.lang3.ArrayUtils;
diff --git a/Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0234-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 89%
rename from Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0234-Print-Error-details-when-failing-to-save-player-data.patch
index 9adbd9680..040fee5d1 100644
--- a/Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0234-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,11 +1,11 @@
-From 012af648516b3cc090e997ed68abcd12306f21da Mon Sep 17 00:00:00 2001
+From 3d5e9f9a3ade9697c78e454eb9c018166ad1471a 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 e60e10c57d..350ac42d6b 100644
+index e60e10c57..350ac42d6 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -151,7 +151,7 @@ public class WorldNBTStorage implements IPlayerFileData {
diff --git a/Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0235-Make-shield-blocking-delay-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0235-Make-shield-blocking-delay-configurable.patch
index 73dff6062..9662505ae 100644
--- a/Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0235-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From 15cc3fe7111bbbb9164ccaa54d99e98420353c27 Mon Sep 17 00:00:00 2001
+From 0822a6c42dfd9fc49ba0f1356fcc88a39c69e8c0 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index da105500..182ac2e7 100644
+index da1055003..182ac2e7f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -360,4 +360,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index da105500..182ac2e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1157a9eb..d4c38ae4 100644
+index 1157a9eb6..d4c38ae46 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2921,7 +2921,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,7 +48,7 @@ index 1157a9eb..d4c38ae4 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 42cc1588..513b3fac 100644
+index 42cc15882..513b3fac7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -619,5 +619,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0236-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 93%
rename from Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0236-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index da60c968d..7ee8b35c7 100644
--- a/Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0236-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From 4fddbea79f4a3005b50fb33bcedfcc1325ba8151 Mon Sep 17 00:00:00 2001
+From 4e0ec3705a7a3096cd1ff04b9119d483b1020252 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
 This code was causing NPE's in saving player data, potentially related to reloads.
 
 diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java
-index 121e1fd538..0e66bdda8c 100644
+index 121e1fd53..0e66bdda8 100644
 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java
 +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
 @@ -79,6 +79,10 @@ public class RecipeBookServer extends RecipeBook {
diff --git a/Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0237-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 97%
rename from Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0237-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 6d3cba044..eeede5f5d 100644
--- a/Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0237-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From afc3ee4482452f13a70513d86722ef37f88fe289 Mon Sep 17 00:00:00 2001
+From b26356d09a1ca94c751ffd7410b5147aa3ee47fa 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 fd649020c1..2331ec2750 100644
+index fd649020c..2331ec275 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index fd649020c1..2331ec2750 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 19a25023d9..8d5864975b 100644
+index 19a25023d..8d5864975 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon {
@@ -59,7 +59,7 @@ index 19a25023d9..8d5864975b 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 5aab02afd2..0a926db89e 100644
+index 5aab02afd..0a926db89 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
 @@ -220,7 +220,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -72,7 +72,7 @@ index 5aab02afd2..0a926db89e 100644
                  event.getProjectile().remove();
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index aedff6fcfd..9de01e6041 100644
+index aedff6fcf..9de01e604 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -50,6 +50,7 @@ import net.minecraft.server.GeneratorAccess;
diff --git a/Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0238-PlayerReadyArrowEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0238-PlayerReadyArrowEvent.patch
index e2ee41923..bf5499eca 100644
--- a/Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0238-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From adafb2ca931c6803440f62978075333ce2224e83 Mon Sep 17 00:00:00 2001
+From da1c53c88ec4787ec6d988e6b1a827b4f1544513 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/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4ff6cba65e..ed1ba110c2 100644
+index 4ff6cba65..ed1ba110c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2033,6 +2033,17 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0239-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 93%
rename from Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0239-Fire-EntityShootBowEvent-for-Illusioner.patch
index 49232e3bb..b7a17ca8e 100644
--- a/Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0239-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,11 +1,11 @@
-From e4acd3e1a5eaaa8826b995479981136e151c5c6b Mon Sep 17 00:00:00 2001
+From 61b851869389d066b59ca200e7c455ba39ad74ec 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 4e0e6caa16..76641682b1 100644
+index 4e0e6caa1..76641682b 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -138,8 +138,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
diff --git a/Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0240-Implement-EntityKnockbackByEntityEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0240-Implement-EntityKnockbackByEntityEvent.patch
index a0722dfa2..16cca8e4b 100644
--- a/Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0240-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From f9b162cead2d1ebc2406f33152f6719e7c9efa44 Mon Sep 17 00:00:00 2001
+From a794ca942487bbdd8cb5cfab5d54f365cb0419d5 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 d4c38ae462..ca266029e4 100644
+index d4c38ae46..ca266029e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1430,6 +1430,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0242-Expand-Explosions-API.patch b/Spigot-Server-Patches/0241-Expand-Explosions-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0242-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0241-Expand-Explosions-API.patch
index 5cc1ab7d6..0187becb1 100644
--- a/Spigot-Server-Patches/0242-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0241-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From e412cb2cc32d9cb28daf57854fee4ba7455abe11 Mon Sep 17 00:00:00 2001
+From af636bd2795fe74fe99827ffd6c389589cc44ab3 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
diff --git a/Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0242-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0242-LivingEntity-Hand-Raised-Item-Use-API.patch
index 8c5a8c7f8..65a6dbd50 100644
--- a/Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0242-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From b0faee85e57c0c7015285cd9537162bb4ba3d1c9 Mon Sep 17 00:00:00 2001
+From 4ea4b6672ef3e3cd1c530fb7d035b36b3d9b7319 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 ca266029e4..1500e43eee 100644
+index ca266029e..1500e43ee 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -109,7 +109,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index ca266029e4..1500e43eee 100644
          return this.isHandRaised() ? this.activeItem.k() - this.dn() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 513b3fac7f..8dea7d36b6 100644
+index 513b3fac7..8dea7d36b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -629,5 +629,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0244-RangedEntity-API.patch b/Spigot-Server-Patches/0243-RangedEntity-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0244-RangedEntity-API.patch
rename to Spigot-Server-Patches/0243-RangedEntity-API.patch
index b4dafa420..9a7dc177e 100644
--- a/Spigot-Server-Patches/0244-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0243-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From acb433946eb305f66734bb9b2626ded708a7af41 Mon Sep 17 00:00:00 2001
+From 844581798ad3011c16826077c3f5b9af223e2f81 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
@@ -8,7 +8,7 @@ and to perform an attack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 new file mode 100644
-index 0000000000..696660b089
+index 000000000..696660b08
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 @@ -0,0 +1,19 @@
@@ -32,7 +32,7 @@ index 0000000000..696660b089
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java
-index b4178ce1e8..9b79ac77db 100644
+index b4178ce1e..9b79ac77d 100644
 --- a/src/main/java/net/minecraft/server/IRangedEntity.java
 +++ b/src/main/java/net/minecraft/server/IRangedEntity.java
 @@ -2,5 +2,8 @@ package net.minecraft.server;
@@ -46,7 +46,7 @@ index b4178ce1e8..9b79ac77db 100644
 +    void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-index 2ec1af8be4..f31d3eed3a 100644
+index 2ec1af8be..f31d3eed3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 @@ -1,11 +1,12 @@
@@ -64,7 +64,7 @@ index 2ec1af8be4..f31d3eed3a 100644
      public CraftIllusioner(CraftServer server, EntityIllagerIllusioner entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 23ab78da15..3f94c5a920 100644
+index 23ab78da1..3f94c5a92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -1,5 +1,6 @@
@@ -84,7 +84,7 @@ index 23ab78da15..3f94c5a920 100644
      public CraftLlama(CraftServer server, EntityLlama entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-index b4ae898401..02df66ecfe 100644
+index b4ae89840..02df66ecf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 @@ -1,11 +1,12 @@
@@ -102,7 +102,7 @@ index b4ae898401..02df66ecfe 100644
      public CraftSkeleton(CraftServer server, EntitySkeletonAbstract entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index 27460c59e3..e482b1c9dc 100644
+index 27460c59e..e482b1c9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 @@ -1,11 +1,12 @@
@@ -120,7 +120,7 @@ index 27460c59e3..e482b1c9dc 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index 244e4dc8ec..bae107e76e 100644
+index 244e4dc8e..bae107e76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,11 +1,12 @@
@@ -138,7 +138,7 @@ index 244e4dc8ec..bae107e76e 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 38b555cc7e..03cf6136e6 100644
+index 38b555cc7..03cf6136e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0244-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 94%
rename from Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0244-Add-config-to-disable-ender-dragon-legacy-check.patch
index fd09391cf..ec361b60f 100644
--- a/Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0244-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,11 +1,11 @@
-From 8c685f678bfae7ef7f734ea87f19bec2e179032f Mon Sep 17 00:00:00 2001
+From ca98fc9d658253f352b06b68994642de3d09c7d8 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 182ac2e7..b7e819d6 100644
+index 182ac2e7f..b7e819d60 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -365,4 +365,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 182ac2e7..b7e819d6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 88a8e4ab..6700c8c6 100644
+index 88a8e4abd..6700c8c65 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -28,10 +28,10 @@ public class EnderDragonBattle {
diff --git a/Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0245-Implement-World.getEntity-UUID-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0245-Implement-World.getEntity-UUID-API.patch
index 722c50cf1..792259c61 100644
--- a/Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0245-Implement-World.getEntity-UUID-API.patch
@@ -1,4 +1,4 @@
-From 0524ed85f393f9ce12e0a0499fedf74aaf5950a2 Mon Sep 17 00:00:00 2001
+From 0be9fb479e1fd3f77a6beab186210767349dcada 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
diff --git a/Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0246-InventoryCloseEvent-Reason-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0246-InventoryCloseEvent-Reason-API.patch
index 012e9dc15..ca0933129 100644
--- a/Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0246-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 2f3f0e148171ee21582fb264b3933e65d4361165 Mon Sep 17 00:00:00 2001
+From 16c8e2016bc73e782153dc7eb1dfcc8f3cdc6376 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
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index ed1ba110c2..8b0094d1d3 100644
+index ed1ba110c..8b0094d1d 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -149,7 +149,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index ed1ba110c2..8b0094d1d3 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 18c71640f5..2ce6063221 100644
+index 18c71640f..2ce606322 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,10 +88,10 @@ index 18c71640f5..2ce6063221 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7ee0a88234..13f406f507 100644
+index e6b8b68f1..c315a5648 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2056,7 +2056,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2062,7 +2062,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
@@ -101,7 +101,7 @@ index 7ee0a88234..13f406f507 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a167843bfb..9e5cd22d7d 100644
+index a167843bf..9e5cd22d7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -402,7 +402,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index a167843bfb..9e5cd22d7d 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 74939dce3a..71e5dffb95 100644
+index 74939dce3..71e5dffb9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -990,7 +990,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index 74939dce3a..71e5dffb95 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 6acb15043e..cccc1be137 100644
+index 6acb15043..cccc1be13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -618,8 +618,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 6acb15043e..cccc1be137 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9ff2281c15..36f6766a68 100644
+index 9ff2281c1..36f6766a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -781,7 +781,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index 9ff2281c15..36f6766a68 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9de01e6041..80b0fb8c11 100644
+index 9de01e604..80b0fb8c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1259,8 +1259,19 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0247-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0247-Configurable-Bed-Search-Radius.patch
index 87a49ca41..1591eb245 100644
--- a/Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0247-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From cea94f31f82514021682c12a0969ff2efc85ea2d Mon Sep 17 00:00:00 2001
+From d463592231936386358b1faeec2ebd5f081d5cfa 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
@@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b7e819d6..fc045593 100644
+index b7e819d60..fc0455934 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -370,4 +370,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index b7e819d6..fc045593 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index c49eb0ec..35cf3c3a 100644
+index c49eb0ecb..35cf3c3ac 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -171,6 +171,10 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
diff --git a/Spigot-Server-Patches/0249-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0248-Vex-getSummoner-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0249-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0248-Vex-getSummoner-API.patch
index f7799af9e..6daacf9d8 100644
--- a/Spigot-Server-Patches/0249-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0248-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 583e1426a47e19e775c1ab3b504b9900f56e4dab Mon Sep 17 00:00:00 2001
+From c9af00734c7ba847ab2bd5a0f0cbfd4caa0b11b5 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the NPC that summoned this Vex
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index be6c173e3e..c8e81b824f 100644
+index be6c173e3..c8e81b824 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
@@ -18,7 +18,7 @@ index be6c173e3e..c8e81b824f 100644
          return this.c;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 737a37b6fe..169c951ec3 100644
+index 737a37b6f..169c951ec 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 @@
diff --git a/Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0249-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 88%
rename from Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0249-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 09128a082..fee7bcbcc 100644
--- a/Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0249-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From b7fff65fac1a15e172dd2457fd8f5bc6c2dbbcaf Mon Sep 17 00:00:00 2001
+From 060704ac791c945178d143d4d0adb1b9a03c75ed 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 13f406f507..d32f89493f 100644
+index c315a5648..72886442c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1970,6 +1970,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1976,6 +1976,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
  
                      if (event.isCancelled()) {
diff --git a/Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0250-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 88%
rename from Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0250-Don-t-change-the-Entity-Random-seed-for-squids.patch
index b5ee08019..9400e9624 100644
--- a/Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0250-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From f1ddefe1fac520a5f1c2b5909da1b3d3fcb04c99 Mon Sep 17 00:00:00 2001
+From 11bb20d0d0ea5a246851e69698c6614afbdc1a64 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index aafb7df0c8..bcea73a40b 100644
+index aafb7df0c..bcea73a40 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0251-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 92%
rename from Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0251-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 18a60a1c7..8ebd2c7d5 100644
--- a/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0251-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 3ade88ed3cd7d0e49d2f22f47a7758397d7d5575 Mon Sep 17 00:00:00 2001
+From ac81e63131a3046cdf1093e4ee2a138dfa0e8ab2 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 71e5dffb95..2e19b7342f 100644
+index 71e5dffb9..2e19b7342 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -975,7 +975,8 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0252-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 90%
rename from Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0252-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index f4b67683e..2f3514cec 100644
--- a/Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0252-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From d0945ac58e3c0c8b8e5a7e858da3d2da991e3435 Mon Sep 17 00:00:00 2001
+From f9db7abe42e9f812b40c9babce4b46c03f4f416b 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 f1f86ef8b5..6e026d34f0 100644
+index f1f86ef8b..6e026d34f 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -168,6 +168,10 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0253-Use-asynchronous-Log4j-2-loggers.patch
similarity index 96%
rename from Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0253-Use-asynchronous-Log4j-2-loggers.patch
index 25b5cee30..333753cce 100644
--- a/Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0253-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,4 +1,4 @@
-From fbe15453e7f5f1f99a66fb6dbc703a79c998d9d4 Mon Sep 17 00:00:00 2001
+From 310c12d03ea9ff7b6bcd63f78cb7ad7129080e32 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/Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0254-add-more-information-to-Entity.toString.patch
similarity index 89%
rename from Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0254-add-more-information-to-Entity.toString.patch
index 0a8839f6c..37cf2d531 100644
--- a/Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0254-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From 3d0f50c3805fb60f8b3a46079a3ffe2eb0a80929 Mon Sep 17 00:00:00 2001
+From 54c728860fb47bc3db330806dcc981134a17c8e0 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,10 +6,10 @@ 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 83b6bfeb43..bd3e610786 100644
+index 433972025..0940520fa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2491,7 +2491,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2492,7 +2492,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
diff --git a/Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0255-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 95%
rename from Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0255-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index b3bded814..00415e128 100644
--- a/Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0255-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From 59f2452fdb005f3e95616e8c3a088fde2676678e Mon Sep 17 00:00:00 2001
+From 56cff16e06f7cfae2890ce7c1ff1716b20b355ba 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 146ce3a7a..143937236 100644
+index 0940520fa..3d522b90a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -75,6 +75,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,10 +19,10 @@ index 146ce3a7a..143937236 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index c9bac0523..9aad0c6b9 100644
+index 398630bb4..6d5b34980 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -939,6 +939,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -964,6 +964,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  } else {
                      PlayerChunkMap.EntityTracker playerchunkmap_entitytracker = new PlayerChunkMap.EntityTracker(entity, i, j, entitytypes.isDeltaTracking());
  
@@ -30,7 +30,7 @@ index c9bac0523..9aad0c6b9 100644
                      this.trackedEntities.put(entity.getId(), playerchunkmap_entitytracker);
                      playerchunkmap_entitytracker.track(this.world.getPlayers());
                      if (entity instanceof EntityPlayer) {
-@@ -981,7 +982,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1006,7 +1007,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          if (playerchunkmap_entitytracker1 != null) {
              playerchunkmap_entitytracker1.a();
          }
diff --git a/Spigot-Server-Patches/0257-EnderDragon-Events.patch b/Spigot-Server-Patches/0256-EnderDragon-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0257-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0256-EnderDragon-Events.patch
index 9fe2c4aaf..c3edb44bc 100644
--- a/Spigot-Server-Patches/0257-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0256-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From c2e0cb702ebab1f5eaff4db97a24715a844a319f Mon Sep 17 00:00:00 2001
+From 9d7ab6a703362e6d3e35eebf9a1dbd4b7bb172ca 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
 
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index 4ab310cd6b..90f6d58ddd 100644
+index 4ab310cd6..90f6d58dd 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -65,7 +65,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -28,7 +28,7 @@ index 4ab310cd6b..90f6d58ddd 100644
      public void e() {
          if (this.d != null) {
 diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
-index 14e20f4961..0b0815e113 100644
+index 14e20f496..0b0815e11 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 @@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -42,7 +42,7 @@ index 14e20f4961..0b0815e113 100644
                          if (this.d != null) {
                              while (!this.d.b()) {
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index 3c2f846b5c..b6958bf789 100644
+index 3c2f846b5..b6958bf78 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -40,8 +40,10 @@ public class EntityDragonFireball extends EntityFireball {
diff --git a/Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0257-PlayerElytraBoostEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0257-PlayerElytraBoostEvent.patch
index ac74a9b02..a8f0d42bb 100644
--- a/Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0257-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From cd0f0503a69a3bb87922c0f5505e17e1d5905917 Mon Sep 17 00:00:00 2001
+From c65ba3a01ec82ad71398ffbe40d8b0ac190b79e8 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index aea46ffae5..9e86ef4ce2 100644
+index aea46ffae..9e86ef4ce 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -35,11 +35,16 @@ public class ItemFireworks extends Item {
diff --git a/Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0258-PlayerLaunchProjectileEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0258-PlayerLaunchProjectileEvent.patch
index 625dbf989..c5a77f63a 100644
--- a/Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0258-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From 0ee99f0f22afb8d7ce8ca804304d8b9fc39643cd Mon Sep 17 00:00:00 2001
+From dbcab6f65b4134d092992d61898fbb9edfe1c87f 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
-index 2bdb65bf87..f526af45fb 100644
+index 2bdb65bf8..f526af45f 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -10,17 +10,35 @@ public class ItemEgg extends Item {
@@ -46,7 +46,7 @@ index 2bdb65bf87..f526af45fb 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
-index eb5f62dec2..e8e52d726e 100644
+index eb5f62dec..e8e52d726 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -16,7 +16,19 @@ public class ItemEnderPearl extends Item {
@@ -94,7 +94,7 @@ index eb5f62dec2..e8e52d726e 100644
          entityhuman.b(StatisticList.ITEM_USED.b(this));
          return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);
 diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
-index 35f842ede5..eb626a6f05 100644
+index 35f842ede..eb626a6f0 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -9,18 +9,35 @@ public class ItemExpBottle extends Item {
@@ -136,7 +136,7 @@ index 35f842ede5..eb626a6f05 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
-index e3683bdaef..f3ad1cd6d3 100644
+index e3683bdae..f3ad1cd6d 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -9,15 +9,40 @@ public class ItemLingeringPotion extends ItemPotion {
@@ -182,7 +182,7 @@ index e3683bdaef..f3ad1cd6d3 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
-index 624989dd7b..c119785b78 100644
+index 624989dd7..c119785b7 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -23,15 +23,23 @@ public class ItemSnowball extends Item {
@@ -215,7 +215,7 @@ index 624989dd7b..c119785b78 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index e267e43fe5..fa6d627db4 100644
+index e267e43fe..fa6d627db 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -9,15 +9,39 @@ public class ItemSplashPotion extends ItemPotion {
diff --git a/Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0259-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0259-Speedup-BlockPos-by-fixing-inlining.patch
index 6cea35f02..0a399e719 100644
--- a/Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0259-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 849558c0002512199abba3186085b2ae1f3e023b Mon Sep 17 00:00:00 2001
+From 100f4c3bee91ea3350a9f2a513493af2cb3bbd5b 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
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 7cb46d7a9c..e96428bb2b 100644
+index 7cb46d7a9..e96428bb2 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -101,7 +101,7 @@ index 7cb46d7a9c..e96428bb2b 100644
          return (int) (f + f1 + f2);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 2eabaaeba2..04f754d2c1 100644
+index 2eabaaeba..04f754d2c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -335,11 +335,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
diff --git a/Spigot-Server-Patches/0261-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0260-Optimize-RegistryID.c.patch
similarity index 95%
rename from Spigot-Server-Patches/0261-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0260-Optimize-RegistryID.c.patch
index 6940d978b..eaec8fcd1 100644
--- a/Spigot-Server-Patches/0261-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0260-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 22685187f21ca82ea256680bf4eba499577af155 Mon Sep 17 00:00:00 2001
+From a3daf0db66e2b991ddd0766a89afc7f4bf18d037 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()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index e15d286710..e8a48b9a4c 100644
+index e15d28671..e8a48b9a4 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry<K> {
diff --git a/Spigot-Server-Patches/0262-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0261-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 92%
rename from Spigot-Server-Patches/0262-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0261-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 9c3ce7e3e..551f48e1e 100644
--- a/Spigot-Server-Patches/0262-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0261-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From 79838a0c13d8883d5f9544a6385528015770a906 Mon Sep 17 00:00:00 2001
+From c515ea6b352d6c5f5d4b4d551e8064024956c647 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fc0455934b..09607fb447 100644
+index fc0455934..09607fb44 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -321,6 +321,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index fc0455934b..09607fb447 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 23d5555d93..0d73a53f64 100644
+index 23d5555d9..0d73a53f6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -867,6 +867,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0263-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0262-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from Spigot-Server-Patches/0263-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0262-Vanished-players-don-t-have-rights.patch
index 91d4737b6..66074b3f7 100644
--- a/Spigot-Server-Patches/0263-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0262-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 7da024164eba85d84edca7af7b11e3c5720b39d8 Mon Sep 17 00:00:00 2001
+From eb42a367a8195dd80412dec332d66590a8e170c1 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 143937236..03e7517b4 100644
+index 3d522b90a..c73274ece 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0264-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0263-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 89%
rename from Spigot-Server-Patches/0264-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0263-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index 8148b835c..0e2015ffc 100644
--- a/Spigot-Server-Patches/0264-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0263-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 8c46a9caa0ab41ce3d97389a8510bdf636b65846 Mon Sep 17 00:00:00 2001
+From 859d51d3d71fd48790317f5528cddd05dcf33b74 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index cacef3ac9f..10381fe95d 100644
+index cacef3ac9..10381fe95 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -416,6 +416,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0265-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0264-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 95%
rename from Spigot-Server-Patches/0265-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0264-Add-some-Debug-to-Chunk-Entity-slices.patch
index cf2d17731..4e78eca30 100644
--- a/Spigot-Server-Patches/0265-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0264-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 910c86e5b07b13599b91e3bca94c1aec6eddab0e Mon Sep 17 00:00:00 2001
+From 20cddda6aaba71df69418fd2487a65a4bff219cb 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 10381fe95d..ebc00f355e 100644
+index 10381fe95..ebc00f355 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -408,6 +408,25 @@ public class Chunk implements IChunkAccess {
@@ -57,7 +57,7 @@ index 10381fe95d..ebc00f355e 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8bc3e0464d..e1cd5e72a5 100644
+index c73274ece..75638e89e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0266-EntityTransformedEvent.patch b/Spigot-Server-Patches/0265-EntityTransformedEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0266-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0265-EntityTransformedEvent.patch
index 611958900..aa051c1fd 100644
--- a/Spigot-Server-Patches/0266-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0265-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From 6dda64d42044db4abc7f9934dd4ef25658307e63 Mon Sep 17 00:00:00 2001
+From ad89e7a292561972e373f0a1d3c0b603e39ce75d 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 89e2bde040..d1059355ad 100644
+index 89e2bde04..d1059355a 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -110,6 +110,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index 89e2bde040..d1059355ad 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 9311cc5bd6..07f7b90f58 100644
+index 9311cc5bd..07f7b90f5 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -636,6 +636,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -29,7 +29,7 @@ index 9311cc5bd6..07f7b90f58 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 19eb72909a..5d93af5857 100644
+index 19eb72909..5d93af585 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -248,6 +248,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index 19eb72909a..5d93af5857 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 042ee18cb1..4d475d9633 100644
+index 042ee18cb..4d475d963 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -157,6 +157,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
diff --git a/Spigot-Server-Patches/0267-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0266-SkeletonHorse-Additions.patch
similarity index 94%
rename from Spigot-Server-Patches/0267-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0266-SkeletonHorse-Additions.patch
index 754b9e996..d49bf8d02 100644
--- a/Spigot-Server-Patches/0267-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0266-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From e823ee4eb0c1a3edf6d9fd5ef6f9f5c82becc9e1 Mon Sep 17 00:00:00 2001
+From f42cd04f200f83daab216ea19c1685d7a5745cc0 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index c9f0973031..d281195834 100644
+index c9f097303..d28119583 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -31,7 +31,7 @@ index c9f0973031..d281195834 100644
          if (flag != this.bJ) {
              this.bJ = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index 7b0a6f82fb..f093744136 100644
+index 7b0a6f82f..f09374413 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index 7b0a6f82fb..f093744136 100644
  
          this.a.r(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c2200d..2a7d1d4ec2 100644
+index e822c2200..2a7d1d4ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
diff --git a/Spigot-Server-Patches/0268-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0267-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0268-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0267-Prevent-Saving-Bad-entities-to-chunks.patch
index 549f21bd5..498442bcd 100644
--- a/Spigot-Server-Patches/0268-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0267-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From 44289d020a881a6a2b76a38030761ea5a1bb1bc3 Mon Sep 17 00:00:00 2001
+From d96de2dba63e8403fab3d6c2c30587a83723f6eb 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
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ad3ade3c5c..cf33965082 100644
+index ad3ade3c5..cf3396508 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -319,6 +319,7 @@ public class ChunkRegionLoader {
diff --git a/Spigot-Server-Patches/0269-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0268-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 98%
rename from Spigot-Server-Patches/0269-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0268-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 6717123a4..8eb9af48b 100644
--- a/Spigot-Server-Patches/0269-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0268-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 4d55f72df3fe8a0a5913e06f9fbf283619937337 Mon Sep 17 00:00:00 2001
+From 313e554690065c3bd478096515c499cbbca6a659 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
diff --git a/Spigot-Server-Patches/0270-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0269-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 98%
rename from Spigot-Server-Patches/0270-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0269-Ignore-Dead-Entities-in-entityList-iteration.patch
index c56713d26..e6536b060 100644
--- a/Spigot-Server-Patches/0270-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0269-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 1ed9bb0810d6f8fc681bad0e77ee399321fa9cee Mon Sep 17 00:00:00 2001
+From 77fe6440818608c6e17a70c5301e14629eaf2b9f 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
@@ -51,7 +51,7 @@ index ebc00f355..099f0ad78 100644
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 76e989105..6064d414e 100644
+index 75638e89e..8328b8e08 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0271-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0270-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 98%
rename from Spigot-Server-Patches/0271-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0270-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index f15d1e80d..4b9c6f82a 100644
--- a/Spigot-Server-Patches/0271-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0270-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From 1064dde4abf521b20e6a6209bc173850f0e85d44 Mon Sep 17 00:00:00 2001
+From d9c193166979cfb4e6c68cc6944cc5ec2494c1f0 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 eeef7d330b..dfdc7c384d 100644
+index eeef7d330..dfdc7c384 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;
@@ -59,7 +59,7 @@ index eeef7d330b..dfdc7c384d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 21b3b06f53..8718811655 100644
+index 21b3b06f5..871881165 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -10,13 +10,41 @@ import java.io.IOException;
@@ -163,7 +163,7 @@ index 21b3b06f53..8718811655 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 350ac42d6b..eaae446861 100644
+index 350ac42d6..eaae44686 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -31,6 +31,58 @@ public class WorldNBTStorage implements IPlayerFileData {
diff --git a/Spigot-Server-Patches/0272-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0271-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 91%
rename from Spigot-Server-Patches/0272-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0271-MC-111480-Start-Entity-ID-s-at-1.patch
index 86420446f..75fa56b54 100644
--- a/Spigot-Server-Patches/0272-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0271-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 0124be370577db0ef70727ec3693451e04125433 Mon Sep 17 00:00:00 2001
+From c2525f012bd43e0ee24318fae3ce49ccb3377074 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 b02b084556..c32ed855bd 100644
+index 8328b8e08..2cbc4af68 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
diff --git a/Spigot-Server-Patches/0273-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0272-Implement-Expanded-ArmorStand-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0273-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0272-Implement-Expanded-ArmorStand-API.patch
index a1a4be01b..8f6b873b8 100644
--- a/Spigot-Server-Patches/0273-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0272-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From ebbfa162412e2f440bbb15d847a96a8883787b38 Mon Sep 17 00:00:00 2001
+From 314d957ac5db0f44d6ed43ce8aa472b79ed67737 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
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 62a878d13d..25afd95542 100644
+index 62a878d13..25afd9554 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index 62a878d13d..25afd95542 100644
          return (this.bE & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185bc..9f5c3b92e3 100644
+index 124c3185b..9f5c3b92e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0274-AnvilDamageEvent.patch b/Spigot-Server-Patches/0273-AnvilDamageEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0274-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0273-AnvilDamageEvent.patch
index 08fb3f6ad..4190947f9 100644
--- a/Spigot-Server-Patches/0274-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0273-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From fd7190989ea36cd191deab66a2d11da05dc1bb9a Mon Sep 17 00:00:00 2001
+From 3598209772201fa9922274d7ff7447690b6fda77 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 88e706f077..abdcd52c46 100644
+index 88e706f07..abdcd52c4 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container {
diff --git a/Spigot-Server-Patches/0275-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0274-Add-TNTPrimeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0275-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0274-Add-TNTPrimeEvent.patch
index a8d8e848e..9d84fb483 100644
--- a/Spigot-Server-Patches/0275-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0274-Add-TNTPrimeEvent.patch
@@ -1,11 +1,11 @@
-From 25463ea486a70596f9d40438db8fc112b7c5615b Mon Sep 17 00:00:00 2001
+From 802011776a7c01313eac48f14c3d9794e1772192 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 49e3d7284b..71357b73fa 100644
+index 49e3d7284..71357b73f 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -39,7 +39,7 @@ index 49e3d7284b..71357b73fa 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 013fa35241..f717ac87c4 100644
+index 013fa3524..f717ac87c 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -1,6 +1,7 @@
@@ -114,7 +114,7 @@ index 013fa35241..f717ac87c4 100644
                  world.a(blockposition, false);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index f015c023e2..8dc849ca14 100644
+index f015c023e..8dc849ca1 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
diff --git a/Spigot-Server-Patches/0276-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0275-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0276-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0275-Break-up-and-make-tab-spam-limits-configurable.patch
index 3465becb5..997d0e976 100644
--- a/Spigot-Server-Patches/0276-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0275-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From 5610410edd6a8b3ffeb7f570499968b748abd107 Mon Sep 17 00:00:00 2001
+From 7ed00c19884964a7c6bd2d81d221631ca0b5b799 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 dfdc7c384d..207e5d3e23 100644
+index dfdc7c384..207e5d3e2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -311,4 +311,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index dfdc7c384d..207e5d3e23 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d32f89493f..c43b1aca1e 100644
+index 72886442c..7770ed312 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 {
diff --git a/Spigot-Server-Patches/0277-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0276-Add-hand-to-bucket-events.patch
similarity index 94%
rename from Spigot-Server-Patches/0277-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0276-Add-hand-to-bucket-events.patch
index 533b096e9..546b40e1d 100644
--- a/Spigot-Server-Patches/0277-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0276-Add-hand-to-bucket-events.patch
@@ -1,11 +1,11 @@
-From c96126417eb762b23d3f5ecdb60587f87b70002c Mon Sep 17 00:00:00 2001
+From 5f5029baefafc33392090e676d082468f9309a03 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 a17738f9ff..d2c2e3cc33 100644
+index a17738f9f..d2c2e3cc3 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -62,7 +62,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index a17738f9ff..d2c2e3cc33 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 cb28914118..5dc967f8ba 100644
+index dd9308193..72040275b 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -39,7 +39,7 @@ public class ItemBucket extends Item {
@@ -29,8 +29,8 @@ index cb28914118..5dc967f8ba 100644
 +                        PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, blockposition.getX(), blockposition.getY(), blockposition.getZ(), null, itemstack, dummyFluid.b(), enumhand); // Paper - add enumHand
  
                          if (event.isCancelled()) {
-                             ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
-@@ -66,7 +66,7 @@ public class ItemBucket extends Item {
+                             ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-5163 (see PlayerInteractManager)
+@@ -67,7 +67,7 @@ public class ItemBucket extends Item {
                      iblockdata = world.getType(blockposition);
                      BlockPosition blockposition1 = iblockdata.getBlock() instanceof IFluidContainer && this.fluidType == FluidTypes.WATER ? blockposition : movingobjectpositionblock.getBlockPosition().shift(movingobjectpositionblock.getDirection());
  
@@ -39,7 +39,7 @@ index cb28914118..5dc967f8ba 100644
                          this.a(world, itemstack, blockposition1);
                          if (entityhuman instanceof EntityPlayer) {
                              CriterionTriggers.y.a((EntityPlayer) entityhuman, blockposition1, itemstack);
-@@ -116,6 +116,12 @@ public class ItemBucket extends Item {
+@@ -117,6 +117,12 @@ public class ItemBucket extends Item {
      }
  
      public boolean a(EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock, EnumDirection enumdirection, BlockPosition clicked, ItemStack itemstack) {
@@ -52,7 +52,7 @@ index cb28914118..5dc967f8ba 100644
          // CraftBukkit end
          if (!(this.fluidType instanceof FluidTypeFlowing)) {
              return false;
-@@ -126,11 +132,11 @@ public class ItemBucket extends Item {
+@@ -127,11 +133,11 @@ public class ItemBucket extends Item {
              boolean flag1 = material.isReplaceable();
  
              if (!world.isEmpty(blockposition) && !flag && !flag1 && (!(iblockdata.getBlock() instanceof IFluidContainer) || !((IFluidContainer) iblockdata.getBlock()).canPlace(world, blockposition, iblockdata, this.fluidType))) {
@@ -67,7 +67,7 @@ index cb28914118..5dc967f8ba 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 dd25a8ad29..c9185a1986 100644
+index dd25a8ad2..c9185a198 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -360,6 +360,20 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0278-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0277-MC-135506-Experience-should-save-as-Integers.patch
similarity index 92%
rename from Spigot-Server-Patches/0278-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0277-MC-135506-Experience-should-save-as-Integers.patch
index ebb016667..11d3945d2 100644
--- a/Spigot-Server-Patches/0278-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0277-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From ee4b0150bc52de4dc2872f2c7efc012ca55af1fc Mon Sep 17 00:00:00 2001
+From 319eb95cd2e90d240b5dbeca0c57d1ebb479767d 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 6a5954889e..1a98442e08 100644
+index 6a5954889..1a98442e0 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -204,7 +204,7 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0279-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0278-Fix-client-rendering-skulls-from-same-user.patch
similarity index 96%
rename from Spigot-Server-Patches/0279-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0278-Fix-client-rendering-skulls-from-same-user.patch
index 69b8d04f9..112819faa 100644
--- a/Spigot-Server-Patches/0279-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0278-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 142a1ff6a8a71d094da726acf6cf83c3f034b490 Mon Sep 17 00:00:00 2001
+From 504e263e0da175161bd698dccc9ad55bcd1df1f0 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 90c7182554..b9c5af51f5 100644
+index 90c718255..b9c5af51f 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -54,7 +54,7 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index 90c7182554..b9c5af51f5 100644
      private EntityItemFrame i;
      private ShapeDetectorBlock j;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 0d67676f7d..fa2d3ce8cb 100644
+index 0d67676f7..fa2d3ce8c 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf {
@@ -62,7 +62,7 @@ index 0d67676f7d..fa2d3ce8cb 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 363ab5da12..d19a30ad87 100644
+index 363ab5da1..d19a30ad8 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -51,6 +51,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -74,7 +74,7 @@ index 363ab5da12..d19a30ad87 100644
                  this.f.add(nbttagcompound);
              }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 177cceb77f..0882d82cef 100644
+index 177cceb77..0882d82ce 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
diff --git a/Spigot-Server-Patches/0280-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0279-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 97%
rename from Spigot-Server-Patches/0280-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0279-Add-Early-Warning-Feature-to-WatchDog.patch
index 3ef2a85b9..3b57b8247 100644
--- a/Spigot-Server-Patches/0280-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0279-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From f9e21fd4b2937c80e0fc254517495108d4e0425c Mon Sep 17 00:00:00 2001
+From 1a32287deb77e1cab8d651da4765dfd860f3ede7 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
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 207e5d3e23..a13c8c68b6 100644
+index 207e5d3e2..a13c8c68b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -36,7 +36,7 @@ index 207e5d3e23..a13c8c68b6 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 946803e2be..fe8647bbc6 100644
+index 946803e2b..fe8647bbc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -850,6 +850,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -48,7 +48,7 @@ index 946803e2be..fe8647bbc6 100644
                  long start = System.nanoTime(), curTime, 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 26de8263dd..e7ac058fc7 100644
+index e3be79bb3..27e4e5420 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -757,6 +757,7 @@ public final class CraftServer implements Server {
@@ -68,7 +68,7 @@ index 26de8263dd..e7ac058fc7 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6c5430ff94..4b8581f0ed 100644
+index 6c5430ff9..4b8581f0e 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -225,7 +225,7 @@ public class SpigotConfig
@@ -81,7 +81,7 @@ index 6c5430ff94..4b8581f0ed 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 9532aada82..a1d93200e6 100644
+index 9532aada8..a1d93200e 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;
diff --git a/Spigot-Server-Patches/0281-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0280-Make-EnderDragon-implement-Mob.patch
similarity index 93%
rename from Spigot-Server-Patches/0281-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0280-Make-EnderDragon-implement-Mob.patch
index 3bea42b5f..e204bb186 100644
--- a/Spigot-Server-Patches/0281-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0280-Make-EnderDragon-implement-Mob.patch
@@ -1,11 +1,11 @@
-From 0abb7e37dea94ffcb4dc3160c2052b1d2245294f Mon Sep 17 00:00:00 2001
+From 3cf3f1cc464ce96a8add6165928c3e6700a4620b 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index cc115cc368..4947249da2 100644
+index cc115cc36..4947249da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 @@ -1,17 +1,18 @@
diff --git a/Spigot-Server-Patches/0282-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0281-Detect-and-repair-corrupt-Region-Files.patch
similarity index 98%
rename from Spigot-Server-Patches/0282-Detect-and-repair-corrupt-Region-Files.patch
rename to Spigot-Server-Patches/0281-Detect-and-repair-corrupt-Region-Files.patch
index 3098a8b93..362a9a791 100644
--- a/Spigot-Server-Patches/0282-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0281-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From b6e215608d79136bb77b0665d15a50b063cdfb5c Mon Sep 17 00:00:00 2001
+From f6636c2dc555898f1dcfb1ea8d91b65c9c7a1f96 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 4e6288e8bb..e68f901943 100644
+index 4e6288e8b..e68f90194 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -27,13 +27,13 @@ public class RegionFile implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0283-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0282-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 97%
rename from Spigot-Server-Patches/0283-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0282-Use-ConcurrentHashMap-in-JsonList.patch
index 642865280..4bf9df1bc 100644
--- a/Spigot-Server-Patches/0283-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0282-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From fe166744007c77fbc0097a98dbc3fea50669f9c3 Mon Sep 17 00:00:00 2001
+From 7fa3516421d9d62ad415369eb24d8b79439f8d20 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
@@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 734e7ecf63..8570e38f42 100644
+index 734e7ecf6..8570e38f4 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
diff --git a/Spigot-Server-Patches/0284-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0283-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0284-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0283-Use-a-Queue-for-Queueing-Commands.patch
index 5cf3376a5..b2190d41d 100644
--- a/Spigot-Server-Patches/0284-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0283-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From 44e2e546dbb528b69323163f2d94513d457cba24 Mon Sep 17 00:00:00 2001
+From cebb8111bf66d374155ae1e9b6e7a0a8f3bc78bb 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 c093747bb2..c1473330fa 100644
+index c093747bb..c1473330f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -43,7 +43,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0285-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0284-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 95%
rename from Spigot-Server-Patches/0285-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0284-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 01b1a4839..69048db8e 100644
--- a/Spigot-Server-Patches/0285-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0284-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,4 +1,4 @@
-From 2b8ccc91520d79354325d7b34634e4a8cbdd0be4 Mon Sep 17 00:00:00 2001
+From 8367477bfaa701151be8eddfb74c52703fe4d318 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
diff --git a/Spigot-Server-Patches/0286-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0285-Allow-disabling-armour-stand-ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0286-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0285-Allow-disabling-armour-stand-ticking.patch
index d7c6c51c0..63c6c826e 100644
--- a/Spigot-Server-Patches/0286-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0285-Allow-disabling-armour-stand-ticking.patch
@@ -1,11 +1,11 @@
-From df1c89331821d93afc05a37ba065cabe2f7ca626 Mon Sep 17 00:00:00 2001
+From b09520ac7ccc210db48af204dbdd1c3e828a3fa6 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 09607fb4..5832c3e8 100644
+index 09607fb44..5832c3e86 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -386,4 +386,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 09607fb4..5832c3e8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 25afd955..19eb40db 100644
+index 25afd9554..19eb40db9 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving {
@@ -140,7 +140,7 @@ index 25afd955..19eb40db 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 1500e43e..32c51a94 100644
+index 1500e43ee..32c51a941 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2265,52 +2265,7 @@ public abstract class EntityLiving extends Entity {
@@ -256,7 +256,7 @@ index 1500e43e..32c51a94 100644
          float f2 = MathHelper.g(f - this.aK);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 9f5c3b92..07ce93f1 100644
+index 9f5c3b92e..07ce93f17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0287-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0286-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0287-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0286-Optimize-BlockPosition-helper-methods.patch
index 3f3e23e24..57a8efdd3 100644
--- a/Spigot-Server-Patches/0287-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0286-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From f9f2ff37461d6185309fcbe4f922b65a89a6e1fb Mon Sep 17 00:00:00 2001
+From f476c90add87985dab6d2f895543bf3703f4ef0f 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 04f754d2c1..16f0930404 100644
+index 04f754d2c..16f093040 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
diff --git a/Spigot-Server-Patches/0288-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0287-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 98%
rename from Spigot-Server-Patches/0288-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0287-Send-nearby-packets-from-world-player-list-not-serve.patch
index 92b4df896..294a271ec 100644
--- a/Spigot-Server-Patches/0288-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0287-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,4 +1,4 @@
-From 652f97fc6095f1d11eb32f60d833dad147766ab0 Mon Sep 17 00:00:00 2001
+From 8087359bc3385edb25ad1fe8c01ab14419d83b1f 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/Spigot-Server-Patches/0289-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0288-Restore-vanlla-default-mob-spawn-range.patch
similarity index 92%
rename from Spigot-Server-Patches/0289-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0288-Restore-vanlla-default-mob-spawn-range.patch
index 8068953ab..4afdc4332 100644
--- a/Spigot-Server-Patches/0289-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0288-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,4 +1,4 @@
-From f19f40f9b3349b9830ff55415c86b787ac1b4937 Mon Sep 17 00:00:00 2001
+From 471b25737c3f2f49767ad3f3127106c84ac10a32 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
diff --git a/Spigot-Server-Patches/0290-Optimize-Hoppers.patch b/Spigot-Server-Patches/0289-Optimize-Hoppers.patch
similarity index 98%
rename from Spigot-Server-Patches/0290-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0289-Optimize-Hoppers.patch
index f09420b0c..68b656688 100644
--- a/Spigot-Server-Patches/0290-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0289-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 16356324b8b188f5fa46736f974fafcc966edfc7 Mon Sep 17 00:00:00 2001
+From b89fe7ef9ff7c97beb5b86bd5087d1bb64f12831 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 5832c3e868..ede558d029 100644
+index 5832c3e86..ede558d02 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -355,6 +355,15 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index 5832c3e868..ede558d029 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 b9c5af51f5..ab66dbf885 100644
+index b9c5af51f..ab66dbf88 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -482,8 +482,9 @@ public final class ItemStack {
@@ -47,7 +47,7 @@ index b9c5af51f5..ab66dbf885 100644
          itemstack.d(this.C());
          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 fe8647bbc6..6c7ce47c5a 100644
+index fe8647bbc..6c7ce47c5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1127,6 +1127,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -59,7 +59,7 @@ index fe8647bbc6..6c7ce47c5a 100644
                  this.methodProfiler.a(() -> {
                      return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager());
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index c72b013868..b8ddb99fa3 100644
+index c72b01386..b8ddb99fa 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -79,7 +79,7 @@ index c72b013868..b8ddb99fa3 100644
              this.world.b(this.position, this);
              if (!this.c.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 1ba98bf736..6f6519f6c5 100644
+index 1ba98bf73..6f6519f6c 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
diff --git a/Spigot-Server-Patches/0291-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0290-Optimize-CraftBlockData-Creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0291-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0290-Optimize-CraftBlockData-Creation.patch
index 9fec310bf..ccf32bf86 100644
--- a/Spigot-Server-Patches/0291-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0290-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From 03b66274c2e2d5500d25b1987b0019e920f4a5af Mon Sep 17 00:00:00 2001
+From 970a2b324d274fe318390cddb3128952d8b8d1ef 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
diff --git a/Spigot-Server-Patches/0292-Fix-MC-124320.patch b/Spigot-Server-Patches/0291-Fix-MC-124320.patch
similarity index 95%
rename from Spigot-Server-Patches/0292-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0291-Fix-MC-124320.patch
index 7d15241da..45e98d4f1 100644
--- a/Spigot-Server-Patches/0292-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0291-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From 8646aeae6d145823c1c400a2bfb873d41b836350 Mon Sep 17 00:00:00 2001
+From d1e30be6c202f30df97962059b78389dc342012d 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 c72ae7e251..d71102164e 100644
+index c72ae7e25..d71102164 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -167,6 +167,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index c72ae7e251..d71102164e 100644
          IBlockData iblockdata1 = iblockdata;
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index ad65200dca..9f2c339ae3 100644
+index ad65200dc..9f2c339ae 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0293-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0292-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0293-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0292-Slime-Pathfinder-Events.patch
index 47c2c33eb..82d4cb6d2 100644
--- a/Spigot-Server-Patches/0293-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0292-Slime-Pathfinder-Events.patch
@@ -1,11 +1,11 @@
-From 3d511e21c8df2994033d392ccf3b448bf80e3e93 Mon Sep 17 00:00:00 2001
+From 9c0934f9ff4b27356a7080c6624ebf83b23aeab0 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 039050f634..a59b66e663 100644
+index 039050f63..a59b66e66 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -3,6 +3,14 @@ package net.minecraft.server;
@@ -147,7 +147,7 @@ index 039050f634..a59b66e663 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index ce6ed6e890..6e9f1b66df 100644
+index ce6ed6e89..6e9f1b66d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime {
diff --git a/Spigot-Server-Patches/0294-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0293-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 96%
rename from Spigot-Server-Patches/0294-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0293-Configurable-speed-for-water-flowing-over-lava.patch
index 71178e455..92e20e4cc 100644
--- a/Spigot-Server-Patches/0294-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0293-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,11 +1,11 @@
-From d64163642709d3bb120d110b032b2e9ae51b924d Mon Sep 17 00:00:00 2001
+From 247d525548f562c55cedda616747b2356322b53a 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ede558d0..7e031d18 100644
+index ede558d02..7e031d18e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -396,6 +396,12 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index ede558d0..7e031d18 100644
      private void armorStandTick() {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index cccdd139..56bf0b1d 100644
+index cccdd1398..56bf0b1d8 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -70,11 +70,27 @@ public class BlockFluids extends Block implements IFluidSource {
diff --git a/Spigot-Server-Patches/0295-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0294-Optimize-RegistryMaterials.patch
similarity index 94%
rename from Spigot-Server-Patches/0295-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0294-Optimize-RegistryMaterials.patch
index af625e00c..bb70a504f 100644
--- a/Spigot-Server-Patches/0295-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0294-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From 50b263071d857e2b963dd2aad115520e7c565d41 Mon Sep 17 00:00:00 2001
+From 5d18a05c970c6f2484c7039bc2cd947d46fd4aa3 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
@@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap
 BiMap.get was seen to be using a good bit of CPU time.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
-index f291e05b26..fed38e6ef0 100644
+index f291e05b2..fed38e6ef 100644
 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java
 +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
 @@ -16,9 +16,9 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/0296-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0295-Add-PhantomPreSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0296-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0295-Add-PhantomPreSpawnEvent.patch
index 05349749f..b4cd7e65e 100644
--- a/Spigot-Server-Patches/0296-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0295-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From ef3e2ff988268e420a2359e8149ea9b16dcfb980 Mon Sep 17 00:00:00 2001
+From 068b0e5a20cefc87f9c20b39cdbaaa314eccd2f7 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 3554410746..b672ac5c2a 100644
+index 355441074..b672ac5c2 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -129,6 +129,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index 3554410746..b672ac5c2a 100644
  
          private final PathfinderTargetCondition b;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 9f64d81c64..1818e7c384 100644
+index 9f64d81c6..1818e7c38 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -50,8 +50,17 @@ public class MobSpawnerPhantom {
@@ -71,7 +71,7 @@ index 9f64d81c64..1818e7c384 100644
                                                  groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
                                                  worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 9f9ee92390..2b97313694 100644
+index 9f9ee9239..2b9731369 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom {
diff --git a/Spigot-Server-Patches/0297-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0296-Add-More-Creeper-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0297-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0296-Add-More-Creeper-API.patch
index d54dd056c..2dc3c9ea6 100644
--- a/Spigot-Server-Patches/0297-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0296-Add-More-Creeper-API.patch
@@ -1,11 +1,11 @@
-From a7e012e83d421fa7d693031c69b1e8f8a6d741b7 Mon Sep 17 00:00:00 2001
+From acaea9bde082e84f983cae5a24bfa96d8b17c16f 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 6be155edc7..fd3f53e90d 100644
+index 6be155edc..fd3f53e90 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster {
@@ -38,7 +38,7 @@ index 6be155edc7..fd3f53e90d 100644
  
      public boolean canCauseHeadDrop() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index 896405148c..075a5e77e2 100644
+index 896405148..075a5e77e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 @@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper {
diff --git a/Spigot-Server-Patches/0298-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0297-Inventory-removeItemAnySlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0298-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0297-Inventory-removeItemAnySlot.patch
index 6a302928b..659c793ac 100644
--- a/Spigot-Server-Patches/0298-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0297-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From 9c2d39502de7068ac6fd155480fb9bade8afc6ab Mon Sep 17 00:00:00 2001
+From 89dc5bf95d25c99a6464c90e6053e205d2830fc4 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 0d637e207e..026a0c3995 100644
+index 0d637e207..026a0c399 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
diff --git a/Spigot-Server-Patches/0299-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0298-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 94%
rename from Spigot-Server-Patches/0299-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0298-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index e26f16074..db696dc43 100644
--- a/Spigot-Server-Patches/0299-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0298-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From f9d4e949ba93f156a7e6f71172d886fa7313c3ff Mon Sep 17 00:00:00 2001
+From cb52db2f60e178aa80ff344bddb6e9a0fbf26e50 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/0300-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0299-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0300-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0299-Add-ray-tracing-methods-to-LivingEntity.patch
index fb3e441b4..564a8b79d 100644
--- a/Spigot-Server-Patches/0300-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0299-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From ed12379a9b43f11c8a4b4f3d435858a716ba8674 Mon Sep 17 00:00:00 2001
+From 30fa4e6dae597a418fae1572c9a116cf5eb6ab3a 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 32c51a941b..c80278ede0 100644
+index 32c51a941..c80278ede 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3176,6 +3176,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,7 +33,7 @@ index 32c51a941b..c80278ede0 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8dea7d36b6..d5c4115a85 100644
+index 8dea7d36b..d5c4115a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -182,6 +182,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0301-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0300-Expose-attack-cooldown-methods-for-Player.patch
similarity index 93%
rename from Spigot-Server-Patches/0301-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0300-Expose-attack-cooldown-methods-for-Player.patch
index 7ebf25409..f32069980 100644
--- a/Spigot-Server-Patches/0301-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0300-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From 8089c8fd02dc786187e8393c6f76982d8de394b7 Mon Sep 17 00:00:00 2001
+From 23033f036bd6b50d4c5ed79de4b4271435ac94ff 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/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 8b0094d1d3..e003f1c20c 100644
+index 8b0094d1d..e003f1c20 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2004,14 +2004,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index 8b0094d1d3..e003f1c20c 100644
          this.aD = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 36f6766a68..672f92f85a 100644
+index 36f6766a6..672f92f85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1929,6 +1929,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0302-Improve-death-events.patch b/Spigot-Server-Patches/0301-Improve-death-events.patch
similarity index 97%
rename from Spigot-Server-Patches/0302-Improve-death-events.patch
rename to Spigot-Server-Patches/0301-Improve-death-events.patch
index 1fa7f3af0..8e33d2b3a 100644
--- a/Spigot-Server-Patches/0302-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0301-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From a024b1b6e53151854d4e0f8e687e944023796f4b Mon Sep 17 00:00:00 2001
+From e68d83128e8ab53bb88e726f4fa4e817b8bb3799 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
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 84c3ea9d00..f563a7b630 100644
+index 84c3ea9d0..f563a7b63 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,10 +27,10 @@ index 84c3ea9d00..f563a7b630 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 c32ed855bd..a92489e62a 100644
+index 2cbc4af68..cbc0aea04 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1516,6 +1516,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1517,6 +1517,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -38,7 +38,7 @@ index c32ed855bd..a92489e62a 100644
      public void a(Entity entity, int i, DamageSource damagesource) {
          if (entity instanceof EntityPlayer) {
              CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
-@@ -2409,6 +2410,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2410,6 +2411,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fallDistance = 0.0F;
      }
  
@@ -47,7 +47,7 @@ index c32ed855bd..a92489e62a 100644
  
      protected void i(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 19eb40db93..ac56217227 100644
+index 19eb40db9..ac5621722 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -676,7 +676,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 19eb40db93..ac56217227 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 301659d9bf..f9ba3b8561 100644
+index 301659d9b..f9ba3b856 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index 301659d9bf..f9ba3b8561 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c80278ede0..86d3c516ba 100644
+index c80278ede..86d3c516b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity {
@@ -233,7 +233,7 @@ index c80278ede0..86d3c516ba 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2ce6063221..418a2cf0f4 100644
+index 2ce606322..418a2cf0f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -284,7 +284,7 @@ index 2ce6063221..418a2cf0f4 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 73cb64e09d..9f317ff2e8 100644
+index 73cb64e09..9f317ff2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -806,6 +806,22 @@ public enum CraftSound {
@@ -311,7 +311,7 @@ index 73cb64e09d..9f317ff2e8 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 672f92f85a..3dd0ae0ca8 100644
+index 672f92f85..3dd0ae0ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1722,7 +1722,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -332,7 +332,7 @@ index 672f92f85a..3dd0ae0ca8 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c9185a1986..71b48d4180 100644
+index c9185a198..71b48d418 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -736,9 +736,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0303-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0302-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 91%
rename from Spigot-Server-Patches/0303-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0302-Allow-chests-to-be-placed-with-NBT-data.patch
index 292b9cae7..aa230fa08 100644
--- a/Spigot-Server-Patches/0303-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0302-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From b3e4caf15cf2cb3f77a1ef4eea473ab3d621a9bb Mon Sep 17 00:00:00 2001
+From 76a4dbe761d3792c907711e803acd092cf9e2231 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/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ab66dbf885..03236cf980 100644
+index ab66dbf88..03236cf98 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -235,6 +235,7 @@ public final class ItemStack {
@@ -17,7 +17,7 @@ index ab66dbf885..03236cf980 100644
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 85b450c054..efc153de5f 100644
+index 85b450c05..efc153de5 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -309,7 +309,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
diff --git a/Spigot-Server-Patches/0304-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0303-Mob-Pathfinding-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0304-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0303-Mob-Pathfinding-API.patch
index 1bbb0b173..0e0460e7c 100644
--- a/Spigot-Server-Patches/0304-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0303-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 6302a7b67731add44519ff2aa3e813eb334eeb22 Mon Sep 17 00:00:00 2001
+From 089c7ece5af8f77414f097fa94af160aea2985d2 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
@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 0000000000..f68a07cb96
+index 000000000..f68a07cb9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,111 @@
@@ -123,7 +123,7 @@ index 0000000000..f68a07cb96
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 65b38d75b4..d8da790aec 100644
+index 65b38d75b..d8da790ae 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -67,7 +67,7 @@ public abstract class NavigationAbstract {
@@ -170,7 +170,7 @@ index 65b38d75b4..d8da790aec 100644
          this.c = null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index f1d94420c8..5fdb601801 100644
+index f1d94420c..5fdb60180 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
 @@ -5,11 +5,12 @@ import javax.annotation.Nullable;
@@ -208,7 +208,7 @@ index f1d94420c8..5fdb601801 100644
  
          return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
-index 955152ef4e..4e2cef8f67 100644
+index 955152ef4..4e2cef8f6 100644
 --- a/src/main/java/net/minecraft/server/PathPoint.java
 +++ b/src/main/java/net/minecraft/server/PathPoint.java
 @@ -2,9 +2,9 @@ package net.minecraft.server;
@@ -225,7 +225,7 @@ index 955152ef4e..4e2cef8f67 100644
      public int d = -1;
      public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06fa..53c2d154ed 100644
+index 5bf1cd06f..53c2d154e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
diff --git a/Spigot-Server-Patches/0305-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0304-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 97%
rename from Spigot-Server-Patches/0305-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0304-Prevent-chunk-loading-from-Fluid-Flowing.patch
index b3c1db056..67ee966cd 100644
--- a/Spigot-Server-Patches/0305-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0304-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From fb1fefb43d1421a2f13c106310cb808e643a011f Mon Sep 17 00:00:00 2001
+From 6570db6269c26530b424a15fd0cd97a4ea91a041 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 46cacf970c..fa1cec0dac 100644
+index 46cacf970..fa1cec0da 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType {
diff --git a/Spigot-Server-Patches/0306-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0305-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0306-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0305-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 6e8079d0e..593d96cd2 100644
--- a/Spigot-Server-Patches/0306-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0305-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,4 +1,4 @@
-From 48ef82ea03b5ad262d1517540318e38c7b1c4fe5 Mon Sep 17 00:00:00 2001
+From d386ccb96d88fb404a29eed20fc7d807fcc2178a 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/0307-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0306-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0307-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0306-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 7254084e1..2520a75e6 100644
--- a/Spigot-Server-Patches/0307-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0306-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From 0426fd13dc4dcdc742494adaefc1d9358600dc41 Mon Sep 17 00:00:00 2001
+From e975addc659ae3d143a1109df2626cad04106ad3 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index 4199c154..31c44120 100644
+index 4199c154e..31c441201 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -53,7 +53,7 @@ index 4199c154..31c44120 100644
          return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index dd6a8fe3..ddbb71b1 100644
+index dd6a8fe3d..ddbb71b1a 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -99,6 +99,7 @@ public class RandomPositionGenerator {
@@ -74,5 +74,5 @@ index dd6a8fe3..ddbb71b1 100644
      }
  }
 -- 
-2.20.1
+2.22.0
 
diff --git a/Spigot-Server-Patches/0308-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0307-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0308-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0307-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 8ff660350..e6c3dc532 100644
--- a/Spigot-Server-Patches/0308-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0307-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From ea095c5bbe76c29c5f11d0d8c44e0d125d5b9b9b Mon Sep 17 00:00:00 2001
+From 03fc409fdf4f18daebe572d99e306261aaf80fad 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 4458b48ee8..09f1b9d762 100644
+index 4458b48ee..09f1b9d76 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -25,9 +25,9 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0309-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0308-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from Spigot-Server-Patches/0309-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0308-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 4f0d984f8..dbde6150b 100644
--- a/Spigot-Server-Patches/0309-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0308-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 444bad1047061baffb84f0597a9913bbf953c8b9 Mon Sep 17 00:00:00 2001
+From b094eebc506fe18833895637c589a5a1a213f87e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
 Uses an EnumMap as well as a Set paired List for O(1) contains calls.
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 9a839d6540..72eb669c50 100644
+index 9a839d654..72eb669c5 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -38,7 +38,7 @@ public abstract class BiomeBase {
diff --git a/Spigot-Server-Patches/0310-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0309-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0310-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0309-Implement-furnace-cook-speed-multiplier-API.patch
index f65152794..29e48782d 100644
--- a/Spigot-Server-Patches/0310-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0309-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From df7e950ea2fbef7f6d5afbe857d261b92b7ba8c3 Mon Sep 17 00:00:00 2001
+From 06ff269f22e72c29af69f2dac6b5cd04e50d026c 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 2bbd3663a7..55b5646103 100644
+index 2bbd3663a..55b564610 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -8,6 +8,7 @@ import java.util.Map;
@@ -57,7 +57,7 @@ index 2bbd3663a7..55b5646103 100644
                          this.cookTimeTotal = this.getRecipeCookingTime();
                          this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index 9cc67915ca..1ce10ea049 100644
+index 9cc67915c..1ce10ea04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 @@ -63,4 +63,18 @@ public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T>
diff --git a/Spigot-Server-Patches/0311-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0310-Support-Overriding-World-Seeds.patch
similarity index 96%
rename from Spigot-Server-Patches/0311-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0310-Support-Overriding-World-Seeds.patch
index aff949b62..f0e1d8a0a 100644
--- a/Spigot-Server-Patches/0311-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0310-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From d029d7a61a76120f7d9e20a632d6bb6e467fea1c Mon Sep 17 00:00:00 2001
+From c2380aa3864f83641a0bcbc86c22c45fa05f39de 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
@@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
 a permanent change in that it won't go back if you remove it from paper.yml
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a13c8c68b6..ea3695b021 100644
+index a13c8c68b..ea3695b02 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@@ -59,7 +59,7 @@ index a13c8c68b6..ea3695b021 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6c7ce47c5a..ac80ec7aeb 100644
+index 6c7ce47c5..ac80ec7ae 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -362,7 +362,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -72,7 +72,7 @@ index 6c7ce47c5a..ac80ec7aeb 100644
  
              if (j == 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index cbf10c0bce..ca4c314589 100644
+index cbf10c0bc..ca4c31458 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -115,7 +115,7 @@ public class WorldData {
@@ -85,7 +85,7 @@ index cbf10c0bce..ca4c314589 100644
              String s = nbttagcompound.getString("generatorName");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e7ac058fc7..711f282663 100644
+index 27e4e5420..da8cb53ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -990,7 +990,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0312-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0311-Optimize-Server-World-Map.patch
similarity index 98%
rename from Spigot-Server-Patches/0312-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0311-Optimize-Server-World-Map.patch
index 9a02c87a4..8cd06a0e1 100644
--- a/Spigot-Server-Patches/0312-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0311-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From b33ee422117fb20f3c344778caca10d54d83ac27 Mon Sep 17 00:00:00 2001
+From 317c217bc2dc4b566973fd377647155835c901d4 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
@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 0000000000..6bb2f98b45
+index 000000000..6bb2f98b4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +1,191 @@
@@ -217,7 +217,7 @@ index 0000000000..6bb2f98b45
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ac80ec7aeb..cb630fda6e 100644
+index ac80ec7ae..cb630fda6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -78,7 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0313-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0312-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0313-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0312-PreSpawnerSpawnEvent.patch
index 7bc78fab8..00db5815c 100644
--- a/Spigot-Server-Patches/0313-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0312-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From aeb29f0e2b123d32d1a8a09033ab4ae79b48e2bb Mon Sep 17 00:00:00 2001
+From 107c8f7d3d277cb5ad6a82e8dee0d652a0878cba Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 6f5d8b0315..079099e308 100644
+index 6f5d8b031..079099e30 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -110,11 +110,11 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0314-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0313-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 93%
rename from Spigot-Server-Patches/0314-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0313-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 8771a64f6..0f3de4c53 100644
--- a/Spigot-Server-Patches/0314-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0313-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From 5b92dac6e93d978a65c020c96a3d37a8f44fa960 Mon Sep 17 00:00:00 2001
+From 3dd592030f1c2f7281bfdd39252fb74fb7f9ce29 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
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index 7f9030fa8a..9d8fc3aa96 100644
+index 7f9030fa8..9d8fc3aa9 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,10 +26,10 @@ index 7f9030fa8a..9d8fc3aa96 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 a92489e62a..97aa07398d 100644
+index cbc0aea04..5e60baf23 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1700,7 +1700,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1701,7 +1701,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.setPosition(this.locX, this.locY, this.locZ);
                      this.setYawPitch(this.yaw, this.pitch);
                      if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
@@ -39,7 +39,7 @@ index a92489e62a..97aa07398d 100644
  
                      this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 6d278a0da5..ec3732193f 100644
+index 6d278a0da..ec3732193 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -339,4 +339,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 6d278a0da5..ec3732193f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 1f26d8a022..12264c4d03 100644
+index 1f26d8a02..12264c4d0 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -57,7 +57,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 1f26d8a022..12264c4d03 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 473ec2cbde..ab6b86e4e9 100644
+index 473ec2cbd..ab6b86e4e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
 @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
diff --git a/Spigot-Server-Patches/0315-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0314-Avoid-dimension-id-collisions.patch
similarity index 91%
rename from Spigot-Server-Patches/0315-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0314-Avoid-dimension-id-collisions.patch
index 676388a23..f61220f3c 100644
--- a/Spigot-Server-Patches/0315-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0314-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From bf60989e85fb5b81d989ea8e30b9448a7cda6c57 Mon Sep 17 00:00:00 2001
+From dac39792514978b124764723c37284f751849373 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
@@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 711f282663..024623b777 100644
+index da8cb53ab..752427d91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -976,7 +976,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0316-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0315-Honor-EntityAgeable.ageLock.patch
similarity index 86%
rename from Spigot-Server-Patches/0316-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0315-Honor-EntityAgeable.ageLock.patch
index e9d4e7600..75b83f4e3 100644
--- a/Spigot-Server-Patches/0316-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0315-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From 0f65d2182aa5a637faa31bd08ed02a1f8e540ff1 Mon Sep 17 00:00:00 2001
+From fa162c3a22de7111a7496e63da0229c9be6b59be 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/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index da9740a99e..e87754ef33 100644
+index da9740a99..e87754ef3 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -85,6 +85,7 @@ public abstract class EntityAgeable extends EntityCreature {
diff --git a/Spigot-Server-Patches/0317-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0316-Configurable-connection-throttle-kick-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0317-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0316-Configurable-connection-throttle-kick-message.patch
index 557e4d1ce..5f466badb 100644
--- a/Spigot-Server-Patches/0317-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0316-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From 712e0f272c5f6f32d760f4aaf37553a52259f8ca Mon Sep 17 00:00:00 2001
+From c814c63d1ee6b04dc1fe4d01c129d42df4a38e3b 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/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ea3695b021..d2c039ea2f 100644
+index ea3695b02..d2c039ea2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -275,6 +275,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index ea3695b021..d2c039ea2f 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 07d85e5353..4b76c2d14f 100644
+index 07d85e535..4b76c2d14 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
diff --git a/Spigot-Server-Patches/0318-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0317-Hook-into-CB-plugin-rewrites.patch
similarity index 98%
rename from Spigot-Server-Patches/0318-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0317-Hook-into-CB-plugin-rewrites.patch
index 9806f10fe..ad23b0a28 100644
--- a/Spigot-Server-Patches/0318-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0317-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 51cb03cb27c37be6b2fbbe81af6980c5d7be2f8a Mon Sep 17 00:00:00 2001
+From ddaed4c3a460dba34f5375e71ae4d4fb691da21e 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
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 467b2d9385..61f1023557 100644
+index 467b2d938..61f102355 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
diff --git a/Spigot-Server-Patches/0319-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0318-Allow-setting-the-vex-s-summoner.patch
similarity index 90%
rename from Spigot-Server-Patches/0319-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0318-Allow-setting-the-vex-s-summoner.patch
index c41869d3c..6fae59a87 100644
--- a/Spigot-Server-Patches/0319-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0318-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From 8eef2b2dae669008953802ebb34974b2803d8160 Mon Sep 17 00:00:00 2001
+From 7ec5f30480086a6edc70ee4d2e2601215ac3df9e 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/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index c8e81b824f..47fceb57ee 100644
+index c8e81b824..47fceb57e 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster {
@@ -17,7 +17,7 @@ index c8e81b824f..47fceb57ee 100644
          this.c = entityinsentient;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 169c951ec3..2f7df3074f 100644
+index 169c951ec..2f7df3074 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
diff --git a/Spigot-Server-Patches/0320-Add-sun-related-API.patch b/Spigot-Server-Patches/0319-Add-sun-related-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0320-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0319-Add-sun-related-API.patch
index a306d6c15..0895ae495 100644
--- a/Spigot-Server-Patches/0320-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0319-Add-sun-related-API.patch
@@ -1,4 +1,4 @@
-From b4f22385c9fc8d2910d3edd9b448119953903eb9 Mon Sep 17 00:00:00 2001
+From 928455bc5846a2193c454e3528201567dd359d14 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
diff --git a/Spigot-Server-Patches/0321-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0320-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 93%
rename from Spigot-Server-Patches/0321-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0320-Check-Drowned-for-Villager-Aggression-Config.patch
index ae33ab8f6..8fe4b89e7 100644
--- a/Spigot-Server-Patches/0321-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0320-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,11 +1,11 @@
-From 9e8452d2b6b21489bae6c5f1706696ba7273d153 Mon Sep 17 00:00:00 2001
+From 21bab75aaa099a1c00440fb3fd2b20bce9a472dc 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/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 38e35f0813..158c05d1e1 100644
+index 38e35f081..158c05d1e 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0322-Here-s-Johnny.patch b/Spigot-Server-Patches/0321-Here-s-Johnny.patch
similarity index 92%
rename from Spigot-Server-Patches/0322-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0321-Here-s-Johnny.patch
index fc2dc6016..ae952c92f 100644
--- a/Spigot-Server-Patches/0322-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0321-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 8f4a9a3e9d84f034b12c5cc3b60d358bd0129a4f Mon Sep 17 00:00:00 2001
+From b323d63d3492490caf1a6a5dbb185e2101820f2d 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/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index daa7bf330f..44531af417 100644
+index daa7bf330..44531af41 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -18,7 +18,7 @@ index daa7bf330f..44531af417 100644
      public EntityVindicator(EntityTypes<? extends EntityVindicator> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 951d479298..5ff957ced7 100644
+index 951d47929..5ff957ced 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
diff --git a/Spigot-Server-Patches/0323-Turtle-API.patch b/Spigot-Server-Patches/0322-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0323-Turtle-API.patch
rename to Spigot-Server-Patches/0322-Turtle-API.patch
index 5a8ef9b22..e3b2c29bb 100644
--- a/Spigot-Server-Patches/0323-Turtle-API.patch
+++ b/Spigot-Server-Patches/0322-Turtle-API.patch
@@ -1,11 +1,11 @@
-From 84494fe39beeb59f4b4b3117892961e7e0c39ed0 Mon Sep 17 00:00:00 2001
+From 3c42e1033a9a7894600dda82a8dc16f34f1b1d25 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/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 013b3a1ca8..0037d13806 100644
+index 013b3a1ca..0037d1380 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -26,51 +26,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -104,7 +104,7 @@ index 013b3a1ca8..0037d13806 100644
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75ca..8edcf7af65 100644
+index 123a2c75c..8edcf7af6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -1,6 +1,8 @@
diff --git a/Spigot-Server-Patches/0324-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0323-Limit-lightning-strike-effect-distance.patch
similarity index 96%
rename from Spigot-Server-Patches/0324-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0323-Limit-lightning-strike-effect-distance.patch
index d4bc7b2d8..2cd10766c 100644
--- a/Spigot-Server-Patches/0324-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0323-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From df681b2f1c2bb8068ba9ed8336354e2c2d87c71c Mon Sep 17 00:00:00 2001
+From 4734a4a0652d6db3529bd3c88faf9c8d887df8b3 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7e031d18e0..63f313a92d 100644
+index 7e031d18e..63f313a92 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -234,6 +234,28 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index 7e031d18e0..63f313a92d 100644
      public int fixedInhabitedTime;
      private void fixedInhabitedTime() {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index 0169f261c6..da85786046 100644
+index 0169f261c..da8578604 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
@@ -69,7 +69,7 @@ index 0169f261c6..da85786046 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index cca4d97030..9a3690d664 100644
+index cca4d9703..9a3690d66 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1188,7 +1188,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0325-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0324-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 94%
rename from Spigot-Server-Patches/0325-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0324-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 5a3610e23..d7006fb8c 100644
--- a/Spigot-Server-Patches/0325-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0324-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From 851901b51da6b3e33d8626cd5f50a591f67ea212 Mon Sep 17 00:00:00 2001
+From 52b8ab25eb4b1b71de7eb5c3e186db2dc4cbe9a5 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
@@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.
 
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index f2f4b2d929..18d28a151a 100644
+index f2f4b2d92..18d28a151 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -213,11 +213,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0326-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0325-Call-player-spectator-target-events.patch
similarity index 96%
rename from Spigot-Server-Patches/0326-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0325-Call-player-spectator-target-events.patch
index 0ab64a428..a4b0117c4 100644
--- a/Spigot-Server-Patches/0326-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0325-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From b826327c74f68b3e4202430420ea52e6da440371 Mon Sep 17 00:00:00 2001
+From 14090fa746fb375472cd62ce33f8bb2a4320e565 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 418a2cf0f4..160f456e27 100644
+index 418a2cf0f..160f456e2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0327-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0326-Add-Velocity-IP-Forwarding-Support.patch
similarity index 97%
rename from Spigot-Server-Patches/0327-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0326-Add-Velocity-IP-Forwarding-Support.patch
index 62916602e..d7f43e63a 100644
--- a/Spigot-Server-Patches/0327-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0326-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From a2ee586a60ae9b92491d79432f9c6311cc9ddf54 Mon Sep 17 00:00:00 2001
+From 9bda82e87a0c44a81f622bb2b668c8ebf6cd7596 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
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d2c039ea2f..63d8602927 100644
+index d2c039ea2..63d860292 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -55,7 +55,7 @@ index d2c039ea2f..63d8602927 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 0000000000..fdd8708f97
+index 000000000..fdd8708f9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -127,7 +127,7 @@ index 0000000000..fdd8708f97
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index d4d752ddb4..5d46a975e3 100644
+index d4d752ddb..5d46a975e 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -203,7 +203,7 @@ index d4d752ddb4..5d46a975e3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index efd02bd67d..c073b04aa9 100644
+index efd02bd67..c073b04aa 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -216,7 +216,7 @@ index efd02bd67d..c073b04aa9 100644
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index fa2d3ce8cb..dac560c63f 100644
+index fa2d3ce8c..dac560c63 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -244,7 +244,7 @@ index fa2d3ce8cb..dac560c63f 100644
          int j = this.i();
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index 4d1f441395..c1ca6f9501 100644
+index 4d1f44139..c1ca6f950 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 @@ -4,8 +4,8 @@ import java.io.IOException;
@@ -259,7 +259,7 @@ index 4d1f441395..c1ca6f9501 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index ae74dc9e18..7eb230f1b2 100644
+index ae74dc9e1..7eb230f1b 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
@@ -278,7 +278,7 @@ index ae74dc9e18..7eb230f1b2 100644
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
          this.a = packetdataserializer.i();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 024623b777..cab9e84a09 100644
+index 752427d91..f8365d8ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -644,7 +644,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0328-Add-more-Witch-API.patch b/Spigot-Server-Patches/0327-Add-more-Witch-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0328-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0327-Add-more-Witch-API.patch
index ce959a9bc..afc8fe617 100644
--- a/Spigot-Server-Patches/0328-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0327-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From 06eb1156b7c4a9280647ebf2429c50a7c8bbb040 Mon Sep 17 00:00:00 2001
+From 99dfad0ab1fca68eb3ab11279ab8fd0ff03ee217 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/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index d383b0ab41..9fea750248 100644
+index d383b0ab4..9fea75024 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@
@@ -96,7 +96,7 @@ index d383b0ab41..9fea750248 100644
      public SoundEffect dW() {
          return SoundEffects.ENTITY_WITCH_CELEBRATE;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index bae107e76e..b43a2bbd5b 100644
+index bae107e76..b43a2bbd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,12 +1,18 @@
diff --git a/Spigot-Server-Patches/0329-Fix-MC-93764.patch b/Spigot-Server-Patches/0328-Fix-MC-93764.patch
similarity index 86%
rename from Spigot-Server-Patches/0329-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0328-Fix-MC-93764.patch
index 75a14058e..29bab9264 100644
--- a/Spigot-Server-Patches/0329-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0328-Fix-MC-93764.patch
@@ -1,11 +1,11 @@
-From 1c9f18c2ec0fb987c8a9b3c19dda5ff6f2856f0e Mon Sep 17 00:00:00 2001
+From d6cdfc78638823863961e32a34208116eb22fdd0 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/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
-index 715faef171..b97408cffa 100644
+index 715faef17..b97408cff 100644
 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
diff --git a/Spigot-Server-Patches/0330-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0329-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 96%
rename from Spigot-Server-Patches/0330-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0329-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 03451cd53..e7dbc928b 100644
--- a/Spigot-Server-Patches/0330-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0329-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From 1464f3e3f5e675b5b08a747973bc847afb234b14 Mon Sep 17 00:00:00 2001
+From 228d99096ce38699ea2e026992cfe006ca6cc584 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 63f313a9..2299860b 100644
+index 63f313a92..2299860b8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -429,4 +429,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 63f313a9..2299860b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c43b1aca..806eb626 100644
+index 7770ed312..408c1e404 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -347,6 +347,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0331-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0330-Reset-players-airTicks-on-respawn.patch
similarity index 84%
rename from Spigot-Server-Patches/0331-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0330-Reset-players-airTicks-on-respawn.patch
index 85d6df7fb..9ebca0274 100644
--- a/Spigot-Server-Patches/0331-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0330-Reset-players-airTicks-on-respawn.patch
@@ -1,14 +1,14 @@
-From f92e9ea1566590348d84de4d010801f0d23ae5f4 Mon Sep 17 00:00:00 2001
+From b30d3ee85360cb8d1da0876268c000ee0f01178e 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 97aa07398d..6a2a4576e9 100644
+index 5e60baf23..44c12d248 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2322,6 +2322,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2323,6 +2323,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -17,7 +17,7 @@ index 97aa07398d..6a2a4576e9 100644
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 160f456e27..b190515f73 100644
+index 160f456e2..b190515f7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1862,6 +1862,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0332-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0331-Strip-private-area-unicode-characters-from-signs.patch
similarity index 97%
rename from Spigot-Server-Patches/0332-Strip-private-area-unicode-characters-from-signs.patch
rename to Spigot-Server-Patches/0331-Strip-private-area-unicode-characters-from-signs.patch
index b651006f1..2695ffb61 100644
--- a/Spigot-Server-Patches/0332-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0331-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From c7b96237e9503bcdd04ccbbd458c0083486e006a Mon Sep 17 00:00:00 2001
+From c3dd6a91cd43ad998307d96d87eb158c79829423 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
@@ -20,7 +20,7 @@ think of no reason to use it.
 Fixes GH-1571
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 2c6ce5bae0..15b3add9ed 100644
+index ddf8f4659..275b82b10 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0333-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0332-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 96%
rename from Spigot-Server-Patches/0333-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0332-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index afc4404cd..bd265879a 100644
--- a/Spigot-Server-Patches/0333-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0332-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 4b09246872f5a380b3397c175f8cfbe2485005ef Mon Sep 17 00:00:00 2001
+From 52a7bf4ff9453287cf888ae072fa9907cc51d4b6 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/0334-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0333-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 89%
rename from Spigot-Server-Patches/0334-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0333-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 927cdeac9..aac075c1d 100644
--- a/Spigot-Server-Patches/0334-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0333-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,11 +1,11 @@
-From 8b16500f4b96155fdb8b9708a68bc16a995a2275 Mon Sep 17 00:00:00 2001
+From 94e1e0a7e2a64a81a3f3a7a34c2553fbb5092333 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/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 59164684e0..4e9d53fb59 100644
+index 59164684e..4e9d53fb5 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -66,7 +66,7 @@ public class SystemUtils {
diff --git a/Spigot-Server-Patches/0335-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0334-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
similarity index 94%
rename from Spigot-Server-Patches/0335-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
rename to Spigot-Server-Patches/0334-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index cff220579..ea96616c4 100644
--- a/Spigot-Server-Patches/0335-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0334-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From 61ff3f4d1daee1bc7ed4640e9c706a5fb6f9bf37 Mon Sep 17 00:00:00 2001
+From 69bf42d82fd66a351e2953111aef49159758c9b3 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
@@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
 the item used.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 89a13b88bb..83b36b3e7f 100644
+index 89a13b88b..83b36b3e7 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -354,10 +354,11 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0336-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0335-Optimize-World-Time-Updates.patch
similarity index 96%
rename from Spigot-Server-Patches/0336-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0335-Optimize-World-Time-Updates.patch
index 516748a98..11d018ab9 100644
--- a/Spigot-Server-Patches/0336-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0335-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 7b76eb4fb930008f0a275c8cc55b980e3a6275e8 Mon Sep 17 00:00:00 2001
+From 7319916152e40f904aabef06d2cd2428e5fd3670 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
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cb630fda6e..f222d44706 100644
+index cb630fda6..f222d4470 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1114,12 +1114,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0337-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0336-Restore-custom-InventoryHolder-support.patch
similarity index 95%
rename from Spigot-Server-Patches/0337-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0336-Restore-custom-InventoryHolder-support.patch
index 9f9ace331..8524aac39 100644
--- a/Spigot-Server-Patches/0337-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0336-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From f3abcd1e2da766010573ec5b3773e7f4b24c326b Mon Sep 17 00:00:00 2001
+From 0a1160238ca6b47932883503fdfa88c5f867a7f7 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
@@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
 based inventories.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
-index 9957ed0402..ae280dd40b 100644
+index 9957ed040..ae280dd40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 @@ -39,10 +39,20 @@ public final class CraftInventoryCreator {
diff --git a/Spigot-Server-Patches/0338-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0337-Use-Vanilla-Minecart-Speeds.patch
similarity index 91%
rename from Spigot-Server-Patches/0338-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0337-Use-Vanilla-Minecart-Speeds.patch
index 1dab4ae8e..64c7e0ac4 100644
--- a/Spigot-Server-Patches/0338-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0337-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From a7c108a14567dd94197d36a7cc62fc2d55f9b49f Mon Sep 17 00:00:00 2001
+From 85043c5ddc441e2ef0796f83857bd2804e9d6158 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
 CraftBukkit changed the values on flying speed, restore back to vanilla
 
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index e1a684b370..6df2930e2d 100644
+index e1a684b37..6df2930e2 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity {
diff --git a/Spigot-Server-Patches/0339-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0338-Fix-SpongeAbsortEvent-handling.patch
similarity index 93%
rename from Spigot-Server-Patches/0339-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0338-Fix-SpongeAbsortEvent-handling.patch
index 9b1272622..0a19fafba 100644
--- a/Spigot-Server-Patches/0339-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0338-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From 72fb9d040d6e499499389d9c15d83dd5faa60a05 Mon Sep 17 00:00:00 2001
+From 209d5dfb8c8183e089fe3178a2dfce4ca644564e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index d71102164e..5d8db912a6 100644
+index d71102164..5d8db912a 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -472,7 +472,7 @@ public class Block implements IMaterial {
@@ -19,7 +19,7 @@ index d71102164e..5d8db912a6 100644
          if (world instanceof WorldServer) {
              a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 4e281ce6dd..6a64af71b9 100644
+index 4e281ce6d..6a64af71b 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
 @@ -113,8 +113,11 @@ public class BlockSponge extends Block {
diff --git a/Spigot-Server-Patches/0340-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0339-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 87%
rename from Spigot-Server-Patches/0340-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0339-Don-t-allow-digging-into-unloaded-chunks.patch
index 25c5b97a5..5cdf2c14d 100644
--- a/Spigot-Server-Patches/0340-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0339-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,14 +1,14 @@
-From 3bbd9f89a531ed543f40549ed54a71e34c549d94 Mon Sep 17 00:00:00 2001
+From c0c7513d8ddffeb50b7f46b9da8684a715712795 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 806eb626cb..82c6d89a0c 100644
+index 408c1e404..c8d11ce84 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1251,6 +1251,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1257,6 +1257,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
              case START_DESTROY_BLOCK:
              case ABORT_DESTROY_BLOCK:
              case STOP_DESTROY_BLOCK:
diff --git a/Spigot-Server-Patches/0341-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0340-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0341-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0340-Optimize-redstone-algorithm.patch
index f104d1338..1b9ddd066 100644
--- a/Spigot-Server-Patches/0341-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0340-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 9532fdb3c8f23e40e565554862ba04bd37b65c85 Mon Sep 17 00:00:00 2001
+From f0ad64d1d07bfcd7e4dee2b707463bc2de37de75 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
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2299860b81..91c809b7ce 100644
+index 2299860b8..91c809b7c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -434,4 +434,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index 2299860b81..91c809b7ce 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 0000000000..cf5661f1c5
+index 000000000..cf5661f1c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +1,912 @@
@@ -956,7 +956,7 @@ index 0000000000..cf5661f1c5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 7ce9cdb853..6b5015ce5f 100644
+index 7ce9cdb85..6b5015ce5 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1124,7 +1124,7 @@ index 7ce9cdb853..6b5015ce5f 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1f28358f9e..7368713415 100644
+index 1f28358f9..736871341 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -594,6 +594,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0342-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0341-force-entity-dismount-during-teleportation.patch
similarity index 92%
rename from Spigot-Server-Patches/0342-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0341-force-entity-dismount-during-teleportation.patch
index 48080ef65..a45f3bfdd 100644
--- a/Spigot-Server-Patches/0342-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0341-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From 02832a04e3f0464715a6f6d7b44a3c902588aaa8 Mon Sep 17 00:00:00 2001
+From e58218d68c4a8779a6822d9c649f9ed17fd5f7de 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,10 +20,10 @@ 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 6a2a4576e9..fa8d382191 100644
+index 44c12d248..bb491a42b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2044,12 +2044,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2045,12 +2045,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -41,7 +41,7 @@ index 6a2a4576e9..fa8d382191 100644
          }
  
      }
-@@ -2100,7 +2103,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2101,7 +2104,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return true; // CraftBukkit
      }
  
@@ -53,7 +53,7 @@ index 6a2a4576e9..fa8d382191 100644
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2110,7 +2116,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2111,7 +2117,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) getBukkitEntity(),
@@ -62,7 +62,7 @@ index 6a2a4576e9..fa8d382191 100644
                  );
                  Bukkit.getPluginManager().callEvent(event);
                  CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
-@@ -2121,7 +2127,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2122,7 +2128,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
              // Spigot start
@@ -72,7 +72,7 @@ index 6a2a4576e9..fa8d382191 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index e003f1c20c..61da5d365d 100644
+index e003f1c20..61da5d365 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -937,9 +937,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,7 +91,7 @@ index e003f1c20c..61da5d365d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 86d3c516ba..a8769548fe 100644
+index 86d3c516b..a8769548f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2669,11 +2669,13 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index 86d3c516ba..a8769548fe 100644
              this.B(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b190515f73..8d21731aab 100644
+index b190515f7..8d21731aa 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1002,11 +1002,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0343-Book-Size-Limits.patch b/Spigot-Server-Patches/0342-Book-Size-Limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0343-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0342-Book-Size-Limits.patch
index 3f81a1762..461e05b5d 100644
--- a/Spigot-Server-Patches/0343-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0342-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 83050a39cb23424e44d47532249e96ba751d184f Mon Sep 17 00:00:00 2001
+From 137ac8184abff9074d191227469757828dd7e6da 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 63d8602927..8feb0efdcd 100644
+index 63d860292..8feb0efdc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -375,4 +375,11 @@ public class PaperConfig {
@@ -22,7 +22,7 @@ index 63d8602927..8feb0efdcd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 82c6d89a0c..60c1397da0 100644
+index c8d11ce84..9f9482aa0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -14,6 +14,7 @@ import java.util.Iterator;
diff --git a/Spigot-Server-Patches/0344-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0343-Make-the-default-permission-message-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0344-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0343-Make-the-default-permission-message-configurable.patch
index 59dd03050..d95e83f7a 100644
--- a/Spigot-Server-Patches/0344-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0343-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From 07378c8c374b51a241c9ab99576ce1cfcbec48b9 Mon Sep 17 00:00:00 2001
+From 363103fb232cc9fbc05d68032fbfe8e120e6bb7b 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/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8feb0efdcd..81987e4ad9 100644
+index 8feb0efdc..81987e4ad 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -21,6 +21,7 @@ import java.util.regex.Pattern;
@@ -29,7 +29,7 @@ index 8feb0efdcd..81987e4ad9 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cab9e84a09..f378dc8c86 100644
+index f8365d8ba..d2882933d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2137,6 +2137,11 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0345-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0344-Add-more-Zombie-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0345-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0344-Add-more-Zombie-API.patch
index 895f8ed31..080df4cbc 100644
--- a/Spigot-Server-Patches/0345-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0344-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From ca7dafa82b1227e80fed8574ef53a475d9a1b238 Mon Sep 17 00:00:00 2001
+From 1e2bfdb230e09b75fae748065f23c25741e99710 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/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 5e88367d3c..c73d2ff5da 100644
+index 5e88367d3..c73d2ff5d 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1247,6 +1247,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index 5e88367d3c..c73d2ff5da 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 5d93af5857..552bad0520 100644
+index 5d93af585..552bad052 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index 5d93af5857..552bad0520 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020e..c4320dbb67 100644
+index 0429cf020..c4320dbb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
diff --git a/Spigot-Server-Patches/0346-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0345-Prevent-rayTrace-from-loading-chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0346-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0345-Prevent-rayTrace-from-loading-chunks.patch
index b37000b2f..004935af4 100644
--- a/Spigot-Server-Patches/0346-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0345-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 88d1db834cf7efcf8175b0f510661869b476c2f7 Mon Sep 17 00:00:00 2001
+From 68f062ac04bd27daca8c15ac777cc1b4fb15efd8 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/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 577b227758..c5586e44d4 100644
+index 577b22775..c5586e44d 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -41,7 +41,15 @@ public interface IBlockAccess {
diff --git a/Spigot-Server-Patches/0347-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0346-Handle-Large-Packets-disconnecting-client.patch
similarity index 95%
rename from Spigot-Server-Patches/0347-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0346-Handle-Large-Packets-disconnecting-client.patch
index 1cdbdca23..1603ef7e1 100644
--- a/Spigot-Server-Patches/0347-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0346-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From b0536574dda5f3fac664e49532d07906165019bd Mon Sep 17 00:00:00 2001
+From 4c9233aa8657a100150f84a63dbf720445df7c11 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
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index c073b04aa9..1652662aef 100644
+index c073b04aa..1652662ae 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -99,6 +99,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -27,7 +27,7 @@ index c073b04aa9..1652662aef 100644
              NetworkManager.LOGGER.debug("Skipping packet due to errors", throwable.getCause());
          } else {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 601d4d0fa2..2d8e6a2f4a 100644
+index 601d4d0fa..2d8e6a2f4 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -10,6 +10,12 @@ public interface Packet<T extends PacketListener> {
@@ -44,7 +44,7 @@ index 601d4d0fa2..2d8e6a2f4a 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 63c4dbd327..b0cfef52cb 100644
+index 63c4dbd32..b0cfef52c 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -80,7 +80,7 @@ index 63c4dbd327..b0cfef52cb 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index d19a30ad87..58eccd9c63 100644
+index d19a30ad8..58eccd9c6 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -68,7 +68,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -93,7 +93,7 @@ index d19a30ad87..58eccd9c63 100644
          } else {
              this.e = new byte[i];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index f7c3655671..631234324d 100644
+index f7c365567..631234324 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0348-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0347-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 96%
rename from Spigot-Server-Patches/0348-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0347-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 8d9fdc068..33b4672ae 100644
--- a/Spigot-Server-Patches/0348-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0347-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From 1a558d6f98095bdbd422f3820aee1fc116ec9c0c Mon Sep 17 00:00:00 2001
+From bb6ae177b15538c541022acce1296b1f20a6c35e 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
@@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 6a448c02ec..c1ef1c950d 100644
+index 6a448c02e..c1ef1c950 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -25,12 +25,12 @@ import org.bukkit.plugin.Plugin;
diff --git a/Spigot-Server-Patches/0349-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0348-Add-PlayerConnectionCloseEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0349-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0348-Add-PlayerConnectionCloseEvent.patch
index 92650784a..5719caa00 100644
--- a/Spigot-Server-Patches/0349-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0348-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From a919032beccfef6ba160da3514456318037a1a82 Mon Sep 17 00:00:00 2001
+From 0b468ba67e7fa50f924ccd3e7baf7efea2c5ced5 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
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 5d46a975e3..9e4bc24058 100644
+index 5d46a975e..9e4bc2405 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener {
@@ -50,7 +50,7 @@ index 5d46a975e3..9e4bc24058 100644
      private SecretKey loginKey;
      private EntityPlayer l;
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 1652662aef..23fcdea176 100644
+index 1652662ae..23fcdea17 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -346,6 +346,26 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/Spigot-Server-Patches/0350-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0349-Prevent-Enderman-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0350-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0349-Prevent-Enderman-from-loading-chunks.patch
index 04b8f8a24..d7487ed1b 100644
--- a/Spigot-Server-Patches/0350-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0349-Prevent-Enderman-from-loading-chunks.patch
@@ -1,11 +1,11 @@
-From e242fc95ddad73d481d958d4de2504dd9cbe3e56 Mon Sep 17 00:00:00 2001
+From 84476e23751d1f8c891f103c194f4a0e2f7dc59a 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/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 9f2c339ae3..0989c07cf5 100644
+index 9f2c339ae..0989c07cf 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -325,7 +325,8 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0351-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0350-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from Spigot-Server-Patches/0351-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0350-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 4ad350b19..c882b6350 100644
--- a/Spigot-Server-Patches/0351-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0350-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From a95b337115d8da60d41e273590fc7fc4a761b017 Mon Sep 17 00:00:00 2001
+From af2bb9f0da4a9dda2edaba09843d6a6d80f1fd54 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
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8d21731aab..ce4ffe01ba 100644
+index 8d21731aa..ce4ffe01b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index 8d21731aab..ce4ffe01ba 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 049d702cb9..52aa83f51f 100644
+index 049d702cb..52aa83f51 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -94,6 +94,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index 049d702cb9..52aa83f51f 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.a(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index c1ef1c950d..3824180ee5 100644
+index c1ef1c950..3824180ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index c1ef1c950d..3824180ee5 100644
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3dd0ae0ca8..de1b874f3d 100644
+index 3dd0ae0ca..de1b874f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -140,6 +140,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0352-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0351-Fix-PlayerEditBookEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0352-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0351-Fix-PlayerEditBookEvent.patch
index 520c2e74c..3e039091f 100644
--- a/Spigot-Server-Patches/0352-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0351-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From 2468a714bb589108aff67c5718899a0e5cdb67be Mon Sep 17 00:00:00 2001
+From 18fc707d6472cb98f496230b422df1ac47d76b13 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 60c1397da0..cad75ff9b6 100644
+index 9f9482aa0..fad7f0df3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -862,9 +862,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0353-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0352-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 90%
rename from Spigot-Server-Patches/0353-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0352-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index cbb73e3e4..de2ca6164 100644
--- a/Spigot-Server-Patches/0353-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0352-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,11 +1,11 @@
-From 0cebca4e04106de3449eb3fc49ef57677613032f Mon Sep 17 00:00:00 2001
+From 51f6d38524dd8d1030e4548c8099092149c5f7af 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ce4ffe01ba..7c8774d228 100644
+index ce4ffe01b..7c8774d22 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1285,6 +1285,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0354-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0353-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 96%
rename from Spigot-Server-Patches/0354-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0353-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index 7563279df..de4eecc7b 100644
--- a/Spigot-Server-Patches/0354-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0353-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From d2a0f895a6d9566984ddbaf400eabcd07048ec94 Mon Sep 17 00:00:00 2001
+From 2c7c3abd9de974a09f80ff02c140fa615a8ccdf0 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
@@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for
 all piston types.
 
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index b41750f22e..d548b27b8a 100644
+index b41750f22..d548b27b8 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -121,7 +121,7 @@ public class BlockPiston extends BlockDirectional {
diff --git a/Spigot-Server-Patches/0355-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0354-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 93%
rename from Spigot-Server-Patches/0355-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0354-Block-Entity-remove-from-being-called-on-Players.patch
index 1f847c604..681300389 100644
--- a/Spigot-Server-Patches/0355-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0354-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From 85813839df3d8c576333cbeeb85b74b427f6fd91 Mon Sep 17 00:00:00 2001
+From b3af6b8e115f7e055a3c09f73ee67911a84924e4 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
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index de1b874f3d..9cf6330ab6 100644
+index de1b874f3..9cf6330ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1974,6 +1974,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0356-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0355-Allow-Saving-of-Oversized-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0356-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0355-Allow-Saving-of-Oversized-Chunks.patch
index 55a7dd13c..f761a4997 100644
--- a/Spigot-Server-Patches/0356-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0355-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 2debac5ab6e0ea1511b4670554cffbf3c0036213 Mon Sep 17 00:00:00 2001
+From 24a26c7b4b4790379ed0595237208dbf27286107 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
@@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index 9fd8a75dae..d49afd622e 100644
+index 9fd8a75da..d49afd622 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools {
@@ -51,7 +51,7 @@ index 9fd8a75dae..d49afd622e 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index b7c94fe238..80eea5dfbd 100644
+index b7c94fe23..80eea5dfb 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -11,7 +11,7 @@ import java.util.Objects;
@@ -64,7 +64,7 @@ index b7c94fe238..80eea5dfbd 100644
  
      public NBTTagList() {}
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index e68f901943..ed2ccebb23 100644
+index e68f90194..ed2ccebb2 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -23,7 +23,7 @@ public class RegionFile implements AutoCloseable {
@@ -286,7 +286,7 @@ index e68f901943..ed2ccebb23 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 8718811655..c53518a477 100644
+index 871881165..c53518a47 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -47,6 +47,7 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0357-BlockDestroyEvent.patch b/Spigot-Server-Patches/0356-BlockDestroyEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0357-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0356-BlockDestroyEvent.patch
index f2ed02bfa..3888be261 100644
--- a/Spigot-Server-Patches/0357-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0356-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 746aca7892de82c2bf16d32dfd379352f2f105af Mon Sep 17 00:00:00 2001
+From 975f773e046e02c797f9023c118b24cba15256f5 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 1eb689c62a..f1552f23ea 100644
+index 736871341..3269d095b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -524,8 +524,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0358-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0357-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 96%
rename from Spigot-Server-Patches/0358-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0357-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 4a2940a6a..8bccee90f 100644
--- a/Spigot-Server-Patches/0358-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0357-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From db45bf861a2a79726dd1ee9af2ba2e1d0b2f9257 Mon Sep 17 00:00:00 2001
+From 72f072423249e1c616dd08a22098ea7ff486e14d 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
@@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless.
 This reimplements vanilla logic using the same test logic as Shaped
 
 diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-index 070fc1e3ec..691e697d68 100644
+index 070fc1e3e..691e697d6 100644
 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
 +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
 @@ -63,16 +63,46 @@ public class ShapelessRecipes implements RecipeCrafting {
diff --git a/Spigot-Server-Patches/0359-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0358-Fix-sign-edit-memory-leak.patch
similarity index 91%
rename from Spigot-Server-Patches/0359-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0358-Fix-sign-edit-memory-leak.patch
index 9d73367ee..194723eb3 100644
--- a/Spigot-Server-Patches/0359-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0358-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From 27f4aa93fe5e8a777667f18e7595c01d9caa16f6 Mon Sep 17 00:00:00 2001
+From 012b28b509ec32e0d168433065b884fd4df48d8c 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 cad75ff9b6..e502e53659 100644
+index fad7f0df3..67b3e2c97 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2566,7 +2566,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2572,7 +2572,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
              TileEntitySign tileentitysign = (TileEntitySign) tileentity;
  
@@ -19,7 +19,7 @@ index cad75ff9b6..e502e53659 100644
                  this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
                  return;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 15b3add9ed..caeaca4c7a 100644
+index 275b82b10..281a2a88b 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -17,6 +17,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0360-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0359-Limit-Client-Sign-length-more.patch
similarity index 94%
rename from Spigot-Server-Patches/0360-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0359-Limit-Client-Sign-length-more.patch
index 81459bdbb..2c7777057 100644
--- a/Spigot-Server-Patches/0360-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0359-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From fecdeb7b26f0540f703f1ceda84482a19b6a6fe3 Mon Sep 17 00:00:00 2001
+From 6f6d54f82ce1cf3de5e2febd02bcbb0278ededb3 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 e502e53659..c4ac559f3f 100644
+index 67b3e2c97..767acc5a7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -33,7 +33,7 @@ index e502e53659..c4ac559f3f 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) {
-@@ -2582,6 +2583,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2588,6 +2589,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
diff --git a/Spigot-Server-Patches/0361-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0360-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 93%
rename from Spigot-Server-Patches/0361-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0360-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 1a1410160..18d782351 100644
--- a/Spigot-Server-Patches/0361-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0360-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 7ececc65a6af111e51f50fde466b10e80a9d169d Mon Sep 17 00:00:00 2001
+From f08d9c503ded639c3435d2e32dd790e7fa12bcbf 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
@@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index caeaca4c7a..dd7889a4f9 100644
+index 281a2a88b..7e5d81593 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -18,6 +18,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0362-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0361-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 95%
rename from Spigot-Server-Patches/0362-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0361-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index 507d29b55..391566a8c 100644
--- a/Spigot-Server-Patches/0362-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0361-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From 6b928f73df2f26d973c3c8cd0660964bf454f68d Mon Sep 17 00:00:00 2001
+From d2140ba4accc710336ec38125f9119a5bdccd8c5 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
@@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1
 to disable the limit and let your players be abused.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 23fcdea176..ba23d28335 100644
+index 23fcdea17..ba23d2833 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -220,6 +220,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -31,7 +31,7 @@ index 23fcdea176..ba23d28335 100644
  
      private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 2d8e6a2f4a..8d0965a053 100644
+index 2d8e6a2f4..8d0965a05 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -11,6 +11,7 @@ public interface Packet<T extends PacketListener> {
@@ -43,7 +43,7 @@ index 2d8e6a2f4a..8d0965a053 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 58eccd9c63..ef71a1feb3 100644
+index 58eccd9c6..ef71a1feb 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -20,6 +20,15 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0363-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0362-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 95%
rename from Spigot-Server-Patches/0363-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0362-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index bc5710f1e..fab02459a 100644
--- a/Spigot-Server-Patches/0363-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0362-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From f9c2e9c882037f3c569c12afd5338c6ddb57e036 Mon Sep 17 00:00:00 2001
+From 7949780e1a42aa3e6ef27472e252d1d82f8b1f68 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
@@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 8570e38f42..c97be42dd7 100644
+index 8570e38f4..c97be42dd 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -64,6 +64,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -23,7 +23,7 @@ index 8570e38f42..c97be42dd7 100644
          this.e = flag;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 52aa83f51f..0da3f95f89 100644
+index 52aa83f51..0da3f95f8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -62,7 +62,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0364-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0363-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 89%
rename from Spigot-Server-Patches/0364-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0363-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 86f17480d..e18143018 100644
--- a/Spigot-Server-Patches/0364-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0363-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 30ff428a5ca79151685f885d4fcda75a330d5157 Mon Sep 17 00:00:00 2001
+From 7e36fbe2ab5ed318e19a58d28347ae545f8b232a 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 6e265467b0..3396983adf 100644
+index 552bad052..2a3997149 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -167,6 +167,7 @@ public class EntityZombie extends EntityMonster {
diff --git a/Spigot-Server-Patches/0365-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0364-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 87%
rename from Spigot-Server-Patches/0365-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0364-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 35581b98b..483dac676 100644
--- a/Spigot-Server-Patches/0365-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0364-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,11 +1,11 @@
-From 7022dbba2844ee25fb4476b90bc50d9f338c76ac Mon Sep 17 00:00:00 2001
+From e4afa9dc216bc0da8edb4dd92ba7aaa46fe3190a 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/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0da3f95f89..65df0e7c8c 100644
+index 0da3f95f8..65df0e7c8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1034,6 +1034,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0366-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0365-Add-LivingEntity-getTargetEntity.patch
similarity index 95%
rename from Spigot-Server-Patches/0366-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0365-Add-LivingEntity-getTargetEntity.patch
index ee4f82d65..628ba0941 100644
--- a/Spigot-Server-Patches/0366-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0365-Add-LivingEntity-getTargetEntity.patch
@@ -1,11 +1,11 @@
-From 5f5270382ffdb9fa152b7633043ef6880d324eed Mon Sep 17 00:00:00 2001
+From cb0a150f6bc158cccb7c94a9f7976c18ea8df93b 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
 
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 4f60b931a1..c950139c0f 100644
+index 4f60b931a..c950139c0 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -108,6 +108,7 @@ public class AxisAlignedBB {
@@ -46,10 +46,10 @@ index 4f60b931a1..c950139c0f 100644
          double[] adouble = new double[]{1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fa8d382191..74eb6f0606 100644
+index bb491a42b..7c2005e76 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1496,6 +1496,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1497,6 +1497,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.c(f - 90.0F, f1);
      }
  
@@ -57,7 +57,7 @@ index fa8d382191..74eb6f0606 100644
      public Vec3D j(float f) {
          if (f == 1.0F) {
              return new Vec3D(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ);
-@@ -2143,6 +2144,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2144,6 +2145,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.getPassengers().size() < 1;
      }
  
@@ -66,7 +66,7 @@ index fa8d382191..74eb6f0606 100644
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a8769548fe..d44ea9ec5d 100644
+index a8769548f..d44ea9ec5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3225,6 +3225,37 @@ public abstract class EntityLiving extends Entity {
@@ -108,7 +108,7 @@ index a8769548fe..d44ea9ec5d 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index d207e787aa..467efdfc85 100644
+index d207e787a..467efdfc8 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -18,6 +18,7 @@ public final class IEntitySelector {
@@ -120,7 +120,7 @@ index d207e787aa..467efdfc85 100644
          return !entity.isSpectator();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d5c4115a85..c4aa1945ff 100644
+index d5c4115a8..c4aa1945f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -202,6 +202,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0367-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0366-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 94%
rename from Spigot-Server-Patches/0367-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0366-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index d0992e219..c3cf2224f 100644
--- a/Spigot-Server-Patches/0367-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0366-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From 280f7264421479fc05d210ce91b71fe94dd1b020 Mon Sep 17 00:00:00 2001
+From a4e1cd2248a90f088ce52c2b64dea62ff22268c3 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text
@@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 0ab611564e..f7b2095bb7 100644
+index 0ab611564..f7b2095bb 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0368-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0367-Entity-getEntitySpawnReason.patch
similarity index 93%
rename from Spigot-Server-Patches/0368-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0367-Entity-getEntitySpawnReason.patch
index 6fd92b10c..5dd971a79 100644
--- a/Spigot-Server-Patches/0368-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0367-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From a9ffddc41689d09f15c07e33899089a2d3c89389 Mon Sep 17 00:00:00 2001
+From 2e74dcfcf133b718c7eb957376d1495a1a81922a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 12b7d2531b..c5ba24f27f 100644
+index 7c2005e76..04d4f358f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -68,6 +68,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -21,7 +21,7 @@ index 12b7d2531b..c5ba24f27f 100644
      // Paper end
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
-@@ -1641,6 +1642,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1642,6 +1643,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (this.origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -31,7 +31,7 @@ index 12b7d2531b..c5ba24f27f 100644
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
-@@ -1775,6 +1779,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1776,6 +1780,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
  
              spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
@@ -59,7 +59,7 @@ index 12b7d2531b..c5ba24f27f 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 65df0e7c8c..abddc8895e 100644
+index 65df0e7c8..abddc8895 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -250,7 +250,7 @@ public abstract class PlayerList {
@@ -72,7 +72,7 @@ index 65df0e7c8c..abddc8895e 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9a3690d664..f992fc34c3 100644
+index 9a3690d66..f992fc34c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -941,6 +941,7 @@ public class WorldServer extends World {
@@ -84,7 +84,7 @@ index 9a3690d664..f992fc34c3 100644
          if (entity.dead) {
              // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1cd3448e57..15042943c9 100644
+index 1cd3448e5..15042943c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0369-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0368-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 89%
rename from Spigot-Server-Patches/0369-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0368-Update-entity-Metadata-for-all-tracked-players.patch
index 110e2a624..b5b481bb6 100644
--- a/Spigot-Server-Patches/0369-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0368-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,11 +1,11 @@
-From ef4f9b106e144f63ba67002f7387da3802fdca5b Mon Sep 17 00:00:00 2001
+From f23c5ef2752ea4d0b2a430c72eae3838130e3901 Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index cd7e0299ac..460c687d3e 100644
+index cd7e0299a..460c687d3 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -379,6 +379,12 @@ public class EntityTrackerEntry {
@@ -22,10 +22,10 @@ index cd7e0299ac..460c687d3e 100644
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c4ac559f3f..dda8196702 100644
+index 767acc5a7..e4c0fa424 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2026,7 +2026,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2032,7 +2032,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                      if (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem) {
                          // Refresh the current entity metadata
diff --git a/Spigot-Server-Patches/0370-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0369-Fire-event-on-GS4-query.patch
similarity index 98%
rename from Spigot-Server-Patches/0370-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0369-Fire-event-on-GS4-query.patch
index 026bf94af..5e9af55c0 100644
--- a/Spigot-Server-Patches/0370-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0369-Fire-event-on-GS4-query.patch
@@ -1,11 +1,11 @@
-From f0221a873537228f9177ed01947c78bb0baecf1b Mon Sep 17 00:00:00 2001
+From 8256b22de88e63b135e9f67d82b1d1fd59f1cc77 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query
 
 
 diff --git a/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
-index 66bfbcf02b..d821ef9a75 100644
+index 66bfbcf02..d821ef9a7 100644
 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable {
@@ -26,7 +26,7 @@ index 66bfbcf02b..d821ef9a75 100644
          return this.b.getPlayerCount();
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java
-index a556a71334..67e94a6f07 100644
+index a556a7133..67e94a6f0 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java
 @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread {
@@ -184,7 +184,7 @@ index a556a71334..67e94a6f07 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java
-index 848b5c3f0e..73efea7e13 100644
+index 848b5c3f0..73efea7e1 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java
 @@ -18,15 +18,27 @@ public class RemoteStatusReply {
diff --git a/Spigot-Server-Patches/0371-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0370-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0371-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0370-Implement-PlayerPostRespawnEvent.patch
index cd16695df..db405d841 100644
--- a/Spigot-Server-Patches/0371-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0370-Implement-PlayerPostRespawnEvent.patch
@@ -1,11 +1,11 @@
-From dcfd2cd3c35ece30d96d615071b8741561ecdf6a Mon Sep 17 00:00:00 2001
+From 05256c22933dd74cce5a27ac0b3ad4dc0b566167 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index abddc8895e..a183bb450d 100644
+index abddc8895..a183bb450 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -637,9 +637,14 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0372-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0371-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 93%
rename from Spigot-Server-Patches/0372-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0371-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 08cfec957..a86d955e6 100644
--- a/Spigot-Server-Patches/0372-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0371-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From 472b1ae524fad0d6ddf1c211e481dcf6d7ce9b68 Mon Sep 17 00:00:00 2001
+From cc1e9fe3c77c40d4c5352190286427aaa8eb1e9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6e026d34f0..2091698953 100644
+index 6e026d34f..209169895 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -59,6 +59,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0373-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0372-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 93%
rename from Spigot-Server-Patches/0373-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0372-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 25ed6970e..0371be83e 100644
--- a/Spigot-Server-Patches/0373-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0372-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From eada047c2186598684e7566306bc446400820b6a Mon Sep 17 00:00:00 2001
+From cd015a142bf82396e26b9c5cedc8e1aa174717d5 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 3f552b5905..cb756b1ba0 100644
+index 3f552b590..cb756b1ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType;
diff --git a/Spigot-Server-Patches/0374-Server-Tick-Events.patch b/Spigot-Server-Patches/0373-Server-Tick-Events.patch
similarity index 93%
rename from Spigot-Server-Patches/0374-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0373-Server-Tick-Events.patch
index 6f8549beb..4c2bb14a4 100644
--- a/Spigot-Server-Patches/0374-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0373-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From d8e9824a4b580f86e49f3f5dbadc1a3b2c2a72e1 Mon Sep 17 00:00:00 2001
+From 61840dea6891e336ca6045f74a88aeebd42c6e6e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f222d44706..1e2f2f8b99 100644
+index f222d4470..1e2f2f8b9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1044,6 +1044,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0375-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0374-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0375-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0374-PlayerDeathEvent-getItemsToKeep.patch
index 63f197d62..55f39d374 100644
--- a/Spigot-Server-Patches/0375-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0374-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From bfaa56a1a33a379fdda3d38619130764ed4ad235 Mon Sep 17 00:00:00 2001
+From 93be0e0fb65e38208bdb8aa2dac283ea26cbe64e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7c8774d228..633fe836dd 100644
+index 7c8774d22..633fe836d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -510,6 +510,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0376-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0375-Allow-login-events-to-fire-only-after-the-server-plu.patch
similarity index 95%
rename from Spigot-Server-Patches/0376-Allow-login-events-to-fire-only-after-the-server-plu.patch
rename to Spigot-Server-Patches/0375-Allow-login-events-to-fire-only-after-the-server-plu.patch
index d9759e0d0..c91254727 100644
--- a/Spigot-Server-Patches/0376-Allow-login-events-to-fire-only-after-the-server-plu.patch
+++ b/Spigot-Server-Patches/0375-Allow-login-events-to-fire-only-after-the-server-plu.patch
@@ -1,4 +1,4 @@
-From 0205cbc9519bee3f5784461c33abda37b125ea75 Mon Sep 17 00:00:00 2001
+From 1acdff4c1ace95e07eed3a1fa5552ffd6af2e7f9 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 31 Mar 2019 22:02:24 -0700
 Subject: [PATCH] Allow login events to fire only after the server plugins are
@@ -7,7 +7,7 @@ Subject: [PATCH] Allow login events to fire only after the server plugins are
 Event threads will simply block until they're ready to accept.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 9e4bc24058..028c23dbe6 100644
+index 9e4bc2405..028c23dbe 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -285,6 +285,36 @@ public class LoginListener implements PacketLoginInListener {
@@ -56,7 +56,7 @@ index 9e4bc24058..028c23dbe6 100644
                              java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress();
                              java.util.UUID uniqueId = i.getId();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1e2f2f8b99..55e8db8a09 100644
+index 1e2f2f8b9..55e8db8a0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -461,6 +461,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0377-Make-region-files-more-reliable-to-write-to.patch b/Spigot-Server-Patches/0376-Make-region-files-more-reliable-to-write-to.patch
similarity index 98%
rename from Spigot-Server-Patches/0377-Make-region-files-more-reliable-to-write-to.patch
rename to Spigot-Server-Patches/0376-Make-region-files-more-reliable-to-write-to.patch
index 63f1c2763..0e8ee4f01 100644
--- a/Spigot-Server-Patches/0377-Make-region-files-more-reliable-to-write-to.patch
+++ b/Spigot-Server-Patches/0376-Make-region-files-more-reliable-to-write-to.patch
@@ -1,4 +1,4 @@
-From 187082f3ce061f23e4ce1966e1dc348965d8b92c Mon Sep 17 00:00:00 2001
+From 2f08771d032a5ee74cd9f9edb463001f8be57f75 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 1 Apr 2019 18:57:32 -0700
 Subject: [PATCH] Make region files more reliable to write to
@@ -37,7 +37,7 @@ affect save performance if the startup flag is used (especially on
 HDDs).
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index ed2ccebb23..2e14d84657 100644
+index ed2ccebb2..2e14d8465 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -29,7 +29,7 @@ public class RegionFile implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0378-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0377-Optimize-GameRules-to-use-LinkedHashMap.patch
similarity index 93%
rename from Spigot-Server-Patches/0378-Optimize-GameRules-to-use-LinkedHashMap.patch
rename to Spigot-Server-Patches/0377-Optimize-GameRules-to-use-LinkedHashMap.patch
index 7acff2dd9..0f4343e59 100644
--- a/Spigot-Server-Patches/0378-Optimize-GameRules-to-use-LinkedHashMap.patch
+++ b/Spigot-Server-Patches/0377-Optimize-GameRules-to-use-LinkedHashMap.patch
@@ -1,4 +1,4 @@
-From efc767ace0707d871f995b3968bb25840757c5d8 Mon Sep 17 00:00:00 2001
+From e7b57e7f31ad9a9dc6d845cbd3e6ee5843b54d4a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 4 Apr 2019 17:55:05 -0700
 Subject: [PATCH] Optimize GameRules to use LinkedHashMap
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize GameRules to use LinkedHashMap
 Previously TreeMap was used which has poor get(K) performance.
 
 diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java
-index 2880de7c58..d567f35bde 100644
+index 2880de7c5..d567f35bd 100644
 --- a/src/main/java/net/minecraft/server/GameRules.java
 +++ b/src/main/java/net/minecraft/server/GameRules.java
 @@ -21,9 +21,7 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/0379-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0378-Optimize-Captured-TileEntity-Lookup.patch
similarity index 93%
rename from Spigot-Server-Patches/0379-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0378-Optimize-Captured-TileEntity-Lookup.patch
index ffdcd7273..38810c855 100644
--- a/Spigot-Server-Patches/0379-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0378-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 1456f6ca40ac1399fa4d2bda1f8ae6e399bf4663 Mon Sep 17 00:00:00 2001
+From 123f34e27d522d3b77cb0453131e63dcf70d66fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3269d095b7..b1b2766838 100644
+index 3269d095b..b1b276683 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1081,12 +1081,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0380-Add-Heightmap-API.patch b/Spigot-Server-Patches/0379-Add-Heightmap-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0380-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0379-Add-Heightmap-API.patch
index acdf3eda2..af9bb11f5 100644
--- a/Spigot-Server-Patches/0380-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0379-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From d7be329161f59fdbff80bdee18d43e6a1c7133ca Mon Sep 17 00:00:00 2001
+From 49781ff49b3a779f5b3ef405b90a9ded8b6f78a5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
diff --git a/Spigot-Server-Patches/0381-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0380-Handle-bad-chunks-more-gracefully.patch
similarity index 96%
rename from Spigot-Server-Patches/0381-Handle-bad-chunks-more-gracefully.patch
rename to Spigot-Server-Patches/0380-Handle-bad-chunks-more-gracefully.patch
index eebbbed04..33247d444 100644
--- a/Spigot-Server-Patches/0381-Handle-bad-chunks-more-gracefully.patch
+++ b/Spigot-Server-Patches/0380-Handle-bad-chunks-more-gracefully.patch
@@ -1,4 +1,4 @@
-From d4fe06e3cd18d2641e6c122be28f45a0e365fc5a Mon Sep 17 00:00:00 2001
+From 96f3acb24d5e57d46f5bfdcc49c6aeddc4b776e5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully
@@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change
 will simply defer to whatever that new behavior is.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index c53518a477..6f34d8aea0 100644
+index c53518a47..6f34d8aea 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -171,8 +171,21 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0382-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0381-Mob-Spawner-API-Enhancements.patch
similarity index 97%
rename from Spigot-Server-Patches/0382-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0381-Mob-Spawner-API-Enhancements.patch
index f0ca17b63..e69dff080 100644
--- a/Spigot-Server-Patches/0382-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0381-Mob-Spawner-API-Enhancements.patch
@@ -1,11 +1,11 @@
-From 60d615efa76e8bfa234a5e56b83c005bd50fc697 Mon Sep 17 00:00:00 2001
+From 807978d725e4eee44a42be64d4cdb626d1e07fab Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 079099e308..b05f6c2f2b 100644
+index 079099e30..b05f6c2f2 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -46,6 +46,7 @@ public abstract class MobSpawnerAbstract {
@@ -82,7 +82,7 @@ index 079099e308..b05f6c2f2b 100644
              nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
              nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index 5c4c3c70c7..e78e3804ba 100644
+index 5c4c3c70c..e78e3804b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<TileEntityMobSpa
diff --git a/Spigot-Server-Patches/0383-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0382-Per-Player-View-Distance-API-placeholders.patch
similarity index 95%
rename from Spigot-Server-Patches/0383-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0382-Per-Player-View-Distance-API-placeholders.patch
index 29c335b44..43d0f9485 100644
--- a/Spigot-Server-Patches/0383-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0382-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From c73a49dd5113d4eee1f8db9938ddbd3d3a49969b Mon Sep 17 00:00:00 2001
+From 8e10e76ab1c4034fb112ce4a9539634b63133a08 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders
@@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable.
 However this should not block the update.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 8dc849ca14..bec173e411 100644
+index 8dc849ca1..bec173e41 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -570,9 +570,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -23,7 +23,7 @@ index 8dc849ca14..bec173e411 100644
                      double deltaX = this.locX - player.locX;
                      double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index ee1b0a8846..b3c7f8814c 100644
+index ee1b0a884..b3c7f8814 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -39,7 +39,7 @@ index ee1b0a8846..b3c7f8814c 100644
                      double deltaX = this.locX - player.locX;
                      double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9cf6330ab6..c94944dfe0 100644
+index 9cf6330ab..c94944dfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1983,6 +1983,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0384-Async-Chunk-placeholder.patch b/Spigot-Server-Patches/0383-Async-Chunk-placeholder.patch
similarity index 97%
rename from Spigot-Server-Patches/0384-Async-Chunk-placeholder.patch
rename to Spigot-Server-Patches/0383-Async-Chunk-placeholder.patch
index 5aad16154..22064cf81 100644
--- a/Spigot-Server-Patches/0384-Async-Chunk-placeholder.patch
+++ b/Spigot-Server-Patches/0383-Async-Chunk-placeholder.patch
@@ -1,4 +1,4 @@
-From b96f6c349b21a28bfa6e27696bcde0cbef8cfc32 Mon Sep 17 00:00:00 2001
+From 7ebb35d8c2770905da9294503d5cbdffe4306c0b Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 6 May 2019 12:29:24 -0700
 Subject: [PATCH] Async Chunk placeholder
diff --git a/Spigot-Server-Patches/0385-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0384-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 88%
rename from Spigot-Server-Patches/0385-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0384-Fix-CB-call-to-changed-postToMainThread-method.patch
index 46fa1dbf0..7a920e004 100644
--- a/Spigot-Server-Patches/0385-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0384-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,11 +1,11 @@
-From 1407072a69d2e05cd59d6ca1e6a98821fa7ffefb Mon Sep 17 00:00:00 2001
+From 464bd0229ccd85691e8a684f19a7f0f0ca58f760 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dda8196702..6d6e50313e 100644
+index e4c0fa424..87639793a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -282,7 +282,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0386-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0385-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 92%
rename from Spigot-Server-Patches/0386-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0385-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index e612fa408..de4dee47b 100644
--- a/Spigot-Server-Patches/0386-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0385-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From 430f4cb416f5bdad20843b5ad82884f328c18b4a Mon Sep 17 00:00:00 2001
+From 84aca89d4956582b0bf267b2ec29f3824e01bd8f Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 9eaf57d2c9..50ca7b9d26 100644
+index 9eaf57d2c..50ca7b9d2 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -211,7 +211,7 @@ public class EntityItemFrame extends EntityHanging {
@@ -19,7 +19,7 @@ index 9eaf57d2c9..50ca7b9d26 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 799036f268..9ad180d946 100644
+index 799036f26..9ad180d94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
diff --git a/Spigot-Server-Patches/0387-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0386-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 93%
rename from Spigot-Server-Patches/0387-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0386-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 422d1b45f..2741483d5 100644
--- a/Spigot-Server-Patches/0387-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0386-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -1,4 +1,4 @@
-From 3300890154bbdef3feda0acc53169e42a07d363c Mon Sep 17 00:00:00 2001
+From 704dc183301d41a6b35373938cc7297003ec8f9d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 55e8db8a09..8136a97f44 100644
+index 55e8db8a0..8136a97f4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1943,7 +1943,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -29,7 +29,7 @@ index 55e8db8a09..8136a97f44 100644
  
      @Deprecated
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f378dc8c86..126b4799bf 100644
+index d2882933d..cba4ef0e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1663,7 +1663,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0389-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0387-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0389-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0387-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index 7de51f56d..1868752c0 100644
--- a/Spigot-Server-Patches/0389-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0387-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 80795b11a3129f541ec73a1a0bb78cda48bc981d Mon Sep 17 00:00:00 2001
+From 904592f923ae6f4eafd898713079b1698c7ed994 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
@@ -19,7 +19,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/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f992fc34c3..8d5a291d7c 100644
+index f992fc34c..8d5a291d7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -636,7 +636,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0390-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0388-Duplicate-UUID-Resolve-Option.patch
similarity index 97%
rename from Spigot-Server-Patches/0390-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0388-Duplicate-UUID-Resolve-Option.patch
index 028ad2cca..c0015b05d 100644
--- a/Spigot-Server-Patches/0390-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0388-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 1d1186470d0999939e32bee2870c4714da2fda0a Mon Sep 17 00:00:00 2001
+From 2f7ecd9c77aa0bef58c44a13c4cf3776e47e406f 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
@@ -93,10 +93,10 @@ index 099f0ad78..5bf781bb6 100644
  
          int k = MathHelper.floor(entity.locY / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c5ba24f27..b2a2090e7 100644
+index 04d4f358f..bece9a16b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2727,6 +2727,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2728,6 +2728,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
@@ -105,7 +105,7 @@ index c5ba24f27..b2a2090e7 100644
          this.uniqueID = uuid;
          this.ap = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9aad0c6b9..f003d5a1f 100644
+index 6d5b34980..80458bd19 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,6 +1,7 @@
@@ -132,7 +132,7 @@ index 9aad0c6b9..f003d5a1f 100644
  import java.util.concurrent.CompletableFuture;
  import java.util.concurrent.Executor;
  import java.util.concurrent.atomic.AtomicInteger;
-@@ -561,12 +565,49 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -586,12 +590,49 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
  
                      for (int j = 0; j < i; ++j) {
                          List<Entity> entityslice = aentityslice[j]; // Spigot
@@ -186,7 +186,7 @@ index 9aad0c6b9..f003d5a1f 100644
                                  if (list == null) {
                                      list = Lists.newArrayList(new Entity[]{entity});
                                  } else {
-@@ -574,6 +615,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -599,6 +640,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                                  }
                              }
                          }
diff --git a/Spigot-Server-Patches/0388-Elide-lock-in-DataWatcher.patch b/Spigot-Server-Patches/0388-Elide-lock-in-DataWatcher.patch
deleted file mode 100644
index 98545c005..000000000
--- a/Spigot-Server-Patches/0388-Elide-lock-in-DataWatcher.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 9a63accf40739afe2ad4551bf6e2ac7e4eb9c4f2 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sat, 11 May 2019 08:19:27 -0700
-Subject: [PATCH] Elide lock in DataWatcher
-
-The lock in DataWatcher is used to prevent concurrent modifications
-to the 'd' field (entries in MCP). However any modifications to
-this map only occur on initialization of an Entity in its
-constructor. This modification is write-locked.
-
-Every other access is through a readlock, which allows
-the threads to pass if there is no thread holding the
-writelock.
-
-Since the writelock is only obtained in the constructor
-of the Entity, the further readlocks are actually
-useless (which get obtained on set, get, etc calls).
-
-diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index f224043d8e..bbea8ef726 100644
---- a/src/main/java/net/minecraft/server/DataWatcher.java
-+++ b/src/main/java/net/minecraft/server/DataWatcher.java
-@@ -23,7 +23,7 @@ public class DataWatcher {
-     private static final Map<Class<? extends Entity>, Integer> b = Maps.newHashMap();
-     private final Entity c;
-     private final Int2ObjectOpenHashMap<DataWatcher.Item<?>> d = new Int2ObjectOpenHashMap<>(); // Paper
--    private final ReadWriteLock e = new ReentrantReadWriteLock();
-+    //private final ReadWriteLock e = new ReentrantReadWriteLock(); // Paper - not required
-     private boolean f = true;
-     private boolean g;
- 
-@@ -88,30 +88,14 @@ public class DataWatcher {
-     private <T> void registerObject(DataWatcherObject<T> datawatcherobject, T t0) {
-         DataWatcher.Item<T> datawatcher_item = new DataWatcher.Item<>(datawatcherobject, t0);
- 
--        this.e.writeLock().lock();
-+        //this.e.writeLock().lock(); // Paper - not required
-         this.d.put(datawatcherobject.a(), datawatcher_item);
-         this.f = false;
--        this.e.writeLock().unlock();
-+        //this.e.writeLock().unlock(); // Paper - not required
-     }
- 
-     private <T> DataWatcher.Item<T> b(DataWatcherObject<T> datawatcherobject) {
--        this.e.readLock().lock();
--
--        DataWatcher.Item datawatcher_item;
--
--        try {
--            datawatcher_item = (DataWatcher.Item) this.d.get(datawatcherobject.a());
--        } catch (Throwable throwable) {
--            CrashReport crashreport = CrashReport.a(throwable, "Getting synched entity data");
--            CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Synched entity data");
--
--            crashreportsystemdetails.a("Data ID", (Object) datawatcherobject);
--            throw new ReportedException(crashreport);
--        } finally {
--            this.e.readLock().unlock();
--        }
--
--        return datawatcher_item;
-+        return (DataWatcher.Item<T>)this.d.get(datawatcherobject.a()); // Paper - avoid lock and try catch, get() does not fail
-     }
- 
-     public <T> T get(DataWatcherObject<T> datawatcherobject) {
-@@ -158,7 +142,7 @@ public class DataWatcher {
-         List<DataWatcher.Item<?>> list = null;
- 
-         if (this.g) {
--            this.e.readLock().lock();
-+            //this.e.readLock().lock(); // Paper - not required
-             Iterator iterator = this.d.values().iterator();
- 
-             while (iterator.hasNext()) {
-@@ -174,7 +158,7 @@ public class DataWatcher {
-                 }
-             }
- 
--            this.e.readLock().unlock();
-+            //this.e.readLock().unlock(); // Paper - not required
-         }
- 
-         this.g = false;
-@@ -182,7 +166,7 @@ public class DataWatcher {
-     }
- 
-     public void a(PacketDataSerializer packetdataserializer) throws IOException {
--        this.e.readLock().lock();
-+        //this.e.readLock().lock(); // Paper - not required
-         Iterator iterator = this.d.values().iterator();
- 
-         while (iterator.hasNext()) {
-@@ -191,7 +175,7 @@ public class DataWatcher {
-             a(packetdataserializer, datawatcher_item);
-         }
- 
--        this.e.readLock().unlock();
-+        //this.e.readLock().unlock(); // Paper - not required
-         packetdataserializer.writeByte(255);
-     }
- 
-@@ -199,7 +183,7 @@ public class DataWatcher {
-     public List<DataWatcher.Item<?>> c() {
-         List<DataWatcher.Item<?>> list = null;
- 
--        this.e.readLock().lock();
-+        //this.e.readLock().lock(); // Paper - not required
- 
-         DataWatcher.Item datawatcher_item;
- 
-@@ -210,7 +194,7 @@ public class DataWatcher {
-             }
-         }
- 
--        this.e.readLock().unlock();
-+        //this.e.readLock().unlock(); // Paper - not required
-         return list;
-     }
- 
-@@ -261,7 +245,7 @@ public class DataWatcher {
- 
-     public void e() {
-         this.g = false;
--        this.e.readLock().lock();
-+        //this.e.readLock().lock(); // Paper - not required
-         Iterator iterator = this.d.values().iterator();
- 
-         while (iterator.hasNext()) {
-@@ -270,7 +254,7 @@ public class DataWatcher {
-             datawatcher_item.a(false);
-         }
- 
--        this.e.readLock().unlock();
-+        //this.e.readLock().unlock(); // Paper - not required
-     }
- 
-     public static class Item<T> {
--- 
-2.22.0
-
diff --git a/Spigot-Server-Patches/0391-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0389-improve-CraftWorld-isChunkLoaded.patch
similarity index 96%
rename from Spigot-Server-Patches/0391-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0389-improve-CraftWorld-isChunkLoaded.patch
index d103ce022..a1a97a9fe 100644
--- a/Spigot-Server-Patches/0391-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0389-improve-CraftWorld-isChunkLoaded.patch
@@ -1,4 +1,4 @@
-From 9ce159915da547f8cf749c4dfe600ab4920a3965 Mon Sep 17 00:00:00 2001
+From c47f58d8e307a777fa66b205fc5f4aaa3878edc0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded
diff --git a/Spigot-Server-Patches/0392-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0390-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from Spigot-Server-Patches/0392-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0390-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 75d2a4ede..c93761899 100644
--- a/Spigot-Server-Patches/0392-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0390-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 1fa3ddc303c246d774f2c9f7c3547bb5e419a55a Mon Sep 17 00:00:00 2001
+From 29a021276a96821a7c49c95a1c48c207d8395a17 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
diff --git a/Spigot-Server-Patches/0393-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0391-Fix-some-generation-concurrency-issues.patch
similarity index 98%
rename from Spigot-Server-Patches/0393-Fix-some-generation-concurrency-issues.patch
rename to Spigot-Server-Patches/0391-Fix-some-generation-concurrency-issues.patch
index 6f0a1659c..dcf7ef95a 100644
--- a/Spigot-Server-Patches/0393-Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0391-Fix-some-generation-concurrency-issues.patch
@@ -1,11 +1,11 @@
-From 17d05aa6301af9a703e4c69765952d19a0b97e95 Mon Sep 17 00:00:00 2001
+From b702eef95eabfe9dcc0dd66df1844fc26399ae47 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues
 
 
 diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
-index 6aa0ca3959..ed9b5c63f0 100644
+index 6aa0ca395..ed9b5c63f 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
 @@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger;
@@ -18,7 +18,7 @@ index 6aa0ca3959..ed9b5c63f0 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0acdb527d9..a7a35d6a6f 100644
+index 2eed9c2ec..f0e8acdd1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -101,6 +101,23 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -46,7 +46,7 @@ index 0acdb527d9..a7a35d6a6f 100644
      public CraftWorld getWorld() {
          return this.world;
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index eca27e52e9..fb3463fcce 100644
+index eca27e52e..fb3463fcc 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -10,10 +10,12 @@ import javax.annotation.Nullable;
diff --git a/Spigot-Server-Patches/0394-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0392-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 89%
rename from Spigot-Server-Patches/0394-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0392-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
index 467f11841..8039c0dab 100644
--- a/Spigot-Server-Patches/0394-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
+++ b/Spigot-Server-Patches/0392-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
@@ -1,4 +1,4 @@
-From 54f4930b7cd6600236f396fef373e1a237e74d01 Mon Sep 17 00:00:00 2001
+From 0db4362777bedd00a46bf8f23c2efd2e880cbb52 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 27 May 2019 17:35:39 -0500
 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
@@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
-index 70c2820463..8bbbe8505f 100644
+index 70c282046..8bbbe8505 100644
 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 @@ -163,6 +163,12 @@ public class EntityAreaEffectCloud extends Entity {
diff --git a/Spigot-Server-Patches/0395-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0393-ChunkMapDistance-CME.patch
similarity index 54%
rename from Spigot-Server-Patches/0395-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0393-ChunkMapDistance-CME.patch
index 31cca37d4..d4c53f460 100644
--- a/Spigot-Server-Patches/0395-ChunkMapDistance-CME.patch
+++ b/Spigot-Server-Patches/0393-ChunkMapDistance-CME.patch
@@ -1,32 +1,47 @@
-From 1766a8a8d59788875641888455fa5e44b0e1aaf3 Mon Sep 17 00:00:00 2001
+From 5c4cd1ff04671b21a3b9b30091e5dcb9306decfa Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 29 May 2019 04:01:22 +0100
 Subject: [PATCH] ChunkMapDistance CME
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index ed4e8d69ca..a116826490 100644
+index a116ee128..8572eeba1 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -36,7 +36,7 @@ public abstract class ChunkMapDistance {
      private final ChunkMapDistance.a e = new ChunkMapDistance.a();
      private final ChunkMapDistance.b f = new ChunkMapDistance.b(8);
      private final ChunkMapDistance.c g = new ChunkMapDistance.c(33);
--    private final Set<PlayerChunk> h = Sets.newHashSet();
-+    private final java.util.Queue<PlayerChunk> h = new java.util.LinkedList<>(); // Paper - use a queue
+-    private final Set<PlayerChunk> h = Sets.newHashSet(); // PAIL pendingChunkUpdates
++    private final java.util.Queue<PlayerChunk> h = new java.util.LinkedList<>(); // PAIL pendingChunkUpdates // Paper - use a queue
      private final PlayerChunk.c i;
      private final Mailbox<ChunkTaskQueueSorter.a<Runnable>> j;
      private final Mailbox<ChunkTaskQueueSorter.b> k;
-@@ -98,11 +98,12 @@ public abstract class ChunkMapDistance {
+@@ -98,26 +98,12 @@ public abstract class ChunkMapDistance {
              ;
          }
  
 +        // Paper start
          if (!this.h.isEmpty()) {
--            this.h.forEach((playerchunk) -> {
+-            // CraftBukkit start
+-            // Iterate pending chunk updates with protection against concurrent modification exceptions
+-            java.util.Iterator<PlayerChunk> iter = this.h.iterator();
+-            int expectedSize = this.h.size();
+-            do {
+-                PlayerChunk playerchunk = iter.next();
+-                iter.remove();
+-                expectedSize--;
+-
 -                playerchunk.a(playerchunkmap);
--            });
--            this.h.clear();
+-
+-                // Reset iterator if set was modified using add()
+-                if (this.h.size() != expectedSize) {
+-                    expectedSize = this.h.size();
+-                    iter = this.h.iterator();
+-                }
+-            } while (iter.hasNext());
+-            // CraftBukkit end
+-
 +            while(!this.h.isEmpty()) {
 +                this.h.remove().a(playerchunkmap);
 +            }
diff --git a/Spigot-Server-Patches/0396-Actually-Limit-Natural-Spawns-To-Limit.patch b/Spigot-Server-Patches/0394-Actually-Limit-Natural-Spawns-To-Limit.patch
similarity index 98%
rename from Spigot-Server-Patches/0396-Actually-Limit-Natural-Spawns-To-Limit.patch
rename to Spigot-Server-Patches/0394-Actually-Limit-Natural-Spawns-To-Limit.patch
index ca60bf734..45e3ad09f 100644
--- a/Spigot-Server-Patches/0396-Actually-Limit-Natural-Spawns-To-Limit.patch
+++ b/Spigot-Server-Patches/0394-Actually-Limit-Natural-Spawns-To-Limit.patch
@@ -1,11 +1,11 @@
-From 55ddc6f54f09251d01ec96037f6255769034f70d Mon Sep 17 00:00:00 2001
+From 48800619192cdbcfc363f9c1d59277c00acaf081 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Sun, 2 Jun 2019 01:22:02 -0400
 Subject: [PATCH] Actually-Limit-Natural-Spawns-To-Limit
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 43da95e60..49b8c1187 100644
+index cafa244fd..9ea7fb91f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -414,8 +414,12 @@ public class ChunkProviderServer extends IChunkProvider {
diff --git a/Spigot-Server-Patches/0397-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0395-Implement-CraftBlockSoundGroup.patch
similarity index 95%
rename from Spigot-Server-Patches/0397-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0395-Implement-CraftBlockSoundGroup.patch
index 40cb9292f..a936377b7 100644
--- a/Spigot-Server-Patches/0397-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0395-Implement-CraftBlockSoundGroup.patch
@@ -1,4 +1,4 @@
-From 220ea5e21e7221f25a82fbd23124246fca285558 Mon Sep 17 00:00:00 2001
+From 8a5e1a0c5fad02c4e6e11e34315cfcccc9c9babe Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement CraftBlockSoundGroup
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
 new file mode 100644
-index 0000000000..99f99330d0
+index 000000000..99f99330d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 0000000000..99f99330d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index d25989d514..b8efff8774 100644
+index d25989d51..b8efff877 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -271,6 +271,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -61,7 +61,7 @@ index d25989d514..b8efff8774 100644
          return this.getBlock().getStepSound(this);
      }
 diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java
-index 5460d409b7..ccd5b0529a 100644
+index 5460d409b..ccd5b0529 100644
 --- a/src/main/java/net/minecraft/server/SoundEffectType.java
 +++ b/src/main/java/net/minecraft/server/SoundEffectType.java
 @@ -26,10 +26,10 @@ public class SoundEffectType {
@@ -96,7 +96,7 @@ index 5460d409b7..ccd5b0529a 100644
          return this.C;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 166c918d73..5296c6d9bf 100644
+index 166c918d7..5296c6d9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -689,4 +689,11 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0398-Chunk-debug-command.patch b/Spigot-Server-Patches/0396-Chunk-debug-command.patch
similarity index 99%
rename from Spigot-Server-Patches/0398-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0396-Chunk-debug-command.patch
index 439b57023..8aad7d2b1 100644
--- a/Spigot-Server-Patches/0398-Chunk-debug-command.patch
+++ b/Spigot-Server-Patches/0396-Chunk-debug-command.patch
@@ -1,4 +1,4 @@
-From 8befd3b3ec4606c96161450e60dc63ca5d7d1c8e Mon Sep 17 00:00:00 2001
+From 57b19fdcd751814e1d077ee295c73afaac3fdb90 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Jun 2019 13:00:55 -0700
 Subject: [PATCH] Chunk debug command
@@ -185,7 +185,7 @@ index 391726d99..8db92edc3 100644
       * Ported from MinecraftForge - author: LexManos <LexManos@gmail.com> - License: LGPLv2.1
       */
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 4c3bcb63d..630feec16 100644
+index 9ea7fb91f..f2fd568d6 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
@@ -399,7 +399,7 @@ index ec3732193..23d1935dd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 5599d0e71..0daf5f99e 100644
+index bbc55c35c..a73c59b43 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -26,7 +26,7 @@ public class PlayerChunk {
@@ -412,7 +412,7 @@ index 5599d0e71..0daf5f99e 100644
      private int dirtyCount;
      private int r;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 171c3b4b1..a259f3582 100644
+index 80458bd19..dee926212 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -52,7 +52,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0399-incremental-chunk-saving.patch b/Spigot-Server-Patches/0397-incremental-chunk-saving.patch
similarity index 96%
rename from Spigot-Server-Patches/0399-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0397-incremental-chunk-saving.patch
index 03e72c023..06cf1213e 100644
--- a/Spigot-Server-Patches/0399-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0397-incremental-chunk-saving.patch
@@ -1,11 +1,11 @@
-From 949f2527fabd68a0cf88736b6d81a25bfab1cd43 Mon Sep 17 00:00:00 2001
+From f8f05a94746e3c53cd0829470615d47b0e65d930 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index de11a91af6..4d3c6c6b47 100644
+index de11a91af..4d3c6c6b4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -489,4 +489,19 @@ public class PaperWorldConfig {
@@ -29,7 +29,7 @@ index de11a91af6..4d3c6c6b47 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 5bf781bb63..e2a48695df 100644
+index 5bf781bb6..e2a48695d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -42,7 +42,7 @@ public class Chunk implements IChunkAccess {
@@ -42,7 +42,7 @@ index 5bf781bb63..e2a48695df 100644
      private long t;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d6c99ce897..2b99fdc630 100644
+index d6c99ce89..2b99fdc63 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -155,6 +155,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -86,10 +86,10 @@ index d6c99ce897..2b99fdc630 100644
          this.methodProfiler.enter("snooper");
          if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index d85220b66c..c4ad039ffd 100644
+index dee926212..a3e989f2b 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -293,15 +293,32 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -318,15 +318,32 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
              });
              PlayerChunkMap.LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", this.x.getName());
          } else {
@@ -126,7 +126,7 @@ index d85220b66c..c4ad039ffd 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5eeec7be76..c646393eb0 100644
+index 5eeec7be7..c646393eb 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -756,8 +756,9 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0400-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0398-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 92%
rename from Spigot-Server-Patches/0400-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0398-Catch-exceptions-from-dispenser-entity-spawns.patch
index ab7395949..9fa94ad04 100644
--- a/Spigot-Server-Patches/0400-Catch-exceptions-from-dispenser-entity-spawns.patch
+++ b/Spigot-Server-Patches/0398-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -1,11 +1,11 @@
-From 99d2f6b48bc76d65b79f71a609e62f8f35ca65a4 Mon Sep 17 00:00:00 2001
+From 8de38ed0e2f97ee19ed4a95c79c9fe3814189cd2 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 10 Jun 2019 09:36:40 +0100
 Subject: [PATCH] Catch exceptions from dispenser entity spawns
 
 
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index 60442e4b8a..1874b5d252 100644
+index 60442e4b8..1874b5d25 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
 @@ -163,7 +163,14 @@ public interface IDispenseBehavior {
diff --git a/Spigot-Server-Patches/0401-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0399-Fix-World-isChunkGenerated-calls.patch
similarity index 98%
rename from Spigot-Server-Patches/0401-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0399-Fix-World-isChunkGenerated-calls.patch
index ef7df9cd8..456088cc7 100644
--- a/Spigot-Server-Patches/0401-Fix-World-isChunkGenerated-calls.patch
+++ b/Spigot-Server-Patches/0399-Fix-World-isChunkGenerated-calls.patch
@@ -1,4 +1,4 @@
-From 56ad1b929e7dcae4e58f7d68c31c749ace2e2b1e Mon Sep 17 00:00:00 2001
+From 925d47e674b12fe7c0286a433ceea07bc35d2de7 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 08:54:33 -0700
 Subject: [PATCH] Fix World#isChunkGenerated calls
@@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that
 its only purpose is to cache the status on DISK)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index fef44094b..539c65f85 100644
+index f2fd568d6..d76860daf 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -27,7 +27,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -110,7 +110,7 @@ index dd1822d6f..e324989b4 100644
          return (ChunkStatus) IRegistry.CHUNK_STATUS.get(MinecraftKey.a(s));
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 0daf5f99e..761cd1355 100644
+index a73c59b43..f0203d53c 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -70,6 +70,19 @@ public class PlayerChunk {
@@ -134,10 +134,10 @@ index 0daf5f99e..761cd1355 100644
  
      public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 884c8a908..e2f8b18d9 100644
+index a3e989f2b..4cf58e5ea 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -807,11 +807,56 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -832,11 +832,56 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
      }
  
      @Nullable
diff --git a/Spigot-Server-Patches/0402-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0400-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 93%
rename from Spigot-Server-Patches/0402-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0400-Show-blockstate-location-if-we-failed-to-read-it.patch
index dee08cc50..1b5459795 100644
--- a/Spigot-Server-Patches/0402-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/0400-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -1,11 +1,11 @@
-From e18d697a9b1acbef9dcdd703f013680aed93e13f Mon Sep 17 00:00:00 2001
+From 31c9a4172fc9e0a46765b5007ee7c8fee7b91700 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 10:28:25 -0700
 Subject: [PATCH] Show blockstate location if we failed to read it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index f6401e2cde..3e22d558ea 100644
+index f6401e2cd..3e22d558e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -19,6 +19,8 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
diff --git a/Spigot-Server-Patches/0403-Fix-MC-154214.patch b/Spigot-Server-Patches/0401-Fix-MC-154214.patch
similarity index 95%
rename from Spigot-Server-Patches/0403-Fix-MC-154214.patch
rename to Spigot-Server-Patches/0401-Fix-MC-154214.patch
index a79655e61..8c047ec20 100644
--- a/Spigot-Server-Patches/0403-Fix-MC-154214.patch
+++ b/Spigot-Server-Patches/0401-Fix-MC-154214.patch
@@ -1,4 +1,4 @@
-From af0d14664907ee01ca8462ecf282c3c46d8941ef Mon Sep 17 00:00:00 2001
+From acf788a1f3141b0189dcf5ea94646ccd98173f7a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 16 Jun 2019 23:30:25 -0700
 Subject: [PATCH] Fix MC-154214
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix MC-154214
 Avoid adding player tickets when they're out of range of the closest player
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 99c7537ef2..757b505eaf 100644
+index 8572eeba1..d72eacaec 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -359,12 +359,18 @@ public abstract class ChunkMapDistance {
diff --git a/Spigot-Server-Patches/0404-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0402-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
similarity index 95%
rename from Spigot-Server-Patches/0404-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
rename to Spigot-Server-Patches/0402-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
index 4fa569d4c..60e4892fc 100644
--- a/Spigot-Server-Patches/0404-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
+++ b/Spigot-Server-Patches/0402-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
@@ -1,4 +1,4 @@
-From 3a9c341e260ea3e1be77c63e4d6c96dbca8dd4f2 Mon Sep 17 00:00:00 2001
+From 56c01c75fb6c0bb78a860f3e3fd3a39072c72077 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 21 Jun 2019 14:42:48 -0700
 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
@@ -6,7 +6,7 @@ Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
 new file mode 100644
-index 0000000000..a3b174618d
+index 000000000..a3b174618
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
 @@ -0,0 +1,11 @@
@@ -22,7 +22,7 @@ index 0000000000..a3b174618d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 28a6be7ab0..e05b9d606a 100644
+index 28a6be7ab..e05b9d606 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -19,14 +19,17 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {
diff --git a/Spigot-Server-Patches/0405-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0403-Use-ChunkStatus-cache-when-saving-protochunks.patch
similarity index 88%
rename from Spigot-Server-Patches/0405-Use-ChunkStatus-cache-when-saving-protochunks.patch
rename to Spigot-Server-Patches/0403-Use-ChunkStatus-cache-when-saving-protochunks.patch
index ff632af49..9f2ffde9d 100644
--- a/Spigot-Server-Patches/0405-Use-ChunkStatus-cache-when-saving-protochunks.patch
+++ b/Spigot-Server-Patches/0403-Use-ChunkStatus-cache-when-saving-protochunks.patch
@@ -1,4 +1,4 @@
-From ba7006117301143d6877b70bfd4f0043feb4fa5d Mon Sep 17 00:00:00 2001
+From 8a07db03b2e5b40c290abe1193fe7766ad0b8a44 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 22 Jun 2019 04:20:47 -0700
 Subject: [PATCH] Use ChunkStatus cache when saving protochunks
@@ -7,10 +7,10 @@ The cache should contain the chunk status when saving. If not it
 will load it.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e2f8b18d9..7cb5438e4 100644
+index 4cf58e5ea..d68c89817 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -723,8 +723,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -748,8 +748,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  NBTTagCompound nbttagcompound;
  
                  if (chunkstatus.getType() != ChunkStatus.Type.LEVELCHUNK) {
diff --git a/Spigot-Server-Patches/0406-Anti-Xray.patch b/Spigot-Server-Patches/0404-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0406-Anti-Xray.patch
rename to Spigot-Server-Patches/0404-Anti-Xray.patch
index f8ab1f3d3..3e78319ce 100644
--- a/Spigot-Server-Patches/0406-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0404-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From 3db1a7a3ad9eac4b9e25423bad3a4281d2cdcba5 Mon Sep 17 00:00:00 2001
+From 4832eff72f16e69dea647a4cbd70f8bca3329f1d 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
@@ -1540,7 +1540,7 @@ index ef71a1feb..483317608 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 761cd1355..956a47132 100644
+index f0203d53c..b455b6102 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -154,6 +154,11 @@ public class PlayerChunk {
@@ -1565,10 +1565,10 @@ index 761cd1355..956a47132 100644
                  this.a(new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, chunk), false);
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 7cb5438e4..a43927781 100644
+index d68c89817..89b72da82 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -494,7 +494,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -519,7 +519,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  PlayerChunkMap.LOGGER.error("Couldn't load chunk {}", chunkcoordintpair, exception);
              }
  
@@ -1577,7 +1577,7 @@ index 7cb5438e4..a43927781 100644
          }, this.executor);
      }
  
-@@ -1148,7 +1148,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1173,7 +1173,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
  
      private void a(EntityPlayer entityplayer, Packet<?>[] apacket, Chunk chunk) {
          if (apacket[0] == null) {
diff --git a/Spigot-Server-Patches/0407-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0405-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 97%
rename from Spigot-Server-Patches/0407-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0405-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 8bbb9dde3..9bfde2ba1 100644
--- a/Spigot-Server-Patches/0407-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0405-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 47a799afb7b6774c8e7cd964e80aa4d99946826f Mon Sep 17 00:00:00 2001
+From 59dc0ea3ce3eb0ec7abcd18d556c78f8118d5cca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 5f8893885..eb2e65787 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5f88938850e45ce8e79160dd229bcf90681c6ab7
+Subproject commit eb2e657871c7305a09060c56ceb2a93d3ee15009
diff --git a/work/Spigot b/work/Spigot
index 5e4e7f32b..9a643a6af 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 5e4e7f32bcc0af285ad143816949eab877d1f148
+Subproject commit 9a643a6af514ba081c8b828a939bc4eb921a5089