From eeb2ecd7891019280b2f3d6622e559bec4aa8007 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 5 May 2019 19:58:04 -0700
Subject: [PATCH] Update Upstream

---
 Spigot-API-Patches/0001-POM-changes.patch     |  10 +-
 Spigot-API-Patches/0004-Timings-v2.patch      |  41 ++---
 .../0005-Player-affects-spawning-API.patch    |   6 +-
 .../0007-Entity-Origin-API.patch              |   6 +-
 .../0010-Add-player-view-distance-API.patch   |   6 +-
 ...ly-disable-plugins-that-fail-to-load.patch |   6 +-
 ...cord-chat-API-from-spigot-subclasses.patch |   6 +-
 .../0016-Player-Tab-List-and-Title-APIs.patch |   6 +-
 .../0017-Add-exception-reporting-event.patch  |  18 +--
 ...working-with-arrows-stuck-in-living-.patch |   6 +-
 .../0021-Complete-resource-pack-API.patch     |   8 +-
 .../0022-Use-ASM-for-event-executors.patch    |   9 +-
 ...eload-permissions.yml-and-require-co.patch |   6 +-
 ...6-Custom-replacement-for-eaten-items.patch |   6 +-
 .../0027-Access-items-by-EquipmentSlot.patch  |   8 +-
 .../0034-Arrow-pickup-rule-API.patch          |  18 +--
 .../0037-Add-EntityZapEvent.patch             |   8 +-
 ...9-Allow-Reloading-of-Command-Aliases.patch |   6 +-
 ...0042-Add-String-based-Action-Bar-API.patch |  12 +-
 ...rovide-E-TE-Chunk-count-stat-methods.patch |   6 +-
 ...n-option-to-prevent-player-names-fro.patch |   6 +-
 ...upstream-javadoc-warnings-and-errors.patch |  48 +++---
 ...PlayerPickupItemEvent-setFlyAtPlayer.patch |  11 +-
 .../0057-Shoulder-Entities-Release-API.patch  |   6 +-
 .../0059-Entity-fromMobSpawner.patch          |   6 +-
 .../0061-ensureServerConversions-API.patch    |   8 +-
 .../0062-Add-getI18NDisplayName-API.patch     |   6 +-
 ...lay-warning-on-deprecated-recipe-API.patch |  14 +-
 ...7-Ability-to-apply-mending-to-XP-API.patch |   6 +-
 ...-Add-setPlayerProfile-API-for-Skulls.patch |   8 +-
 .../0088-Player.setPlayerProfile-API.patch    |   6 +-
 ...d-method-to-open-already-placed-sign.patch |   6 +-
 ...93-Add-Ban-Methods-to-Player-Objects.patch |  10 +-
 ...tional-world.getNearbyEntities-API-s.patch |   6 +-
 .../0097-Location.isChunkLoaded-API.patch     |   8 +-
 ...ld.spawnParticle-API-and-add-Builder.patch |   6 +-
 ...lose-Plugin-Class-Loaders-on-Disable.patch |  27 ++--
 ...ion.toBlockLocation-toCenterLocation.patch |   8 +-
 ...0106-ItemStack-getMaxItemUseDuration.patch |   6 +-
 ...e-shield-blocking-delay-configurable.patch |   6 +-
 ...Add-getNearbyXXX-methods-to-Location.patch |  10 +-
 .../0113-Expand-Explosions-API.patch          |  24 +--
 ...PI-additions-for-quantity-flags-lore.patch |   6 +-
 ...ivingEntity-Hand-Raised-Item-Use-API.patch |   6 +-
 .../0117-Add-World.getEntity-UUID-API.patch   |   6 +-
 .../0119-Entity-getChunk-API.patch            |   6 +-
 ...dd-an-asterisk-to-legacy-API-plugins.patch |   6 +-
 ...127-Expand-Location-Manipulation-API.patch |   8 +-
 ...deadlock-risk-in-firing-async-events.patch |  32 ++--
 .../0131-Add-hand-to-bucket-events.patch      |   6 +-
 ...vide-Chunk-Coordinates-as-a-Long-API.patch |   6 +-
 .../0134-Async-Chunks-API.patch               |  10 +-
 ...Blocks-to-be-accessed-via-a-long-key.patch |  12 +-
 .../0140-isChunkGenerated-API.patch           |  20 +--
 ...e-attack-cooldown-methods-for-Player.patch |   6 +-
 ...CanPlaceOn-and-CanDestroy-NBT-values.patch |   6 +-
 ...currency-Improvements-to-Permissions.patch |  33 +++--
 .../0156-Add-Material-Tags.patch              |   6 +-
 .../0159-Add-sun-related-API.patch            |   6 +-
 ...tion-supression-of-EntityDismount-Ve.patch |   8 +-
 ...eserved-channel-check-to-be-sensible.patch |  10 +-
 ...-replace-OfflinePlayer-getLastPlayed.patch |   8 +-
 ...-ItemStack-Recipe-API-helper-methods.patch |  10 +-
 .../0175-Entity-getEntitySpawnReason.patch    |   6 +-
 ...lip-some-Spigot-API-null-annotations.patch |  30 ++--
 .../0182-Add-Heightmap-API.patch              |  10 +-
 .../0183-Mob-Spawner-API-Enhancements.patch   |   6 +-
 .../0002-Paper-config-files.patch             |  34 +++--
 Spigot-Server-Patches/0004-MC-Utils.patch     |   8 +-
 ...-MinecraftKey-Information-to-Objects.patch |  22 +--
 ...to-current-Chunk-for-Entity-and-Bloc.patch |  16 +-
 Spigot-Server-Patches/0009-Timings-v2.patch   | 140 +++++++++---------
 ...ck-and-tnt-entities-at-the-specified.patch |   6 +-
 ...ient-crashes-server-lists-and-Mojang.patch |  12 +-
 .../0018-Player-affects-spawning-API.patch    |   8 +-
 ...021-Further-improve-server-tick-loop.patch |  23 +--
 ...022-Only-refresh-abilities-if-needed.patch |   6 +-
 .../0023-Entity-Origin-API.patch              |  26 ++--
 ...event-tile-entity-and-entity-crashes.patch |   8 +-
 ...nfigurable-top-of-nether-void-damage.patch |  10 +-
 .../0028-Configurable-end-credits.patch       |   8 +-
 .../0030-Optimize-explosions.patch            |   8 +-
 ...sition-the-first-time-an-entity-is-s.patch |   8 +-
 ...figurable-container-update-tick-rate.patch |   8 +-
 .../0038-Use-UserCache-for-player-heads.patch |   6 +-
 ...42-Ensure-commands-are-not-ran-async.patch |   8 +-
 .../0045-Expose-server-CommandMap.patch       |   6 +-
 ...e-informative-in-maxHealth-exception.patch |   6 +-
 .../0047-Player-Tab-List-and-Title-APIs.patch |   6 +-
 .../0051-Add-velocity-warnings.patch          |   8 +-
 ...ble-inter-world-teleportation-safety.patch |   6 +-
 .../0053-Add-exception-reporting-event.patch  |  12 +-
 ...oreboards-for-non-players-by-default.patch |   6 +-
 ...working-with-arrows-stuck-in-living-.patch |   6 +-
 .../0057-Complete-resource-pack-API.patch     |  10 +-
 ...llow-Reloading-of-Custom-Permissions.patch |   6 +-
 ...063-Handle-Item-Meta-Inconsistencies.patch |  29 ++--
 ...th-absorb-values-and-repair-bad-data.patch |   6 +-
 ...069-Use-a-Shared-Random-for-Entities.patch |   8 +-
 .../0072-Access-items-by-EquipmentSlot.patch  |   6 +-
 ...ckPhysicsEvent-if-a-plugin-has-a-lis.patch |   8 +-
 ...Entity-AddTo-RemoveFrom-World-Events.patch |   8 +-
 ...0082-Add-PlayerUseUnknownEntityEvent.patch |   8 +-
 ...dDebugInfo-not-initialized-on-client.patch |   6 +-
 ...nilla-per-world-scoreboard-coloring-.patch |  12 +-
 ...nd-for-setting-passengers-on-players.patch |   6 +-
 .../0091-Configurable-Player-Collision.patch  |  20 +--
 ...95-Implement-PlayerLocaleChangeEvent.patch |  14 +-
 ...-possibility-for-getServer-singleton.patch |   8 +-
 ...-API-Replenishable-Lootables-Feature.patch |  40 ++---
 .../0103-Optimize-UserCache-Thread-Safe.patch |   8 +-
 ...5-Optional-TNT-doesn-t-move-in-water.patch |  10 +-
 .../0107-Add-server-name-parameter.patch      |   6 +-
 .../0110-Fix-Old-Sign-Conversion.patch        |  14 +-
 ...mative-vehicle-moved-wrongly-message.patch |   6 +-
 ...ers-that-dismount-from-other-players.patch |   6 +-
 ...setting-for-proxy-online-mode-status.patch |  10 +-
 ...onfigurable-packet-in-spam-threshold.patch |   8 +-
 ...17-Configurable-flying-kick-messages.patch |  10 +-
 ...ok-reference-on-Craft-Entity-removal.patch |   6 +-
 ...uto-fix-bad-Y-levels-on-player-login.patch |   6 +-
 .../0122-Add-EntityZapEvent.patch             |  10 +-
 .../0126-Optimise-removeQueue.patch           |  10 +-
 ...7-Allow-Reloading-of-Command-Aliases.patch |   6 +-
 ...8-Add-source-to-PlayerExpChangeEvent.patch |  10 +-
 ...0-Don-t-let-fishinghooks-use-portals.patch |   8 +-
 .../0131-Add-ProjectileCollideEvent.patch     |  14 +-
 ...37-Properly-fix-item-duplication-bug.patch |  10 +-
 .../0138-String-based-Action-Bar-API.patch    |   8 +-
 ...rovide-E-TE-Chunk-count-stat-methods.patch |   6 +-
 .../0142-Enforce-Sync-Player-Saves.patch      |   6 +-
 ...llow-entities-to-ride-themselves-572.patch |   6 +-
 .../0144-Fix-block-break-desync.patch         |   6 +-
 ...PI-for-Reason-Source-Triggering-play.patch |  38 ++---
 .../0146-Cap-Entity-Collisions.patch          |  10 +-
 ...e-CraftScheduler-Async-Task-Debugger.patch |  10 +-
 ...more-aggressive-in-the-chunk-unload-.patch |   6 +-
 ...le-async-calls-to-restart-the-server.patch |  18 +--
 ...property-to-disable-book-size-limits.patch |  12 +-
 ...ke-parrots-stay-on-shoulders-despite.patch |  10 +-
 ...n-option-to-prevent-player-names-fro.patch |   8 +-
 ...oleAppender-for-console-improvements.patch |  38 ++---
 .../0156-Item-canEntityPickup.patch           |  10 +-
 .../0160-Basic-PlayerProfile-API.patch        |  26 ++--
 .../0161-Shoulder-Entities-Release-API.patch  |   8 +-
 .../0164-Entity-fromMobSpawner.patch          |  16 +-
 ...65-Improve-the-Saddle-API-for-Horses.patch |  10 +-
 ...mplement-ensureServerConversions-API.patch |   6 +-
 .../0167-Implement-getI18NDisplayName.patch   |   8 +-
 .../0168-ProfileWhitelistVerifyEvent.patch    |   8 +-
 .../0169-Fix-this-stupid-bullshit.patch       |   6 +-
 .../0174-LivingEntity-setKiller.patch         |  21 ++-
 .../0179-Add-PlayerJumpEvent.patch            |   8 +-
 ...0-handle-PacketPlayInKeepAlive-async.patch |   6 +-
 ...nt-protocol-version-and-virtual-host.patch |  14 +-
 ...rt-serverside-behavior-of-keepalives.patch |  10 +-
 ...-maximum-exp-value-when-merging-orbs.patch |   8 +-
 ...-get-a-BlockState-without-a-snapshot.patch |  24 +--
 .../0190-AsyncTabCompleteEvent.patch          |  16 +-
 .../0193-ExperienceOrbMergeEvent.patch        |   6 +-
 ...4-Ability-to-apply-mending-to-XP-API.patch |   6 +-
 ...7-PlayerNaturallySpawnCreaturesEvent.patch |   6 +-
 ...-Add-setPlayerProfile-API-for-Skulls.patch |   8 +-
 .../0201-Add-ArmorStand-Item-Meta.patch       |  33 ++---
 .../0203-Tameable-getOwnerUniqueId-API.patch  |   8 +-
 ...nt-extended-PaperServerListPingEvent.patch |  18 +--
 .../0209-Improved-Async-Task-Scheduler.patch  |  38 ++---
 ...l-PortalCreateEvent-for-exit-portals.patch |  74 ---------
 ...=> 0211-Player.setPlayerProfile-API.patch} |  14 +-
 ...h => 0212-Fix-Dragon-Server-Crashes.patch} |   4 +-
 ...patch => 0213-getPlayerUniqueId-API.patch} |   6 +-
 ...ake-player-data-saving-configurable.patch} |   6 +-
 ...e-legacy-ping-handler-more-reliable.patch} |   2 +-
 ...erverListPingEvent-for-legacy-pings.patch} |   2 +-
 ...7-Flag-to-disable-the-channel-limit.patch} |   6 +-
 ...-method-to-open-already-placed-sign.patch} |   6 +-
 ...oad-version-history-at-server-start.patch} |   4 +-
 ...rable-sprint-interruption-on-attack.patch} |   6 +-
 ...allowed-colored-signs-to-be-created.patch} |   6 +-
 ...t.patch => 0222-EndermanEscapeEvent.patch} |   4 +-
 ...h => 0223-Enderman.teleportRandomly.patch} |   8 +-
 ...224-Block-Enderpearl-Travel-Exploit.patch} |   6 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |  10 +-
 ...h => 0226-EndermanAttackPlayerEvent.patch} |   4 +-
 ...tch => 0227-WitchConsumePotionEvent.patch} |   4 +-
 ...patch => 0228-WitchThrowPotionEvent.patch} |   4 +-
 ...tem-entities-with-World.spawnEntity.patch} |   6 +-
 ...patch => 0230-WitchReadyPotionEvent.patch} |   4 +-
 ...231-ItemStack-getMaxItemUseDuration.patch} |   6 +-
 ...ement-EntityTeleportEndGatewayEvent.patch} |   4 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |   4 +-
 ...ch => 0234-Fix-CraftEntity-hashCode.patch} |   8 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |   2 +-
 ...ls-when-failing-to-save-player-data.patch} |   4 +-
 ...-shield-blocking-delay-configurable.patch} |  10 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |   4 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  16 +-
 ...patch => 0240-PlayerReadyArrowEvent.patch} |   4 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |   4 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |   4 +-
 ...patch => 0243-Expand-Explosions-API.patch} |   8 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   8 +-
 ...-API.patch => 0245-RangedEntity-API.patch} |  18 +--
 ...o-disable-ender-dragon-legacy-check.patch} |   6 +-
 ...-Implement-World.getEntity-UUID-API.patch} |   9 +-
 ...0248-InventoryCloseEvent-Reason-API.patch} |  40 ++---
 ...ps-for-Entity-TileEntity-Current-Ch.patch} |   6 +-
 ...0250-Configurable-Bed-Search-Radius.patch} |   6 +-
 ...I.patch => 0251-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 +-
 ...56-Use-asynchronous-Log4j-2-loggers.patch} |   6 +-
 ...more-information-to-Entity.toString.patch} |   6 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} |  12 +-
 ...ts.patch => 0259-EnderDragon-Events.patch} |   8 +-
 ...atch => 0260-PlayerElytraBoostEvent.patch} |   4 +-
 ...=> 0261-PlayerLaunchProjectileEvent.patch} |  14 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |   6 +-
 ...tch => 0263-Don-t-save-Proto-Chunks.patch} |   6 +-
 ...patch => 0264-Optimize-RegistryID.c.patch} |   4 +-
 ...-armor-stands-from-doing-entity-loo.patch} |   2 +-
 ...-Vanished-players-don-t-have-rights.patch} |  10 +-
 ...anytime-entities-change-to-guarante.patch} |   4 +-
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |   8 +-
 ...atch => 0269-EntityTransformedEvent.patch} |  10 +-
 ...tch => 0270-SkeletonHorse-Additions.patch} |   8 +-
 ...event-Saving-Bad-entities-to-chunks.patch} |   4 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  10 +-
 ...ad-Entities-in-entityList-iteration.patch} |  22 +--
 ...-use-a-versioned-world-folder-for-t.patch} |   8 +-
 ...75-MC-111480-Start-Entity-ID-s-at-1.patch} |   6 +-
 ...6-Implement-Expanded-ArmorStand-API.patch} |   6 +-
 ...vent.patch => 0277-AnvilDamageEvent.patch} |   4 +-
 ...ent.patch => 0278-Add-TNTPrimeEvent.patch} |   8 +-
 ...d-make-tab-spam-limits-configurable.patch} |  12 +-
 ...h => 0280-Add-hand-to-bucket-events.patch} |  12 +-
 ...-Experience-should-save-as-Integers.patch} |   4 +-
 ...ent-rendering-skulls-from-same-user.patch} |  10 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  14 +-
 ...0284-Make-EnderDragon-implement-Mob.patch} |   4 +-
 ...ect-and-repair-corrupt-Region-Files.patch} |   4 +-
 ...6-Use-ConcurrentHashMap-in-JsonList.patch} |   4 +-
 ...7-Use-a-Queue-for-Queueing-Commands.patch} |   4 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |  13 +-
 ...llow-disabling-armour-stand-ticking.patch} |  10 +-
 ...timize-BlockPosition-helper-methods.patch} |   4 +-
 ...ts-from-world-player-list-not-serve.patch} |  20 +--
 ...tore-vanlla-default-mob-spawn-range.patch} |   6 +-
 ...pers.patch => 0293-Optimize-Hoppers.patch} |  18 +--
 ...94-Optimize-CraftBlockData-Creation.patch} |   2 +-
 ...-124320.patch => 0295-Fix-MC-124320.patch} |   6 +-
 ...tch => 0296-Slime-Pathfinder-Events.patch} |   8 +-
 ...e-speed-for-water-flowing-over-lava.patch} |   6 +-
 ... => 0298-Optimize-RegistryMaterials.patch} |   4 +-
 ...ch => 0299-Add-PhantomPreSpawnEvent.patch} |   8 +-
 ....patch => 0300-Add-More-Creeper-API.patch} |   8 +-
 ...=> 0301-Inventory-removeItemAnySlot.patch} |  12 +-
 ...oadChunk-int-int-false-load-unconve.patch} |   8 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  13 +-
 ...-attack-cooldown-methods-for-Player.patch} |   8 +-
 ....patch => 0305-Improve-death-events.patch} |  39 ++---
 ...w-chests-to-be-placed-with-NBT-data.patch} |   6 +-
 ...I.patch => 0307-Mob-Pathfinding-API.patch} |  12 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |   4 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  48 +++---
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |   2 +-
 ...ning-from-loading-generating-chunks.patch} |   4 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   4 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |   6 +-
 ...0314-Support-Overriding-World-Seeds.patch} |  18 +--
 ...h => 0315-Optimize-Server-World-Map.patch} |  18 +--
 ....patch => 0316-PreSpawnerSpawnEvent.patch} |   4 +-
 ...rseException-in-Entity-and-TE-names.patch} |  14 +-
 ... 0318-Avoid-dimension-id-collisions.patch} |   4 +-
 ...=> 0319-Honor-EntityAgeable.ageLock.patch} |   4 +-
 ...-Dimension-NBT-field-in-Entity-data.patch} |   6 +-
 ...-recheck-type-after-setting-a-block.patch} |   4 +-
 ...le-connection-throttle-kick-message.patch} |   6 +-
 ...> 0323-Hook-into-CB-plugin-rewrites.patch} |   4 +-
 ...24-Allow-setting-the-vex-s-summoner.patch} |   6 +-
 ...I.patch => 0325-Add-sun-related-API.patch} |  14 +-
 ...wned-for-Villager-Aggression-Config.patch} |   4 +-
 ...-Johnny.patch => 0327-Here-s-Johnny.patch} |   6 +-
 ...Turtle-API.patch => 0328-Turtle-API.patch} |   6 +-
 ...it-lightning-strike-effect-distance.patch} |   6 +-
 ...her-worlds-for-shooter-of-projectil.patch} |   4 +-
 ...Call-player-spectator-target-events.patch} |   8 +-
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  16 +-
 ...PI.patch => 0333-Add-more-Witch-API.patch} |   8 +-
 ...MC-93764.patch => 0334-Fix-MC-93764.patch} |   4 +-
 ...vent-players-from-moving-into-unloa.patch} |  12 +-
 ...6-Reset-players-airTicks-on-respawn.patch} |  10 +-
 ...-area-unicode-characters-from-signs.patch} |   4 +-
 ...after-profile-lookups-if-not-needed.patch} |   4 +-
 ...le-thread-count-default-for-bootstr.patch} |   2 +-
 ...id-item-for-enchantment-checks-on-b.patch} |   4 +-
 ...=> 0341-Optimize-World-Time-Updates.patch} |   6 +-
 ...tore-custom-InventoryHolder-support.patch} |   4 +-
 ...=> 0343-Use-Vanilla-Minecart-Speeds.patch} |   4 +-
 ...0344-Fix-SpongeAbsortEvent-handling.patch} |   6 +-
 ...-allow-digging-into-unloaded-chunks.patch} |   6 +-
 ...=> 0346-Optimize-redstone-algorithm.patch} |   2 +-
 ...ntity-dismount-during-teleportation.patch} |  18 +--
 ...mits.patch => 0348-Book-Size-Limits.patch} |   8 +-
 ...ult-permission-message-configurable.patch} |   8 +-
 ...I.patch => 0350-Add-more-Zombie-API.patch} |   8 +-
 ...revent-rayTrace-from-loading-chunks.patch} |   2 +-
 ...-Large-Packets-disconnecting-client.patch} |   2 +-
 ...world-storage-in-CraftOfflinePlayer.patch} |  10 +-
 ...0354-Add-PlayerConnectionCloseEvent.patch} |   2 +-
 ...revent-Enderman-from-loading-chunks.patch} |   2 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |  22 +--
 ...tch => 0357-Fix-PlayerEditBookEvent.patch} |   6 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |   6 +-
 ...nRetractEvent-for-all-empty-pistons.patch} |   2 +-
 ...remove-from-being-called-on-Players.patch} |   6 +-
 ...61-Allow-Saving-of-Oversized-Chunks.patch} |   2 +-
 ...ent.patch => 0362-BlockDestroyEvent.patch} |   2 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |   2 +-
 ...h => 0364-Fix-sign-edit-memory-leak.patch} |   6 +-
 ... 0365-Limit-Client-Sign-length-more.patch} |   8 +-
 ...onvertSigns-boolean-every-sign-save.patch} |   2 +-
 ...Signs-in-Chunks-creating-too-large-.patch} |   2 +-
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |   8 +-
 ...t-tick-at-start-of-drowning-process.patch} |   4 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |   6 +-
 ...ngth-when-serialising-BungeeCord-te.patch} |   2 +-
 ...=> 0372-Entity-getEntitySpawnReason.patch} |  22 +--
 ...ty-Metadata-for-all-tracked-players.patch} |   6 +-
 ...tch => 0374-Fire-event-on-GS4-query.patch} |   2 +-
 ...75-Implement-PlayerPostRespawnEvent.patch} |  12 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |   2 +-
 ...ts.patch => 0377-Server-Tick-Events.patch} |   8 +-
 ...378-PlayerDeathEvent-getItemsToKeep.patch} |   8 +-
 ...79-Optimize-Persistent-Data-Loading.patch} |   2 +-
 ...s-to-fire-only-after-the-server-plu.patch} |   6 +-
 ...ion-files-more-reliable-to-write-to.patch} |   2 +-
 ...mize-GameRules-to-use-LinkedHashMap.patch} |   2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |   2 +-
 ...API.patch => 0384-Add-Heightmap-API.patch} |   8 +-
 ...5-Handle-bad-chunks-more-gracefully.patch} |   2 +-
 ...> 0386-Mob-Spawner-API-Enhancements.patch} |   2 +-
 ...-t-NPE-on-dimensionmanager-toString.patch} |   8 +-
 work/Bukkit                                   |   2 +-
 work/CraftBukkit                              |   2 +-
 work/Spigot                                   |   2 +-
 348 files changed, 1661 insertions(+), 1710 deletions(-)
 delete mode 100644 Spigot-Server-Patches/0211-Call-PortalCreateEvent-for-exit-portals.patch
 rename Spigot-Server-Patches/{0212-Player.setPlayerProfile-API.patch => 0211-Player.setPlayerProfile-API.patch} (94%)
 rename Spigot-Server-Patches/{0213-Fix-Dragon-Server-Crashes.patch => 0212-Fix-Dragon-Server-Crashes.patch} (92%)
 rename Spigot-Server-Patches/{0214-getPlayerUniqueId-API.patch => 0213-getPlayerUniqueId-API.patch} (90%)
 rename Spigot-Server-Patches/{0215-Make-player-data-saving-configurable.patch => 0214-Make-player-data-saving-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0216-Make-legacy-ping-handler-more-reliable.patch => 0215-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0217-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0216-Call-PaperServerListPingEvent-for-legacy-pings.patch} (99%)
 rename Spigot-Server-Patches/{0218-Flag-to-disable-the-channel-limit.patch => 0217-Flag-to-disable-the-channel-limit.patch} (91%)
 rename Spigot-Server-Patches/{0219-Add-method-to-open-already-placed-sign.patch => 0218-Add-method-to-open-already-placed-sign.patch} (87%)
 rename Spigot-Server-Patches/{0220-Load-version-history-at-server-start.patch => 0219-Load-version-history-at-server-start.patch} (88%)
 rename Spigot-Server-Patches/{0221-Configurable-sprint-interruption-on-attack.patch => 0220-Configurable-sprint-interruption-on-attack.patch} (93%)
 rename Spigot-Server-Patches/{0222-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (86%)
 rename Spigot-Server-Patches/{0223-EndermanEscapeEvent.patch => 0222-EndermanEscapeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0224-Enderman.teleportRandomly.patch => 0223-Enderman.teleportRandomly.patch} (85%)
 rename Spigot-Server-Patches/{0225-Block-Enderpearl-Travel-Exploit.patch => 0224-Block-Enderpearl-Travel-Exploit.patch} (93%)
 rename Spigot-Server-Patches/{0226-Expand-World.spawnParticle-API-and-add-Builder.patch => 0225-Expand-World.spawnParticle-API-and-add-Builder.patch} (94%)
 rename Spigot-Server-Patches/{0227-EndermanAttackPlayerEvent.patch => 0226-EndermanAttackPlayerEvent.patch} (93%)
 rename Spigot-Server-Patches/{0228-WitchConsumePotionEvent.patch => 0227-WitchConsumePotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0229-WitchThrowPotionEvent.patch => 0228-WitchThrowPotionEvent.patch} (94%)
 rename Spigot-Server-Patches/{0230-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (88%)
 rename Spigot-Server-Patches/{0231-WitchReadyPotionEvent.patch => 0230-WitchReadyPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0232-ItemStack-getMaxItemUseDuration.patch => 0231-ItemStack-getMaxItemUseDuration.patch} (91%)
 rename Spigot-Server-Patches/{0233-Implement-EntityTeleportEndGatewayEvent.patch => 0232-Implement-EntityTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-Server-Patches/{0234-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (93%)
 rename Spigot-Server-Patches/{0235-Fix-CraftEntity-hashCode.patch => 0234-Fix-CraftEntity-hashCode.patch} (87%)
 rename Spigot-Server-Patches/{0236-Configurable-Alternative-LootPool-Luck-Formula.patch => 0235-Configurable-Alternative-LootPool-Luck-Formula.patch} (98%)
 rename Spigot-Server-Patches/{0237-Print-Error-details-when-failing-to-save-player-data.patch => 0236-Print-Error-details-when-failing-to-save-player-data.patch} (89%)
 rename Spigot-Server-Patches/{0238-Make-shield-blocking-delay-configurable.patch => 0237-Make-shield-blocking-delay-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0239-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (93%)
 rename Spigot-Server-Patches/{0240-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (94%)
 rename Spigot-Server-Patches/{0241-PlayerReadyArrowEvent.patch => 0240-PlayerReadyArrowEvent.patch} (94%)
 rename Spigot-Server-Patches/{0242-Fire-EntityShootBowEvent-for-Illusioner.patch => 0241-Fire-EntityShootBowEvent-for-Illusioner.patch} (93%)
 rename Spigot-Server-Patches/{0243-Implement-EntityKnockbackByEntityEvent.patch => 0242-Implement-EntityKnockbackByEntityEvent.patch} (93%)
 rename Spigot-Server-Patches/{0244-Expand-Explosions-API.patch => 0243-Expand-Explosions-API.patch} (83%)
 rename Spigot-Server-Patches/{0245-LivingEntity-Hand-Raised-Item-Use-API.patch => 0244-LivingEntity-Hand-Raised-Item-Use-API.patch} (91%)
 rename Spigot-Server-Patches/{0246-RangedEntity-API.patch => 0245-RangedEntity-API.patch} (95%)
 rename Spigot-Server-Patches/{0247-Add-config-to-disable-ender-dragon-legacy-check.patch => 0246-Add-config-to-disable-ender-dragon-legacy-check.patch} (94%)
 rename Spigot-Server-Patches/{0248-Implement-World.getEntity-UUID-API.patch => 0247-Implement-World.getEntity-UUID-API.patch} (80%)
 rename Spigot-Server-Patches/{0249-InventoryCloseEvent-Reason-API.patch => 0248-InventoryCloseEvent-Reason-API.patch} (90%)
 rename Spigot-Server-Patches/{0250-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0249-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (95%)
 rename Spigot-Server-Patches/{0251-Configurable-Bed-Search-Radius.patch => 0250-Configurable-Bed-Search-Radius.patch} (97%)
 rename Spigot-Server-Patches/{0252-Vex-getSummoner-API.patch => 0251-Vex-getSummoner-API.patch} (92%)
 rename Spigot-Server-Patches/{0253-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0252-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (88%)
 rename Spigot-Server-Patches/{0254-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0253-Don-t-change-the-Entity-Random-seed-for-squids.patch} (88%)
 rename Spigot-Server-Patches/{0255-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0254-Re-add-vanilla-entity-warnings-for-duplicates.patch} (92%)
 rename Spigot-Server-Patches/{0256-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0255-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (90%)
 rename Spigot-Server-Patches/{0257-Use-asynchronous-Log4j-2-loggers.patch => 0256-Use-asynchronous-Log4j-2-loggers.patch} (88%)
 rename Spigot-Server-Patches/{0258-add-more-information-to-Entity.toString.patch => 0257-add-more-information-to-Entity.toString.patch} (89%)
 rename Spigot-Server-Patches/{0259-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0258-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (93%)
 rename Spigot-Server-Patches/{0260-EnderDragon-Events.patch => 0259-EnderDragon-Events.patch} (95%)
 rename Spigot-Server-Patches/{0261-PlayerElytraBoostEvent.patch => 0260-PlayerElytraBoostEvent.patch} (94%)
 rename Spigot-Server-Patches/{0262-PlayerLaunchProjectileEvent.patch => 0261-PlayerLaunchProjectileEvent.patch} (98%)
 rename Spigot-Server-Patches/{0263-Speedup-BlockPos-by-fixing-inlining.patch => 0262-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0264-Don-t-save-Proto-Chunks.patch => 0263-Don-t-save-Proto-Chunks.patch} (85%)
 rename Spigot-Server-Patches/{0265-Optimize-RegistryID.c.patch => 0264-Optimize-RegistryID.c.patch} (95%)
 rename Spigot-Server-Patches/{0266-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0265-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (96%)
 rename Spigot-Server-Patches/{0267-Vanished-players-don-t-have-rights.patch => 0266-Vanished-players-don-t-have-rights.patch} (95%)
 rename Spigot-Server-Patches/{0268-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0267-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (89%)
 rename Spigot-Server-Patches/{0269-Add-some-Debug-to-Chunk-Entity-slices.patch => 0268-Add-some-Debug-to-Chunk-Entity-slices.patch} (93%)
 rename Spigot-Server-Patches/{0270-EntityTransformedEvent.patch => 0269-EntityTransformedEvent.patch} (95%)
 rename Spigot-Server-Patches/{0271-SkeletonHorse-Additions.patch => 0270-SkeletonHorse-Additions.patch} (94%)
 rename Spigot-Server-Patches/{0272-Prevent-Saving-Bad-entities-to-chunks.patch => 0271-Prevent-Saving-Bad-entities-to-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0273-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0272-Don-t-call-getItemMeta-on-hasItemMeta.patch} (94%)
 rename Spigot-Server-Patches/{0274-Ignore-Dead-Entities-in-entityList-iteration.patch => 0273-Ignore-Dead-Entities-in-entityList-iteration.patch} (91%)
 rename Spigot-Server-Patches/{0275-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0274-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (98%)
 rename Spigot-Server-Patches/{0276-MC-111480-Start-Entity-ID-s-at-1.patch => 0275-MC-111480-Start-Entity-ID-s-at-1.patch} (85%)
 rename Spigot-Server-Patches/{0277-Implement-Expanded-ArmorStand-API.patch => 0276-Implement-Expanded-ArmorStand-API.patch} (97%)
 rename Spigot-Server-Patches/{0278-AnvilDamageEvent.patch => 0277-AnvilDamageEvent.patch} (94%)
 rename Spigot-Server-Patches/{0279-Add-TNTPrimeEvent.patch => 0278-Add-TNTPrimeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0280-Break-up-and-make-tab-spam-limits-configurable.patch => 0279-Break-up-and-make-tab-spam-limits-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0281-Add-hand-to-bucket-events.patch => 0280-Add-hand-to-bucket-events.patch} (96%)
 rename Spigot-Server-Patches/{0282-MC-135506-Experience-should-save-as-Integers.patch => 0281-MC-135506-Experience-should-save-as-Integers.patch} (92%)
 rename Spigot-Server-Patches/{0283-Fix-client-rendering-skulls-from-same-user.patch => 0282-Fix-client-rendering-skulls-from-same-user.patch} (96%)
 rename Spigot-Server-Patches/{0284-Add-Early-Warning-Feature-to-WatchDog.patch => 0283-Add-Early-Warning-Feature-to-WatchDog.patch} (96%)
 rename Spigot-Server-Patches/{0285-Make-EnderDragon-implement-Mob.patch => 0284-Make-EnderDragon-implement-Mob.patch} (93%)
 rename Spigot-Server-Patches/{0286-Detect-and-repair-corrupt-Region-Files.patch => 0285-Detect-and-repair-corrupt-Region-Files.patch} (98%)
 rename Spigot-Server-Patches/{0287-Use-ConcurrentHashMap-in-JsonList.patch => 0286-Use-ConcurrentHashMap-in-JsonList.patch} (97%)
 rename Spigot-Server-Patches/{0288-Use-a-Queue-for-Queueing-Commands.patch => 0287-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0289-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0288-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (79%)
 rename Spigot-Server-Patches/{0290-Allow-disabling-armour-stand-ticking.patch => 0289-Allow-disabling-armour-stand-ticking.patch} (98%)
 rename Spigot-Server-Patches/{0291-Optimize-BlockPosition-helper-methods.patch => 0290-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename Spigot-Server-Patches/{0292-Send-nearby-packets-from-world-player-list-not-serve.patch => 0291-Send-nearby-packets-from-world-player-list-not-serve.patch} (90%)
 rename Spigot-Server-Patches/{0293-Restore-vanlla-default-mob-spawn-range.patch => 0292-Restore-vanlla-default-mob-spawn-range.patch} (81%)
 rename Spigot-Server-Patches/{0294-Optimize-Hoppers.patch => 0293-Optimize-Hoppers.patch} (97%)
 rename Spigot-Server-Patches/{0295-Optimize-CraftBlockData-Creation.patch => 0294-Optimize-CraftBlockData-Creation.patch} (97%)
 rename Spigot-Server-Patches/{0296-Fix-MC-124320.patch => 0295-Fix-MC-124320.patch} (95%)
 rename Spigot-Server-Patches/{0297-Slime-Pathfinder-Events.patch => 0296-Slime-Pathfinder-Events.patch} (97%)
 rename Spigot-Server-Patches/{0298-Configurable-speed-for-water-flowing-over-lava.patch => 0297-Configurable-speed-for-water-flowing-over-lava.patch} (96%)
 rename Spigot-Server-Patches/{0299-Optimize-RegistryMaterials.patch => 0298-Optimize-RegistryMaterials.patch} (94%)
 rename Spigot-Server-Patches/{0300-Add-PhantomPreSpawnEvent.patch => 0299-Add-PhantomPreSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0301-Add-More-Creeper-API.patch => 0300-Add-More-Creeper-API.patch} (93%)
 rename Spigot-Server-Patches/{0302-Inventory-removeItemAnySlot.patch => 0301-Inventory-removeItemAnySlot.patch} (87%)
 rename Spigot-Server-Patches/{0303-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0302-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (84%)
 rename Spigot-Server-Patches/{0304-Add-ray-tracing-methods-to-LivingEntity.patch => 0303-Add-ray-tracing-methods-to-LivingEntity.patch} (93%)
 rename Spigot-Server-Patches/{0305-Expose-attack-cooldown-methods-for-Player.patch => 0304-Expose-attack-cooldown-methods-for-Player.patch} (90%)
 rename Spigot-Server-Patches/{0306-Improve-death-events.patch => 0305-Improve-death-events.patch} (94%)
 rename Spigot-Server-Patches/{0307-Allow-chests-to-be-placed-with-NBT-data.patch => 0306-Allow-chests-to-be-placed-with-NBT-data.patch} (91%)
 rename Spigot-Server-Patches/{0308-Mob-Pathfinding-API.patch => 0307-Mob-Pathfinding-API.patch} (97%)
 rename Spigot-Server-Patches/{0309-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0308-Prevent-chunk-loading-from-Fluid-Flowing.patch} (97%)
 rename Spigot-Server-Patches/{0310-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0309-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (90%)
 rename Spigot-Server-Patches/{0311-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0310-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0312-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0311-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0313-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0312-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (96%)
 rename Spigot-Server-Patches/{0314-Implement-furnace-cook-speed-multiplier-API.patch => 0313-Implement-furnace-cook-speed-multiplier-API.patch} (96%)
 rename Spigot-Server-Patches/{0315-Support-Overriding-World-Seeds.patch => 0314-Support-Overriding-World-Seeds.patch} (91%)
 rename Spigot-Server-Patches/{0316-Optimize-Server-World-Map.patch => 0315-Optimize-Server-World-Map.patch} (93%)
 rename Spigot-Server-Patches/{0317-PreSpawnerSpawnEvent.patch => 0316-PreSpawnerSpawnEvent.patch} (94%)
 rename Spigot-Server-Patches/{0318-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0317-Catch-JsonParseException-in-Entity-and-TE-names.patch} (93%)
 rename Spigot-Server-Patches/{0319-Avoid-dimension-id-collisions.patch => 0318-Avoid-dimension-id-collisions.patch} (91%)
 rename Spigot-Server-Patches/{0320-Honor-EntityAgeable.ageLock.patch => 0319-Honor-EntityAgeable.ageLock.patch} (86%)
 rename Spigot-Server-Patches/{0321-Ignore-Dimension-NBT-field-in-Entity-data.patch => 0320-Ignore-Dimension-NBT-field-in-Entity-data.patch} (88%)
 rename Spigot-Server-Patches/{0322-Don-t-recheck-type-after-setting-a-block.patch => 0321-Don-t-recheck-type-after-setting-a-block.patch} (92%)
 rename Spigot-Server-Patches/{0323-Configurable-connection-throttle-kick-message.patch => 0322-Configurable-connection-throttle-kick-message.patch} (94%)
 rename Spigot-Server-Patches/{0324-Hook-into-CB-plugin-rewrites.patch => 0323-Hook-into-CB-plugin-rewrites.patch} (98%)
 rename Spigot-Server-Patches/{0325-Allow-setting-the-vex-s-summoner.patch => 0324-Allow-setting-the-vex-s-summoner.patch} (90%)
 rename Spigot-Server-Patches/{0326-Add-sun-related-API.patch => 0325-Add-sun-related-API.patch} (88%)
 rename Spigot-Server-Patches/{0327-Check-Drowned-for-Villager-Aggression-Config.patch => 0326-Check-Drowned-for-Villager-Aggression-Config.patch} (93%)
 rename Spigot-Server-Patches/{0328-Here-s-Johnny.patch => 0327-Here-s-Johnny.patch} (92%)
 rename Spigot-Server-Patches/{0329-Turtle-API.patch => 0328-Turtle-API.patch} (98%)
 rename Spigot-Server-Patches/{0330-Limit-lightning-strike-effect-distance.patch => 0329-Limit-lightning-strike-effect-distance.patch} (96%)
 rename Spigot-Server-Patches/{0331-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0330-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (94%)
 rename Spigot-Server-Patches/{0332-Call-player-spectator-target-events.patch => 0331-Call-player-spectator-target-events.patch} (93%)
 rename Spigot-Server-Patches/{0333-Add-Velocity-IP-Forwarding-Support.patch => 0332-Add-Velocity-IP-Forwarding-Support.patch} (97%)
 rename Spigot-Server-Patches/{0334-Add-more-Witch-API.patch => 0333-Add-more-Witch-API.patch} (97%)
 rename Spigot-Server-Patches/{0335-Fix-MC-93764.patch => 0334-Fix-MC-93764.patch} (86%)
 rename Spigot-Server-Patches/{0336-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0335-Add-option-to-prevent-players-from-moving-into-unloa.patch} (92%)
 rename Spigot-Server-Patches/{0337-Reset-players-airTicks-on-respawn.patch => 0336-Reset-players-airTicks-on-respawn.patch} (79%)
 rename Spigot-Server-Patches/{0338-Strip-private-area-unicode-characters-from-signs.patch => 0337-Strip-private-area-unicode-characters-from-signs.patch} (97%)
 rename Spigot-Server-Patches/{0339-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0338-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (94%)
 rename Spigot-Server-Patches/{0340-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0339-Use-more-reasonable-thread-count-default-for-bootstr.patch} (92%)
 rename Spigot-Server-Patches/{0341-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0340-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (94%)
 rename Spigot-Server-Patches/{0342-Optimize-World-Time-Updates.patch => 0341-Optimize-World-Time-Updates.patch} (93%)
 rename Spigot-Server-Patches/{0343-Restore-custom-InventoryHolder-support.patch => 0342-Restore-custom-InventoryHolder-support.patch} (95%)
 rename Spigot-Server-Patches/{0344-Use-Vanilla-Minecart-Speeds.patch => 0343-Use-Vanilla-Minecart-Speeds.patch} (91%)
 rename Spigot-Server-Patches/{0345-Fix-SpongeAbsortEvent-handling.patch => 0344-Fix-SpongeAbsortEvent-handling.patch} (93%)
 rename Spigot-Server-Patches/{0346-Don-t-allow-digging-into-unloaded-chunks.patch => 0345-Don-t-allow-digging-into-unloaded-chunks.patch} (86%)
 rename Spigot-Server-Patches/{0347-Optimize-redstone-algorithm.patch => 0346-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0348-force-entity-dismount-during-teleportation.patch => 0347-force-entity-dismount-during-teleportation.patch} (92%)
 rename Spigot-Server-Patches/{0349-Book-Size-Limits.patch => 0348-Book-Size-Limits.patch} (94%)
 rename Spigot-Server-Patches/{0350-Make-the-default-permission-message-configurable.patch => 0349-Make-the-default-permission-message-configurable.patch} (91%)
 rename Spigot-Server-Patches/{0351-Add-more-Zombie-API.patch => 0350-Add-more-Zombie-API.patch} (95%)
 rename Spigot-Server-Patches/{0352-Prevent-rayTrace-from-loading-chunks.patch => 0351-Prevent-rayTrace-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0353-Handle-Large-Packets-disconnecting-client.patch => 0352-Handle-Large-Packets-disconnecting-client.patch} (98%)
 rename Spigot-Server-Patches/{0354-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0353-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (90%)
 rename Spigot-Server-Patches/{0355-Add-PlayerConnectionCloseEvent.patch => 0354-Add-PlayerConnectionCloseEvent.patch} (98%)
 rename Spigot-Server-Patches/{0356-Prevent-Enderman-from-loading-chunks.patch => 0355-Prevent-Enderman-from-loading-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0357-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0356-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (91%)
 rename Spigot-Server-Patches/{0358-Fix-PlayerEditBookEvent.patch => 0357-Fix-PlayerEditBookEvent.patch} (91%)
 rename Spigot-Server-Patches/{0359-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0358-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (84%)
 rename Spigot-Server-Patches/{0360-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0359-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (97%)
 rename Spigot-Server-Patches/{0361-Block-Entity-remove-from-being-called-on-Players.patch => 0360-Block-Entity-remove-from-being-called-on-Players.patch} (89%)
 rename Spigot-Server-Patches/{0362-Allow-Saving-of-Oversized-Chunks.patch => 0361-Allow-Saving-of-Oversized-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0363-BlockDestroyEvent.patch => 0362-BlockDestroyEvent.patch} (97%)
 rename Spigot-Server-Patches/{0364-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0363-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (97%)
 rename Spigot-Server-Patches/{0365-Fix-sign-edit-memory-leak.patch => 0364-Fix-sign-edit-memory-leak.patch} (92%)
 rename Spigot-Server-Patches/{0366-Limit-Client-Sign-length-more.patch => 0365-Limit-Client-Sign-length-more.patch} (91%)
 rename Spigot-Server-Patches/{0367-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0366-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (95%)
 rename Spigot-Server-Patches/{0368-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0367-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (98%)
 rename Spigot-Server-Patches/{0369-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0368-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (92%)
 rename Spigot-Server-Patches/{0370-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0369-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (89%)
 rename Spigot-Server-Patches/{0371-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0370-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (79%)
 rename Spigot-Server-Patches/{0372-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0371-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (96%)
 rename Spigot-Server-Patches/{0373-Entity-getEntitySpawnReason.patch => 0372-Entity-getEntitySpawnReason.patch} (89%)
 rename Spigot-Server-Patches/{0374-Update-entity-Metadata-for-all-tracked-players.patch => 0373-Update-entity-Metadata-for-all-tracked-players.patch} (91%)
 rename Spigot-Server-Patches/{0375-Fire-event-on-GS4-query.patch => 0374-Fire-event-on-GS4-query.patch} (99%)
 rename Spigot-Server-Patches/{0376-Implement-PlayerPostRespawnEvent.patch => 0375-Implement-PlayerPostRespawnEvent.patch} (83%)
 rename Spigot-Server-Patches/{0377-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0376-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (95%)
 rename Spigot-Server-Patches/{0378-Server-Tick-Events.patch => 0377-Server-Tick-Events.patch} (86%)
 rename Spigot-Server-Patches/{0379-PlayerDeathEvent-getItemsToKeep.patch => 0378-PlayerDeathEvent-getItemsToKeep.patch} (92%)
 rename Spigot-Server-Patches/{0380-Optimize-Persistent-Data-Loading.patch => 0379-Optimize-Persistent-Data-Loading.patch} (97%)
 rename Spigot-Server-Patches/{0381-Allow-login-events-to-fire-only-after-the-server-plu.patch => 0380-Allow-login-events-to-fire-only-after-the-server-plu.patch} (94%)
 rename Spigot-Server-Patches/{0382-Make-region-files-more-reliable-to-write-to.patch => 0381-Make-region-files-more-reliable-to-write-to.patch} (99%)
 rename Spigot-Server-Patches/{0383-Optimize-GameRules-to-use-LinkedHashMap.patch => 0382-Optimize-GameRules-to-use-LinkedHashMap.patch} (98%)
 rename Spigot-Server-Patches/{0384-Optimize-Captured-TileEntity-Lookup.patch => 0383-Optimize-Captured-TileEntity-Lookup.patch} (95%)
 rename Spigot-Server-Patches/{0385-Add-Heightmap-API.patch => 0384-Add-Heightmap-API.patch} (91%)
 rename Spigot-Server-Patches/{0386-Handle-bad-chunks-more-gracefully.patch => 0385-Handle-bad-chunks-more-gracefully.patch} (97%)
 rename Spigot-Server-Patches/{0387-Mob-Spawner-API-Enhancements.patch => 0386-Mob-Spawner-API-Enhancements.patch} (98%)
 rename Spigot-Server-Patches/{0388-don-t-NPE-on-dimensionmanager-toString.patch => 0387-don-t-NPE-on-dimensionmanager-toString.patch} (84%)

diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index a7d98de86e..f0fef5d12d 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From b8ddb776d61410ee76eb2bad75c5f904ff8cce5d Mon Sep 17 00:00:00 2001
+From eeda55e4929215bdae08f66dcbb3a4e9c02b3da3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 75681af7..ec6e4d14 100644
+index 0bc8d481..be4e1ca5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,33 +3,29 @@
@@ -33,12 +33,10 @@ index 75681af7..ec6e4d14 100644
  
      <properties>
 -        <skipTests>true</skipTests>
--        <maven.compiler.source>1.7</maven.compiler.source>
--        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
 +        <!-- Paper - #Logic -->
-+        <maven.compiler.source>1.8</maven.compiler.source>
-+        <maven.compiler.target>1.8</maven.compiler.target>
+         <maven.compiler.source>1.8</maven.compiler.source>
+         <maven.compiler.target>1.8</maven.compiler.target>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
  
diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch
index 63600ee9ca..a397b854bb 100644
--- a/Spigot-API-Patches/0004-Timings-v2.patch
+++ b/Spigot-API-Patches/0004-Timings-v2.patch
@@ -1,4 +1,4 @@
-From cf5ea1965af71c23c2baae43f99cabd273c82291 Mon Sep 17 00:00:00 2001
+From 3cb74e805adf6ffb74f73fa3e55b7ad82e12c801 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3416,7 +3416,7 @@ index 00000000..ca1893e9
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index b3d5a302..9d0ae63f 100644
+index 81e4fa57..f020cb04 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand;
@@ -3436,15 +3436,15 @@ index b3d5a302..9d0ae63f 100644
      }
  
      public void setFallbackCommands() {
-@@ -64,6 +63,7 @@ public class SimpleCommandMap implements CommandMap {
-      * {@inheritDoc}
+@@ -67,6 +66,7 @@ public class SimpleCommandMap implements CommandMap {
       */
+     @Override
      public boolean register(@NotNull String label, @NotNull String fallbackPrefix, @NotNull Command command) {
 +        command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Paper
          label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
          fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
          boolean registered = register(label, command, false, fallbackPrefix);
-@@ -139,16 +139,22 @@ public class SimpleCommandMap implements CommandMap {
+@@ -143,16 +143,22 @@ public class SimpleCommandMap implements CommandMap {
              return false;
          }
  
@@ -3731,10 +3731,10 @@ index 6023e4f6..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 36a42a80..942cb386 100644
+index 06762a69..4f8ae7a8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1565,6 +1565,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1566,6 +1566,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -3747,10 +3747,10 @@ index 36a42a80..942cb386 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 17ddbe61..47327376 100644
+index f648c598..78a2d2f8 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -295,7 +295,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -297,7 +297,6 @@ public final class SimplePluginManager implements PluginManager {
              }
          }
  
@@ -3758,7 +3758,7 @@ index 17ddbe61..47327376 100644
          return result.toArray(new Plugin[result.size()]);
      }
  
-@@ -333,7 +332,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -336,7 +335,7 @@ public final class SimplePluginManager implements PluginManager {
  
          if (result != null) {
              plugins.add(result);
@@ -3767,16 +3767,16 @@ index 17ddbe61..47327376 100644
          }
  
          return result;
-@@ -360,7 +359,7 @@ public final class SimplePluginManager implements PluginManager {
-      */
+@@ -364,7 +363,7 @@ public final class SimplePluginManager implements PluginManager {
+     @Override
      @Nullable
      public synchronized Plugin getPlugin(@NotNull String name) {
 -        return lookupNames.get(name.replace(' ', '_'));
 +        return lookupNames.get(name.replace(' ', '_').toLowerCase(java.util.Locale.ENGLISH)); // Paper
      }
  
-     @NotNull
-@@ -562,7 +561,8 @@ public final class SimplePluginManager implements PluginManager {
+     @Override
+@@ -577,7 +576,8 @@ public final class SimplePluginManager implements PluginManager {
              throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
          }
  
@@ -3786,16 +3786,16 @@ index 17ddbe61..47327376 100644
              getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
          } else {
              getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -745,7 +745,7 @@ public final class SimplePluginManager implements PluginManager {
-     }
+@@ -774,7 +774,7 @@ public final class SimplePluginManager implements PluginManager {
  
+     @Override
      public boolean useTimings() {
 -        return useTimings;
 +        return co.aikar.timings.Timings.isTimingsEnabled(); // Spigot
      }
  
      /**
-@@ -754,6 +754,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -783,6 +783,6 @@ public final class SimplePluginManager implements PluginManager {
       * @param use True if per event timing code should be used
       */
      public void useTimings(boolean use) {
@@ -3804,7 +3804,7 @@ index 17ddbe61..47327376 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 92983c1e..2618906f 100644
+index 1173e433..82e379d1 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -3815,14 +3815,15 @@ index 92983c1e..2618906f 100644
  
      /**
       * This class was not meant to be constructed explicitly
-@@ -298,26 +297,20 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -302,27 +301,21 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  
 -            final CustomTimingsHandler timings = new CustomTimingsHandler("Plugin: " + plugin.getDescription().getFullName() + " Event: " + listener.getClass().getName() + "::" + method.getName()+"("+eventClass.getSimpleName()+")", pluginParentTimer); // Spigot
 -            EventExecutor executor = new EventExecutor() {
--                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
 +            EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper
+                 @Override
+-                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
 +                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper
                      try {
                          if (!eventClass.isAssignableFrom(event.getClass())) {
diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
index 8f44eec2f5..14674e0986 100644
--- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
@@ -1,14 +1,14 @@
-From 2c1d58ff26be1c6623cbd2f598a03405037f262c Mon Sep 17 00:00:00 2001
+From cc1651a5c0a8d62c0fb1a29399db2b32c398c080 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 29 Feb 2016 17:22:34 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 942cb386..ca0dda5a 100644
+index 4f8ae7a8..329e2b01 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1455,6 +1455,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1456,6 +1456,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @NotNull
      public String getLocale();
  
diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch
index 4f764a6f09..d611952254 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From cd87ab89a8a26d08b1af14028c1040a8e78695dc Mon Sep 17 00:00:00 2001
+From 8afe5fdd42c40fbe3abb9fbae80e154fd896f4d7 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index f948f1fc..fa7ab5af 100644
+index 699c31d9..c8439d64 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -592,4 +592,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -606,4 +606,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
index deaa026ec9..bb393595cf 100644
--- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
@@ -1,14 +1,14 @@
-From d04309c257669a7340b21f6947b503d54069c9a1 Mon Sep 17 00:00:00 2001
+From 7b4710b297c3c73e4541edc5c71df4ccc6ca1fdd Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ca0dda5a..801c7f01 100644
+index 329e2b01..145c78c2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1479,6 +1479,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1480,6 +1480,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void updateCommands();
  
diff --git a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
index 74a267e0bf..136f1a45bc 100644
--- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
@@ -1,14 +1,14 @@
-From 30d7c520cf0004c8629f7c085639785bb5d32146 Mon Sep 17 00:00:00 2001
+From d52d23e3b9da885c5a0209ad2a8a00afb2d78b6c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 19:45:21 -0600
 Subject: [PATCH] Automatically disable plugins that fail to load
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 2618906f..85139364 100644
+index 82e379d1..12601db6 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -339,6 +339,10 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -345,6 +345,10 @@ public final class JavaPluginLoader implements PluginLoader {
                  jPlugin.setEnabled(true);
              } catch (Throwable ex) {
                  server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 7a2789cc8a..49f05b3247 100644
--- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From 2221f63255840589b9c788e76bdac17218a66549 Mon Sep 17 00:00:00 2001
+From 5208c701f3786837ca72f4973ebb238a47baa9fa Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -68,10 +68,10 @@ index c5435c42..246e081b 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 801c7f01..fd88fd65 100644
+index 145c78c2..bc4ec3f2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -420,6 +420,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -421,6 +421,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
index b91c595b24..993f52b01a 100644
--- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 1277d8b62c6c49ac4a32c7c5e0695b2f35e7aee8 Mon Sep 17 00:00:00 2001
+From 930766c10632a6483c6a44cfc9c08564571e880a Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -384,7 +384,7 @@ index 00000000..4fe18540
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fd88fd65..1de43bd3 100644
+index bc4ec3f2..abe00d72 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,6 +1,8 @@
@@ -396,7 +396,7 @@ index fd88fd65..1de43bd3 100644
  import org.bukkit.Achievement;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -450,6 +452,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -451,6 +453,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
diff --git a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
index 8742f88fa5..ac15860ce0 100644
--- a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From d8a7d90df073f104820ab655dcf7d682a993361c Mon Sep 17 00:00:00 2001
+From 4b0e39e1270afcb0a08bc1d74935aa363ee79c56 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@@ -462,7 +462,7 @@ index 00000000..5582999f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 9d0ae63f..911d90fd 100644
+index f020cb04..adfc7aae 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -8,6 +8,10 @@ import java.util.HashMap;
@@ -476,7 +476,7 @@ index 9d0ae63f..911d90fd 100644
  import org.apache.commons.lang.Validate;
  import org.bukkit.Location;
  import org.bukkit.Server;
-@@ -151,11 +155,14 @@ public class SimpleCommandMap implements CommandMap {
+@@ -155,11 +159,14 @@ public class SimpleCommandMap implements CommandMap {
              target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
              } // target.timings.stopTiming(); // Spigot // Paper
          } catch (CommandException ex) {
@@ -492,7 +492,7 @@ index 9d0ae63f..911d90fd 100644
          }
  
          // return true as command was handled
-@@ -230,7 +237,9 @@ public class SimpleCommandMap implements CommandMap {
+@@ -238,7 +245,9 @@ public class SimpleCommandMap implements CommandMap {
          } catch (CommandException ex) {
              throw ex;
          } catch (Throwable ex) {
@@ -504,7 +504,7 @@ index 9d0ae63f..911d90fd 100644
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 47327376..ef38b2af 100644
+index 78a2d2f8..aa0c809a 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -19,6 +19,10 @@ import java.util.WeakHashMap;
@@ -518,7 +518,7 @@ index 47327376..ef38b2af 100644
  import org.apache.commons.lang.Validate;
  import org.bukkit.Server;
  import org.bukkit.command.Command;
-@@ -406,7 +410,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -414,7 +418,8 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().enablePlugin(plugin);
              } catch (Throwable ex) {
@@ -528,7 +528,7 @@ index 47327376..ef38b2af 100644
              }
  
              HandlerList.bakeAll();
-@@ -425,36 +430,48 @@ public final class SimplePluginManager implements PluginManager {
+@@ -435,36 +440,48 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().disablePlugin(plugin);
              } catch (Throwable ex) {
@@ -579,10 +579,10 @@ index 47327376..ef38b2af 100644
 +    }
 +    // Paper end
 +
+     @Override
      public void clearPlugins() {
          synchronized (this) {
-             disablePlugins();
-@@ -519,7 +536,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -531,7 +548,13 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {
diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 206d5cdede..700b9614ac 100644
--- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,14 +1,14 @@
-From 60daf9d1f89657b5556791c550ec6df03b501370 Mon Sep 17 00:00:00 2001
+From 7cad905e5bb7ed63e6c95e8032c94dbc627d0ef3 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5427c99a..ab666fb9 100644
+index 2dbb81c1..a62f10e2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -467,4 +467,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -474,4 +474,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @return collision status
       */
      boolean isCollidable();
diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
index ebfef86dae..fe05745f23 100644
--- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 88916b54a083813d0732f1c63461a5eca90a93e5 Mon Sep 17 00:00:00 2001
+From 2cfeb5e9e7efd65ad45b6155ce03e34197a25370 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1de43bd3..c237073a 100644
+index abe00d72..eb2e392d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1212,7 +1212,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1213,7 +1213,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 1de43bd3..c237073a 100644
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -1637,6 +1639,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1638,6 +1640,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setViewDistance(int viewDistance);
  
diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
index 12aec502f6..4ad0158790 100644
--- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
@@ -1,4 +1,4 @@
-From 2a1f662e39f99ea8f90a5391754df6d155ae0ffb Mon Sep 17 00:00:00 2001
+From b3a2a2cac156b3ed3a36ba449e95547aced6dfb7 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 81861781..2f68fba2 100644
+index b7f7eeff..8f2730df 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -130,6 +130,17 @@
@@ -412,14 +412,15 @@ index a850f078..9026e108 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 85139364..024d8393 100644
+index 12601db6..06b6724f 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -297,20 +297,7 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -301,21 +301,7 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  
 -            EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper
+-                @Override
 -                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper
 -                    try {
 -                        if (!eventClass.isAssignableFrom(event.getClass())) {
diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
index e473b22143..99ebdfddfd 100644
--- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From 85e051d778411259e9b95ab5d4b292a4eeecdd46 Mon Sep 17 00:00:00 2001
+From e94f385e9218282340bf014f7bee495fc6d28444 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -85,10 +85,10 @@ index 50cc311b..c62da413 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index ef38b2af..e4a0f938 100644
+index aa0c809a..4cbec1f1 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -779,4 +779,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -808,4 +808,13 @@ public final class SimplePluginManager implements PluginManager {
      public void useTimings(boolean use) {
          co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
      }
diff --git a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
index afa16d2edc..90dc41a4f6 100644
--- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
@@ -1,11 +1,11 @@
-From aad20b148458f6ddeb3712f30e7d8e86dfe6cbb4 Mon Sep 17 00:00:00 2001
+From d00529ea428e96ea97364b8c2bc02c1681208fb6 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:05:21 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index ee0f95b1..864c0a9e 100644
+index c2793f3e..373f4b5b 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 @@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
@@ -43,9 +43,9 @@ index ee0f95b1..864c0a9e 100644
 +    }
 +    // Paper end
 +
+     @Override
      public boolean isCancelled() {
          return this.isCancelled;
-     }
 -- 
 2.21.0
 
diff --git a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
index 29b74894c7..71117a2eaf 100644
--- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
@@ -1,15 +1,15 @@
-From 08e8906ba42e6a4c86d0ca56c9cb37f178885ab2 Mon Sep 17 00:00:00 2001
+From 97f9cfc53d2559c942affd253a465f1c630d80ac Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:44:49 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index ef55b146..eb71f01e 100644
+index 88ce9dc6..96916ec9 100644
 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
 +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-@@ -214,4 +214,23 @@ public interface PlayerInventory extends Inventory {
- 
+@@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory {
+     @Override
      @Nullable
      public HumanEntity getHolder();
 +
diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
index fa059b2d85..e936b100a1 100644
--- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
@@ -1,17 +1,17 @@
-From 96d6e1387e8ca6a7a772f8e1540481d71ace9089 Mon Sep 17 00:00:00 2001
+From 0599f023061d1ef63c069dccc2477f24134e7ebc Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
 
 
-diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 99f73a2b..b63f2fd9 100644
---- a/src/main/java/org/bukkit/entity/Arrow.java
-+++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -149,4 +149,38 @@ public interface Arrow extends Projectile {
-     @Override
-     Spigot spigot();
-     // Spigot end
+diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
+index 4460f6c9..a1990fef 100644
+--- a/src/main/java/org/bukkit/entity/AbstractArrow.java
++++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
+@@ -111,4 +111,38 @@ public interface AbstractArrow extends Projectile {
+          */
+         CREATIVE_ONLY
+     }
 +
 +    // Paper start
 +    /**
diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
index 9b316c78a6..337d0ec381 100644
--- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From 81d25abccb60bfa3607c1a70719d61b1d57f5a52 Mon Sep 17 00:00:00 2001
+From 58a3f2295b0e58314b33d6908388bef6920b11a5 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:34 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -76,7 +76,7 @@ index 00000000..3b725a48
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0074423f..0eaa8df9 100644
+index 0e0ed93b..d3949edf 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 @@ -2,6 +2,7 @@ package org.bukkit.event.entity;
@@ -105,7 +105,7 @@ index 0074423f..0eaa8df9 100644
          this.bolt = bolt;
          this.pigzombie = pigzombie;
      }
-@@ -61,6 +62,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
+@@ -63,6 +64,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
          return pigzombie;
      }
  
@@ -114,7 +114,7 @@ index 0074423f..0eaa8df9 100644
      @NotNull
      @Override
      public HandlerList getHandlers() {
-@@ -71,4 +74,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
+@@ -73,4 +76,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
      public static HandlerList getHandlerList() {
          return handlers;
      }
diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
index 8cb1d6bcae..92cf5bacfd 100644
--- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 115bd301484371f6d9f6dfdec617abbe9df39f74 Mon Sep 17 00:00:00 2001
+From 5054117d47392e633989f9732641c6833311ed4b Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -56,10 +56,10 @@ index bd2c7a69..864c263b 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 911d90fd..8d352eeb 100644
+index adfc7aae..460fda05 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -289,4 +289,11 @@ public class SimpleCommandMap implements CommandMap {
+@@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap {
              }
          }
      }
diff --git a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
index 16fb0e4125..57489f97c6 100644
--- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
@@ -1,14 +1,14 @@
-From e8135e116f16410a8b79c0520b4033553c3a237c Mon Sep 17 00:00:00 2001
+From d094c6a2cdb1dba5073ba0a09f1cf523f06e2c47 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c237073a..219556ed 100644
+index eb2e392d..27ecae8b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -423,6 +423,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -424,6 +424,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -35,7 +35,7 @@ index c237073a..219556ed 100644
      /**
       * Sends the component to the player
       *
-@@ -446,9 +466,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -447,9 +467,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
@@ -47,7 +47,7 @@ index c237073a..219556ed 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1781,9 +1803,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1782,9 +1804,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index c237073a..219556ed 100644
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1791,9 +1815,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1792,9 +1816,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
diff --git a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
index b2a5a7474e..ab37271f3a 100644
--- a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 28f5e7081c337610bbb54fffccefa9665a1b814d Mon Sep 17 00:00:00 2001
+From 60957aa5e1df382fd211eaaaa2fb9d063c499d75 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:23:03 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 05a82e4f..0e6dd6e1 100644
+index 17b4f38d..80608e7a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -37,6 +37,33 @@ import org.jetbrains.annotations.Nullable;
+@@ -38,6 +38,33 @@ import org.jetbrains.annotations.Nullable;
   */
  public interface World extends PluginMessageRecipient, Metadatable {
  
diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
index f35f769259..621f65510e 100644
--- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From edba48d35f93076c75eb85e2d5f502ec17832986 Mon Sep 17 00:00:00 2001
+From a2729794b8cf80f90163f9a543708914876c6cf2 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -46,10 +46,10 @@ index f248400e..2778ce92 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 30597d30..6206ff44 100644
+index 7f153000..1e126487 100644
 --- a/src/main/java/org/bukkit/command/PluginCommand.java
 +++ b/src/main/java/org/bukkit/command/PluginCommand.java
-@@ -150,6 +150,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
+@@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
          }
  
          if (completions == null) {
diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
index 1bb2b2616c..abc54d9f5e 100644
--- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -1,4 +1,4 @@
-From 811f1e098bd6192a850ab6b9ce5b121664628c21 Mon Sep 17 00:00:00 2001
+From da832ecc767d55f84f4c25cd822496d474ca6077 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -21,10 +21,10 @@ index ffebffd8..f5e3929a 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0e6dd6e1..ac12a8fb 100644
+index 80608e7a..d8d42c84 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1643,6 +1643,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1656,6 +1656,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -32,7 +32,7 @@ index 0e6dd6e1..ac12a8fb 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -1658,6 +1659,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1671,6 +1672,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -40,7 +40,7 @@ index 0e6dd6e1..ac12a8fb 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -1707,6 +1709,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1720,6 +1722,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -48,7 +48,7 @@ index 0e6dd6e1..ac12a8fb 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1726,6 +1729,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1739,6 +1742,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -56,7 +56,7 @@ index 0e6dd6e1..ac12a8fb 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1781,6 +1785,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1794,6 +1798,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -64,7 +64,7 @@ index 0e6dd6e1..ac12a8fb 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1802,6 +1807,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1815,6 +1820,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -72,7 +72,7 @@ index 0e6dd6e1..ac12a8fb 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1824,6 +1830,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1837,6 +1843,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -80,7 +80,7 @@ index 0e6dd6e1..ac12a8fb 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
  
-@@ -1848,6 +1855,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1861,6 +1868,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -140,10 +140,10 @@ index 734f5ac7..5efa4e60 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 219556ed..c21785d5 100644
+index 27ecae8b..c30f9791 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -438,7 +438,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -439,7 +439,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -152,7 +152,7 @@ index 219556ed..c21785d5 100644
       * @param message The message to send
       */
      public void sendActionBar(char alternateChar, @NotNull String message);
-@@ -505,6 +505,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -506,6 +506,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -160,7 +160,7 @@ index 219556ed..c21785d5 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -513,6 +514,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -514,6 +515,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -168,7 +168,7 @@ index 219556ed..c21785d5 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -521,6 +523,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -522,6 +524,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -176,7 +176,7 @@ index 219556ed..c21785d5 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -529,6 +532,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -530,6 +533,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -184,7 +184,7 @@ index 219556ed..c21785d5 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -1428,6 +1432,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1429,6 +1433,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -192,7 +192,7 @@ index 219556ed..c21785d5 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -1443,6 +1448,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1444,6 +1449,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -200,7 +200,7 @@ index 219556ed..c21785d5 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -1492,6 +1498,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1493,6 +1499,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -208,7 +208,7 @@ index 219556ed..c21785d5 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1511,6 +1518,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1512,6 +1519,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -216,7 +216,7 @@ index 219556ed..c21785d5 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1566,6 +1574,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1567,6 +1575,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -224,7 +224,7 @@ index 219556ed..c21785d5 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1587,6 +1596,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1588,6 +1597,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -287,10 +287,10 @@ index 1ca8de5e..0dba5d01 100644
      public PlayerLoginEvent(@NotNull final Player player, @NotNull String hostname, @NotNull final InetAddress address, @NotNull final Result result, @NotNull final String message, @NotNull final InetAddress realAddress) { // Spigot
          this(player, hostname, address, realAddress); // Spigot
 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-index 8b901845..374fe364 100644
+index 1b2267f4..1a58734d 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-@@ -76,7 +76,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
+@@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
       *
       * @return Location the player moved to
       */
diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
index b445babef2..984a79470a 100644
--- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From d8be66ef36bc2d6b2a7581eeee0ccbe567ff0716 Mon Sep 17 00:00:00 2001
+From 3d62f02e2b5e03a136cfc8ee51b88e42221fd595 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:01 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-index c7599116..5777d380 100644
+index 951ea2cc..18d82c11 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull;
@@ -16,7 +16,7 @@ index c7599116..5777d380 100644
      private boolean cancel = false;
      private final int remaining;
  
-@@ -45,12 +46,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+@@ -45,6 +46,27 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
          return remaining;
      }
  
@@ -41,10 +41,11 @@ index c7599116..5777d380 100644
 +    }
 +    // Paper End
 +
+     @Override
      public boolean isCancelled() {
          return cancel;
-     }
- 
+@@ -53,6 +75,7 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+     @Override
      public void setCancelled(boolean cancel) {
          this.cancel = cancel;
 +        this.flyAtPlayer = !cancel; // Paper
diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
index 361a0cf4df..65dee49a84 100644
--- a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
@@ -1,14 +1,14 @@
-From 0c0dcf70779a634834277770a644ce513a240d5f Mon Sep 17 00:00:00 2001
+From eba649f74129e9b960548a5f2bff478f385e979b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:04:51 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index f76bc85c..037e2393 100644
+index 6277f392..5b5fb303 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -331,6 +331,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getExpToLevel();
  
diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
index c2f5b5d8d4..5ff84e41c6 100644
--- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
@@ -1,14 +1,14 @@
-From e9cc77d6cf44ce00f1dd2c47535573e04eaf56dc Mon Sep 17 00:00:00 2001
+From 2fca0ae8869cce83cf6c22fc95e0d6b8a9a9f17a 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/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index fa7ab5af..a1edcf02 100644
+index c8439d64..35d0909b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -603,5 +603,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -617,5 +617,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @Nullable
      Location getOrigin();
diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch
index d364a75843..84b05ef666 100644
--- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch
+++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From ae030eb68664e246e3610cd6e0b9eb66c7b75bc3 Mon Sep 17 00:00:00 2001
+From 005245b4911271b4f13791ff70746dc694f9b531 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] ensureServerConversions API
@@ -29,10 +29,10 @@ index cbcbe8c8..8e602cf5 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7b709457..4ee01be5 100644
+index bab86d80..44f3bec7 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -517,7 +517,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -518,7 +518,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
              }
          }
  
@@ -41,7 +41,7 @@ index 7b709457..4ee01be5 100644
      }
  
      /**
-@@ -576,4 +576,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -577,4 +577,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
  
          return true;
      }
diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
index 80b4ad0a66..765b375b71 100644
--- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
+++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
@@ -1,4 +1,4 @@
-From 1083cf344326c8c77207bab66a92c2d06d4f9f7d Mon Sep 17 00:00:00 2001
+From 5fee301aedb1cbdf582295f335c237a142e82865 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] Add getI18NDisplayName API
@@ -29,10 +29,10 @@ index 8e602cf5..dca77bba 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 4ee01be5..3ff3458e 100644
+index 44f3bec7..9526cfe0 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -590,5 +590,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -591,5 +591,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      public ItemStack ensureServerConversions() {
          return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
      }
diff --git a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
index 521935576a..fcf132e749 100644
--- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
@@ -1,4 +1,4 @@
-From 686c76fc32425a5fd568cb11693f89c798055456 Mon Sep 17 00:00:00 2001
+From 6fa61bcbd8768d7501dea34c48490992d4edc2a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 9 Dec 2017 12:40:25 -0500
 Subject: [PATCH] Display warning on deprecated recipe API
@@ -10,24 +10,24 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 83c72eda..038ed0a6 100644
+index d74b3114..d742c405 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -24,6 +24,7 @@ public class ShapedRecipe implements Recipe, Keyed {
-     @Deprecated
+@@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed {
      public ShapedRecipe(@NotNull ItemStack result) {
+         Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
          this.key = NamespacedKey.randomKey();
 +        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace();
          this.output = new ItemStack(result);
      }
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index ef28e75d..823645c5 100644
+index 68447fb8..84062dd7 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -25,6 +25,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
-     @Deprecated
+@@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
      public ShapelessRecipe(@NotNull ItemStack result) {
+         Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
          this.key = NamespacedKey.randomKey();
 +        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace();
          this.output = new ItemStack(result);
diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
index b0dedb5f22..c31f97bea2 100644
--- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 323d8fa0173c68391c1e828cdbf4ae6ee6cb555c Mon Sep 17 00:00:00 2001
+From d9f8be3f0027a03340b60ccde44a253048eceeb7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:38:07 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,10 +10,10 @@ 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/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 247ed072..c7bc13e7 100644
+index b90e211a..df1d3c78 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -946,12 +946,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -947,12 +947,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
diff --git a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
index 4bf79bf691..70136e6929 100644
--- a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From 35a4d7387a22fe69f696b54ea874cb44d6f77a06 Mon Sep 17 00:00:00 2001
+From 17f04473ae82c2ae90cca24a5f7fce0bbb5855e8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:29:28 -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/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index 6325f583..27675ecd 100644
+index 943d751f..a6914f01 100644
 --- a/src/main/java/org/bukkit/block/Skull.java
 +++ b/src/main/java/org/bukkit/block/Skull.java
 @@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData;
@@ -18,7 +18,7 @@ index 6325f583..27675ecd 100644
  
  /**
   * Represents a captured state of a skull block.
-@@ -61,6 +62,20 @@ public interface Skull extends BlockState {
+@@ -61,6 +62,20 @@ public interface Skull extends TileState {
       */
      public void setOwningPlayer(@NotNull OfflinePlayer player);
  
@@ -40,7 +40,7 @@ index 6325f583..27675ecd 100644
       * Gets the rotation of the skull in the world (or facing direction if this
       * is a wall mounted skull).
 diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-index 1583764b..43cdc4c6 100644
+index 35a39203..8b2465ea 100644
 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 @@ -1,9 +1,11 @@
diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
index fca1a9f80e..da1a06205d 100644
--- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 70fd2be258f2dfcc9c3a446c98afb383d5d52a10 Mon Sep 17 00:00:00 2001
+From 088273d7cf7bf3be282254a2ba7686fbf9648ea0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -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/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c7bc13e7..06154a5c 100644
+index df1d3c78..8f87b165 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index c7bc13e7..06154a5c 100644
  import org.bukkit.Achievement;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -1746,6 +1747,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1747,6 +1748,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
diff --git a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
index f97136da56..971248bb9f 100644
--- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
@@ -1,14 +1,14 @@
-From c9bb7666691300ce29eac6f766a5fe2c434504fc Mon Sep 17 00:00:00 2001
+From 5ee5c9f828a151a39e2f0f715eb50582dd23560f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:28:43 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 037e2393..04f0e08f 100644
+index 5b5fb303..cdbac95b 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -465,4 +465,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -458,4 +458,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      @Deprecated
      public void setShoulderEntityRight(@Nullable Entity entity);
diff --git a/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
index e164909487..eb79126748 100644
--- a/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
@@ -1,4 +1,4 @@
-From ee2733ccc823ea2e5ea9e376d81be2889c686ad9 Mon Sep 17 00:00:00 2001
+From 5448fd27d7cab4be6ee7feed8c87aabfe2044a5c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
@@ -8,10 +8,10 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 11eedda6..aed01189 100644
+index ffc8ad37..222a9a7b 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -42,6 +42,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -44,6 +44,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * @return true if banned, otherwise false
       */
      public boolean isBanned();
@@ -74,7 +74,7 @@ index 11eedda6..aed01189 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 06154a5c..a840b49d 100644
+index 8f87b165..214fe2d9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,10 +1,15 @@
@@ -93,7 +93,7 @@ index 06154a5c..a840b49d 100644
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
  import org.bukkit.Instrument;
-@@ -424,6 +429,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -425,6 +430,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
diff --git a/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
index 43e940049c..6b09907837 100644
--- a/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
@@ -1,4 +1,4 @@
-From bc4ae922a5f161cda7df549eb4a3c49f6d3f3642 Mon Sep 17 00:00:00 2001
+From 69b1739f71d3210dcf61ff3cdded512a9830b2dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:55:28 -0400
 Subject: [PATCH] Additional world.getNearbyEntities API's
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ac12a8fb..14f97491 100644
+index d8d42c84..bcf5f8aa 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@
@@ -19,7 +19,7 @@ index ac12a8fb..14f97491 100644
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.List;
-@@ -484,6 +487,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -497,6 +500,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Collection<Entity> getEntitiesByClasses(@NotNull Class<?>... classes);
  
diff --git a/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
index 2e363de560..8816ff3f3c 100644
--- a/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
+++ b/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
@@ -1,18 +1,18 @@
-From efd52e4dee3ebc0d26304f02ce2e7ac55a834e96 Mon Sep 17 00:00:00 2001
+From d13ee63c08c1eab492e1863506f5882e9d18c061 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 19:27:31 -0400
 Subject: [PATCH] Location.isChunkLoaded() API
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 39e57fe1..5c6e25c8 100644
+index 44e3bca6..6021e672 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -505,6 +505,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
          return this;
      }
  
-+    public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
++    public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
      @Override
      public boolean equals(Object obj) {
          if (obj == null) {
diff --git a/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
index 19169de6b7..a21179d08e 100644
--- a/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 4600136f94cf51d9d689734f45d66d7597262032 Mon Sep 17 00:00:00 2001
+From ca26d707e4e2751c7adfdd7069089403b940fddd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -515,10 +515,10 @@ index 68cb7442..69aae30a 100644
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 14f97491..a709ac47 100644
+index bcf5f8aa..28afb932 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2062,7 +2062,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2075,7 +2075,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */
diff --git a/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
index 39ede31862..7e7e5b083d 100644
--- a/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
@@ -1,4 +1,4 @@
-From c81c54c9d585ac5c34aa58f474b32d44854bb8a4 Mon Sep 17 00:00:00 2001
+From 11d55b78c68da025428c3e85a7bb0fef49112c82 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 21:33:35 -0400
 Subject: [PATCH] Close Plugin Class Loaders on Disable
@@ -53,14 +53,12 @@ index 41e26451..86cc5025 100644
       * Gets a {@link Permission} from its fully qualified name
       *
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index e4a0f938..269bb5ca 100644
+index 4cbec1f1..da3cd63b 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -418,17 +418,29 @@ public final class SimplePluginManager implements PluginManager {
-         }
-     }
+@@ -428,17 +428,28 @@ public final class SimplePluginManager implements PluginManager {
  
-+    // Paper start - close Classloader on disable
+     @Override
      public void disablePlugins() {
 +        disablePlugins(false);
 +    }
@@ -74,11 +72,12 @@ index e4a0f938..269bb5ca 100644
          }
      }
  
-+    // Paper start - close Classloader on disable
+     @Override
      public void disablePlugin(@NotNull final Plugin plugin) {
 +        disablePlugin(plugin, false);
 +    }
 +
++    @Override
 +    public void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) {
 +        // Paper end - close Classloader on disable
          if (plugin.isEnabled()) {
@@ -88,8 +87,8 @@ index e4a0f938..269bb5ca 100644
              } catch (Throwable ex) {
                  handlePluginException("Error occurred (in the plugin loader) while disabling "
                          + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
-@@ -474,7 +486,7 @@ public final class SimplePluginManager implements PluginManager {
- 
+@@ -485,7 +496,7 @@ public final class SimplePluginManager implements PluginManager {
+     @Override
      public void clearPlugins() {
          synchronized (this) {
 -            disablePlugins();
@@ -98,10 +97,10 @@ index e4a0f938..269bb5ca 100644
              lookupNames.clear();
              HandlerList.unregisterAll();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 024d8393..ca29394d 100644
+index 06b6724f..bc7bf6a3 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -327,7 +327,7 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -332,7 +332,7 @@ public final class JavaPluginLoader implements PluginLoader {
              } catch (Throwable ex) {
                  server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
                  // Paper start - Disable plugins that fail to load
@@ -110,9 +109,9 @@ index 024d8393..ca29394d 100644
                  return;
                  // Paper end
              }
-@@ -339,6 +339,12 @@ public final class JavaPluginLoader implements PluginLoader {
-     }
+@@ -345,6 +345,12 @@ public final class JavaPluginLoader implements PluginLoader {
  
+     @Override
      public void disablePlugin(@NotNull Plugin plugin) {
 +    // Paper start - close Classloader on disable
 +        disablePlugin(plugin, false); // Retain old behavior unless requested
@@ -123,7 +122,7 @@ index 024d8393..ca29394d 100644
          Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
  
          if (plugin.isEnabled()) {
-@@ -365,6 +371,16 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -371,6 +377,16 @@ public final class JavaPluginLoader implements PluginLoader {
                  for (String name : names) {
                      removeClass(name);
                  }
diff --git a/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
index e6aae2e59a..b41a9e5191 100644
--- a/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
+++ b/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
@@ -1,4 +1,4 @@
-From 0701304bb671bd961643e7ff8510d97304f10307 Mon Sep 17 00:00:00 2001
+From 08b2440a26eb1424573216f76e56d4c64423b8b6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 24 May 2018 21:01:13 -0400
 Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
@@ -6,13 +6,13 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
 Convert location objects to their block coordinates, or the center of the block
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 5c6e25c8..34e90167 100644
+index 6021e672..4f695faf 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -506,6 +506,31 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable {
      }
  
-     public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
+     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
 +
 +    // Paper start
 +    /**
diff --git a/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
index b7a427dc17..912d53b5a8 100644
--- a/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 669ab2ed43b68285e1add1c3bfb0a33493dacbdd Mon Sep 17 00:00:00 2001
+From b78d7f7e912c656a7c9abbd6d62adcd19ed2783c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:59:50 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 3ff3458e..345dc8bd 100644
+index 9526cfe0..f129121e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -602,5 +602,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -603,5 +603,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      public String getI18NDisplayName() {
          return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
      }
diff --git a/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
index f66c7404f0..57b898db1e 100644
--- a/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
@@ -1,14 +1,14 @@
-From 31cbc2b364b29e853ed7bac33e882dcc773d3c84 Mon Sep 17 00:00:00 2001
+From 59f80990fb5676b49a1361460acc7b6e3d0e1842 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 49c79028..01c49322 100644
+index 5ca11bb9..bf5d3096 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -490,5 +490,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -497,5 +497,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param arrows Number of arrows to stick in this entity
       */
      void setArrowsStuck(int arrows);
diff --git a/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
index 117524c547..4da0389a28 100644
--- a/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
+++ b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
@@ -1,14 +1,14 @@
-From eec21f171a7518257567e49002a79e0eeea026ce Mon Sep 17 00:00:00 2001
+From d4a8bae91bcb848e431f81908a7d149d6cc87e62 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 18 Jun 2018 00:41:46 -0500
 Subject: [PATCH] Add "getNearbyXXX" methods to Location
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 34e90167..f3ae58ee 100644
+index 4f695faf..5730d5f4 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -9,6 +9,15 @@ import org.bukkit.util.Vector;
+@@ -12,6 +12,15 @@ import org.bukkit.util.Vector;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
@@ -24,7 +24,7 @@ index 34e90167..f3ae58ee 100644
  /**
   * Represents a 3-dimensional position in a world.
   * <br>
-@@ -530,6 +539,246 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -558,6 +567,248 @@ public class Location implements Cloneable, ConfigurationSerializable {
          centerLoc.setZ(getBlockZ() + 0.5);
          return centerLoc;
      }
@@ -41,6 +41,7 @@ index 34e90167..f3ae58ee 100644
 +     */
 +    @NotNull
 +    public Collection<Entity> getNearbyEntities(double x, double y, double z) {
++        World world = this.getWorld();
 +        if (world == null) {
 +            throw new IllegalArgumentException("Location has no world");
 +        }
@@ -263,6 +264,7 @@ index 34e90167..f3ae58ee 100644
 +     */
 +    @NotNull
 +    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends Entity> clazz, double xRadius, double yRadius, double zRadius, @Nullable Predicate<T> predicate) {
++        World world = this.getWorld();
 +        if (world == null) {
 +            throw new IllegalArgumentException("Location has no world");
 +        }
diff --git a/Spigot-API-Patches/0113-Expand-Explosions-API.patch b/Spigot-API-Patches/0113-Expand-Explosions-API.patch
index 281e018da4..7e0771ce97 100644
--- a/Spigot-API-Patches/0113-Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/0113-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 6014a368344b93d8a67207acca5dce642311dd2b Mon Sep 17 00:00:00 2001
+From 2715b1aea34fcc2ac427535cba59a5f43bcfafe5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index f3ae58ee..b5a6ac16 100644
+index 5730d5f4..b226d7e4 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -4,6 +4,7 @@ import java.util.HashMap;
+@@ -7,6 +7,7 @@ import java.util.HashMap;
  import java.util.Map;
  import org.bukkit.block.Block;
  import org.bukkit.configuration.serialization.ConfigurationSerializable;
@@ -17,7 +17,7 @@ index f3ae58ee..b5a6ac16 100644
  import org.bukkit.util.NumberConversions;
  import org.bukkit.util.Vector;
  import org.jetbrains.annotations.NotNull;
-@@ -540,6 +541,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -568,6 +569,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
          return centerLoc;
      }
  
@@ -30,7 +30,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(float power) {
-+        return world.createExplosion(this, power);
++        return this.getWorld().createExplosion(this, power);
 +    }
 +
 +    /**
@@ -44,7 +44,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(float power, boolean setFire) {
-+        return world.createExplosion(this, power, setFire);
++        return this.getWorld().createExplosion(this, power, setFire);
 +    }
 +
 +    /**
@@ -57,7 +57,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(float power, boolean setFire, boolean breakBlocks) {
-+        return world.createExplosion(this, power, setFire, breakBlocks);
++        return this.getWorld().createExplosion(this, power, setFire, breakBlocks);
 +    }
 +
 +    /**
@@ -70,7 +70,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(@Nullable Entity source, float power) {
-+        return world.createExplosion(source, this, power, true, true);
++        return this.getWorld().createExplosion(source, this, power, true, true);
 +    }
 +
 +    /**
@@ -85,7 +85,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(@Nullable Entity source, float power, boolean setFire) {
-+        return world.createExplosion(source, this, power, setFire, true);
++        return this.getWorld().createExplosion(source, this, power, setFire, true);
 +    }
 +
 +    /**
@@ -99,17 +99,17 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
-+        return world.createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
++        return this.getWorld().createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
 +    }
 +
      /**
       * Returns a list of entities within a bounding box centered around a Location.
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a709ac47..9579437b 100644
+index 28afb932..eb5860b2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1188,6 +1188,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1201,6 +1201,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
  
diff --git a/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
index 1a9e4daa62..176574a931 100644
--- a/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -1,11 +1,11 @@
-From 99b83c34aed53dcef145a8e02978b84778915778 Mon Sep 17 00:00:00 2001
+From 271d50401e6ae6ba853ae96a2c4172ab8d488435 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 22 Jun 2018 22:59:18 -0400
 Subject: [PATCH] ItemStack API additions for quantity/flags/lore
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7a4ace35..72e268c1 100644
+index f129121e..690abbba 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -2,7 +2,9 @@ package org.bukkit.inventory;
@@ -18,7 +18,7 @@ index 7a4ace35..72e268c1 100644
  import org.apache.commons.lang.Validate;
  import org.bukkit.Bukkit;
  import org.bukkit.Material;
-@@ -610,5 +612,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -611,5 +613,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
          // Requires access to NMS
          return ensureServerConversions().getMaxItemUseDuration();
      }
diff --git a/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
index 42dbfffc94..23b7bb382c 100644
--- a/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 2c5fc6a638f23f4ca9017d194449797b14f00aab Mon Sep 17 00:00:00 2001
+From b6f3ff57144a35d024fca8213f71837add1b235e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -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/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 01c49322..95567daa 100644
+index bf5d3096..7322bf6d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -10,6 +10,7 @@ import org.bukkit.World;
@@ -17,7 +17,7 @@ index 01c49322..95567daa 100644
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -504,5 +505,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -511,5 +512,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);
diff --git a/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
index 58f0e31f1d..9f9b690eae 100644
--- a/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
@@ -1,14 +1,14 @@
-From 50730348c82fbebf291c65472b8882a41687005d Mon Sep 17 00:00:00 2001
+From e4492ea2ddcebc431c20d0933e4dc7f85090695d Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9579437b..8d23ad74 100644
+index eb5860b2..3f934c80 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -763,6 +763,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -776,6 +776,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Collection<Entity> getNearbyEntities(@NotNull Location location, double x, double y, double z);
  
diff --git a/Spigot-API-Patches/0119-Entity-getChunk-API.patch b/Spigot-API-Patches/0119-Entity-getChunk-API.patch
index 83112a3ec0..aa563015b5 100644
--- a/Spigot-API-Patches/0119-Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/0119-Entity-getChunk-API.patch
@@ -1,4 +1,4 @@
-From cf05fa82929aff70c3a6a4a14b66391338dbc359 Mon Sep 17 00:00:00 2001
+From bd1d9bcc76034a9cdbe655d37b0d55e85af9a520 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a1edcf02..9391bbf0 100644
+index 35d0909b..adca48f1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index a1edcf02..9391bbf0 100644
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Nameable;
-@@ -610,5 +611,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -624,5 +625,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if entity spawned from a mob spawner
       */
      boolean fromMobSpawner();
diff --git a/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch
index 8e8f9907bc..7b8070ad39 100644
--- a/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -1,4 +1,4 @@
-From 53f3e607544800706ae1f1f01b6a6f292acb6fa6 Mon Sep 17 00:00:00 2001
+From 0e5e339e31b65bd94e6a94af1d69b504aa59c177 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 19 Jul 2018 15:07:02 -0500
 Subject: [PATCH] Add an asterisk to legacy API plugins
@@ -42,10 +42,10 @@ index d4e74d29..6cfd9f3c 100644
  
          StringBuilder pluginList = new StringBuilder();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index ca29394d..ed7455c3 100644
+index bc7bf6a3..31a70b29 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -311,7 +311,14 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -316,7 +316,14 @@ public final class JavaPluginLoader implements PluginLoader {
          Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
  
          if (!plugin.isEnabled()) {
diff --git a/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch
index 310e970187..ab26e1503c 100644
--- a/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch
+++ b/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch
@@ -1,4 +1,4 @@
-From b37d200e4fc162202173c684bbba942d197bc032 Mon Sep 17 00:00:00 2001
+From c807a2cd2c5ce27ece6532433232f8391a84edbe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 25 Jul 2018 01:36:07 -0400
 Subject: [PATCH] Expand Location Manipulation API
@@ -6,11 +6,11 @@ Subject: [PATCH] Expand Location Manipulation API
 Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index b5a6ac16..8e444f7f 100644
+index b226d7e4..884862ab 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -518,6 +518,54 @@ public class Location implements Cloneable, ConfigurationSerializable {
-     public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
+@@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable {
+     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
  
      // Paper start
 +
diff --git a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
index 5fe8dc362e..24e10ae0c9 100644
--- a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
@@ -1,4 +1,4 @@
-From efab2286b27530bc51746d79927a19d4b75d0777 Mon Sep 17 00:00:00 2001
+From 79eb3b353f5f8e4b7f237675a59c0b8139499da3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 00:32:05 -0400
 Subject: [PATCH] Remove deadlock risk in firing async events
@@ -16,12 +16,12 @@ which results in a hard crash.
 This change removes the synchronize and adds some protection around enable/disable
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9391bbf0..5098eade 100644
+index adca48f1..2d3cee14 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
   */
- public interface Entity extends Metadatable, CommandSender, Nameable {
+ public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder {
  
 -    /**
 +    /*
@@ -29,37 +29,37 @@ index 9391bbf0..5098eade 100644
       *
       * @return a new copy of Location containing the position of this entity
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 269bb5ca..5d99a41a 100644
+index da3cd63b..583f8ee4 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -391,7 +391,7 @@ public final class SimplePluginManager implements PluginManager {
-      * @param plugin Plugin to check
+@@ -398,7 +398,7 @@ public final class SimplePluginManager implements PluginManager {
       * @return true if the plugin is enabled, otherwise false
       */
+     @Override
 -    public boolean isPluginEnabled(@Nullable Plugin plugin) {
 +    public synchronized boolean isPluginEnabled(@Nullable Plugin plugin) { // Paper - synchronize
          if ((plugin != null) && (plugins.contains(plugin))) {
              return plugin.isEnabled();
          } else {
-@@ -399,7 +399,7 @@ public final class SimplePluginManager implements PluginManager {
-         }
+@@ -407,7 +407,7 @@ public final class SimplePluginManager implements PluginManager {
      }
  
+     @Override
 -    public void enablePlugin(@NotNull final Plugin plugin) {
 +    public synchronized void enablePlugin(@NotNull final Plugin plugin) { // Paper - synchronize
          if (!plugin.isEnabled()) {
              List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
  
-@@ -436,7 +436,7 @@ public final class SimplePluginManager implements PluginManager {
-         disablePlugin(plugin, false);
+@@ -445,7 +445,7 @@ public final class SimplePluginManager implements PluginManager {
      }
  
+     @Override
 -    public void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) {
 +    public synchronized void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) { // Paper - synchronize
          // Paper end - close Classloader on disable
          if (plugin.isEnabled()) {
              try {
-@@ -496,6 +496,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -506,6 +506,7 @@ public final class SimplePluginManager implements PluginManager {
              defaultPerms.get(false).clear();
          }
      }
@@ -67,9 +67,9 @@ index 269bb5ca..5d99a41a 100644
  
      /**
       * Calls an event with the given details.
-@@ -505,25 +506,11 @@ public final class SimplePluginManager implements PluginManager {
-      * @param event Event details
+@@ -516,25 +517,11 @@ public final class SimplePluginManager implements PluginManager {
       */
+     @Override
      public void callEvent(@NotNull Event event) {
 -        if (event.isAsynchronous()) {
 -            if (Thread.holdsLock(this)) {
@@ -97,7 +97,7 @@ index 269bb5ca..5d99a41a 100644
          RegisteredListener[] listeners = handlers.getRegisteredListeners();
  
 diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-index 5e986de8..2b50fe63 100644
+index 17dbe913..bae26ce7 100644
 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 @@ -17,7 +17,7 @@ public class PluginManagerTest {
@@ -126,7 +126,7 @@ index 5e986de8..2b50fe63 100644
      @Test
      public void testAsyncLocked() throws InterruptedException {
          final Event event = new TestEvent(true);
-@@ -123,7 +123,7 @@ public class PluginManagerTest {
+@@ -127,7 +127,7 @@ public class PluginManagerTest {
          if (store.value == null) {
              throw new IllegalStateException("No exception thrown");
          }
diff --git a/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch
index 32e6c47ea6..ce63aa0228 100644
--- a/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch
+++ b/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From b3c143f917ab08b168af452ef3687e79be91b829 Mon Sep 17 00:00:00 2001
+From 5163c03359615886d54e6541ac60df07f0bb509d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:20 -0500
 Subject: [PATCH] Add hand to bucket events
@@ -30,7 +30,7 @@ index cdf2e201..5e93f1bb 100644
      @Override
      public HandlerList getHandlers() {
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-index d0ccba06..280ca87b 100644
+index d2990a20..dfc76add 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
 @@ -5,6 +5,7 @@ import org.bukkit.block.Block;
@@ -79,9 +79,9 @@ index d0ccba06..280ca87b 100644
 +    }
 +    // Paper end
 +
+     @Override
      public boolean isCancelled() {
          return cancelled;
-     }
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
 index cc1b03eb..15be7128 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
diff --git a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 481f06f644..6d8a2f3ec7 100644
--- a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -1,4 +1,4 @@
-From dc43b4d369f3dd1705303fd1f9e3db0e0f78e8a9 Mon Sep 17 00:00:00 2001
+From d8ab6185814520370886f17aa53e2cbe4cbeac13 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 4 Aug 2018 19:37:35 -0400
 Subject: [PATCH] Provide Chunk Coordinates as a Long API
@@ -44,10 +44,10 @@ index e583f86d..7302b6e3 100644
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8d23ad74..7e245356 100644
+index 3f934c80..dd0ab741 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -156,6 +156,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -157,6 +157,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Chunk getChunkAt(@NotNull Block block);
  
diff --git a/Spigot-API-Patches/0134-Async-Chunks-API.patch b/Spigot-API-Patches/0134-Async-Chunks-API.patch
index 9a8d654c5f..55f7664197 100644
--- a/Spigot-API-Patches/0134-Async-Chunks-API.patch
+++ b/Spigot-API-Patches/0134-Async-Chunks-API.patch
@@ -1,4 +1,4 @@
-From 87e727b0b52b60f2d73ecb218f54e6a170453355 Mon Sep 17 00:00:00 2001
+From 52ee3c6a80ac54dc5ecd9a5518f008da2fb1d9fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
@@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7e245356..99527eb5 100644
+index dd0ab741..a06d7a0d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -170,6 +170,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -171,6 +171,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
      public default Chunk getChunkAt(long chunkKey) {
          return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
      }
@@ -371,10 +371,10 @@ index 7e245356..99527eb5 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 5098eade..b0ba2d97 100644
+index 2d3cee14..f41243f9 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -156,6 +156,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -157,6 +157,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause);
  
diff --git a/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index b29fd79486..e7f3259e14 100644
--- a/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -1,4 +1,4 @@
-From 3b4d905bfd218550bf8a4c4aecb694af0b2ecd87 Mon Sep 17 00:00:00 2001
+From 5c9c0c19bf8ed9ca04c795ad49f5ceeb04d505f7 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Aug 2018 21:42:10 -0700
 Subject: [PATCH] Allow Blocks to be accessed via a long key
@@ -18,10 +18,10 @@ Y range: [0, 1023]
 X, Z range: [-67 108 864, 67 108 863]
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 8e444f7f..e546407e 100644
+index 884862ab..6dc39989 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -12,7 +12,6 @@ import org.jetbrains.annotations.Nullable;
+@@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable;
  
  // Paper start
  import java.util.Collection;
@@ -29,7 +29,7 @@ index 8e444f7f..e546407e 100644
  import java.util.function.Predicate;
  import org.bukkit.entity.Entity;
  import org.bukkit.entity.LivingEntity;
-@@ -577,6 +576,17 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -605,6 +604,17 @@ public class Location implements Cloneable, ConfigurationSerializable {
          blockLoc.setZ(getBlockZ());
          return blockLoc;
      }
@@ -48,10 +48,10 @@ index 8e444f7f..e546407e 100644
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 99527eb5..446d91c5 100644
+index a06d7a0d..4d35efb0 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -87,6 +87,38 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -88,6 +88,38 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Block getBlockAt(@NotNull Location location);
  
diff --git a/Spigot-API-Patches/0140-isChunkGenerated-API.patch b/Spigot-API-Patches/0140-isChunkGenerated-API.patch
index a6862b14c4..18af08bc0f 100644
--- a/Spigot-API-Patches/0140-isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/0140-isChunkGenerated-API.patch
@@ -1,22 +1,23 @@
-From 1ed95fc07f6d3e686f998625d821320a3419b70d Mon Sep 17 00:00:00 2001
+From 4f3dd333bb40e8c41894462cb63dfde6cf8b9bf7 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index e546407e..7713f183 100644
+index 6dc39989..4e69f277 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -1,5 +1,6 @@
- package org.bukkit;
- 
+@@ -3,6 +3,7 @@ package org.bukkit;
+ import com.google.common.base.Preconditions;
+ import java.lang.ref.Reference;
+ import java.lang.ref.WeakReference;
 +import com.google.common.base.Preconditions; // Paper
  import java.util.HashMap;
  import java.util.Map;
  import org.bukkit.block.Block;
-@@ -517,6 +518,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
-     public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
+@@ -545,6 +546,16 @@ public class Location implements Cloneable, ConfigurationSerializable {
+     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
  
      // Paper start
 +    /**
@@ -25,6 +26,7 @@ index e546407e..7713f183 100644
 +     * @return true if a chunk has been generated at this location
 +     */
 +    public boolean isGenerated() {
++        World world = this.getWorld();
 +        Preconditions.checkNotNull(world, "Location has no world!");
 +        return world.isChunkGenerated(locToBlock(x) >> 4, locToBlock(z) >> 4);
 +    }
@@ -32,10 +34,10 @@ index e546407e..7713f183 100644
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 446d91c5..dd51aa31 100644
+index 4d35efb0..150c5af2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -203,6 +203,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -204,6 +204,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
          return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
      }
  
diff --git a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
index 212754735b..3811908586 100644
--- a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,14 +1,14 @@
-From cbd89dbe5d6252a902de32354206aae74b67febb Mon Sep 17 00:00:00 2001
+From fba7db1aa8b007220c83722f68f22983be3dd7de Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a840b49d..1b3a6a91 100644
+index 214fe2d9..024528ba 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1922,6 +1922,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1923,6 +1923,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull PlayerProfile profile);
diff --git a/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 24fc7d9fa0..2d9b079e3a 100644
--- a/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -1,4 +1,4 @@
-From 311e3db15fe2f389a63eb03558ecfd021bfae7e4 Mon Sep 17 00:00:00 2001
+From e98c081f8db91bfe12856621b2bd9446ad518c76 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:35 +0300
 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
@@ -226,10 +226,10 @@ index f5e3929a..8648e8fb 100644
          return key;
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f6a7f97b..d040a740 100644
+index d0e4c8ee..d0221b29 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -417,4 +417,86 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
+@@ -421,4 +421,86 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @NotNull
      Spigot spigot();
      // Spigot end
diff --git a/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch
index d6ad113fda..3fa5f1097b 100644
--- a/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch
@@ -1,4 +1,4 @@
-From de095cece28d722865a1b8daf50cead1d26bb254 Mon Sep 17 00:00:00 2001
+From 92e63fa41726779b8e2673b1ebd5435b8fc954b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 20:51:50 -0400
 Subject: [PATCH] Performance & Concurrency Improvements to Permissions
@@ -18,10 +18,10 @@ Optimized it to simply be a single get call cutting permission map
 lookups in half.
 
 diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
-index 27c14c0f..72fff64e 100644
+index 497775f7..c94e4cdb 100644
 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
 +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
-@@ -70,8 +70,11 @@ public class PermissibleBase implements Permissible {
+@@ -75,8 +75,11 @@ public class PermissibleBase implements Permissible {
  
          String name = inName.toLowerCase(java.util.Locale.ENGLISH);
  
@@ -35,7 +35,7 @@ index 27c14c0f..72fff64e 100644
          } else {
              Permission perm = Bukkit.getServer().getPluginManager().getPermission(name);
  
-@@ -90,14 +93,17 @@ public class PermissibleBase implements Permissible {
+@@ -96,15 +99,18 @@ public class PermissibleBase implements Permissible {
  
          String name = perm.getName().toLowerCase(java.util.Locale.ENGLISH);
  
@@ -50,60 +50,61 @@ index 27c14c0f..72fff64e 100644
          return perm.getDefault().getValue(isOp());
      }
  
+     @Override
      @NotNull
 -    public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
 +    public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) { // Paper - synchronized
          if (name == null) {
              throw new IllegalArgumentException("Permission name cannot be null");
          } else if (plugin == null) {
-@@ -115,7 +121,7 @@ public class PermissibleBase implements Permissible {
-     }
+@@ -123,7 +129,7 @@ public class PermissibleBase implements Permissible {
  
+     @Override
      @NotNull
 -    public PermissionAttachment addAttachment(@NotNull Plugin plugin) {
 +    public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin) { // Paper - synchronized
          if (plugin == null) {
              throw new IllegalArgumentException("Plugin cannot be null");
          } else if (!plugin.isEnabled()) {
-@@ -130,7 +136,7 @@ public class PermissibleBase implements Permissible {
-         return result;
+@@ -139,7 +145,7 @@ public class PermissibleBase implements Permissible {
      }
  
+     @Override
 -    public void removeAttachment(@NotNull PermissionAttachment attachment) {
 +    public synchronized void removeAttachment(@NotNull PermissionAttachment attachment) { // Paper - synchronized
          if (attachment == null) {
              throw new IllegalArgumentException("Attachment cannot be null");
          }
-@@ -149,7 +155,7 @@ public class PermissibleBase implements Permissible {
-         }
+@@ -159,7 +165,7 @@ public class PermissibleBase implements Permissible {
      }
  
+     @Override
 -    public void recalculatePermissions() {
 +    public synchronized void recalculatePermissions() { // Paper - synchronized
          clearPermissions();
          Set<Permission> defaults = Bukkit.getServer().getPluginManager().getDefaultPermissions(isOp());
          Bukkit.getServer().getPluginManager().subscribeToDefaultPerms(isOp(), parent);
-@@ -197,7 +203,7 @@ public class PermissibleBase implements Permissible {
-     }
+@@ -208,7 +214,7 @@ public class PermissibleBase implements Permissible {
  
+     @Override
      @Nullable
 -    public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
 +    public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) { // Paper
          if (name == null) {
              throw new IllegalArgumentException("Permission name cannot be null");
          } else if (plugin == null) {
-@@ -216,7 +222,7 @@ public class PermissibleBase implements Permissible {
-     }
+@@ -228,7 +234,7 @@ public class PermissibleBase implements Permissible {
  
+     @Override
      @Nullable
 -    public PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
 +    public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) { // Paper - synchronized
          if (plugin == null) {
              throw new IllegalArgumentException("Plugin cannot be null");
          } else if (!plugin.isEnabled()) {
-@@ -235,7 +241,7 @@ public class PermissibleBase implements Permissible {
-     }
+@@ -248,7 +254,7 @@ public class PermissibleBase implements Permissible {
  
+     @Override
      @NotNull
 -    public Set<PermissionAttachmentInfo> getEffectivePermissions() {
 +    public synchronized Set<PermissionAttachmentInfo> getEffectivePermissions() { // Paper - synchronized
diff --git a/Spigot-API-Patches/0156-Add-Material-Tags.patch b/Spigot-API-Patches/0156-Add-Material-Tags.patch
index 8d690c5f38..df2371a92c 100644
--- a/Spigot-API-Patches/0156-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0156-Add-Material-Tags.patch
@@ -1,4 +1,4 @@
-From 979f60cf2cbf5cd62d30024b971762dab77f6be7 Mon Sep 17 00:00:00 2001
+From 6e0a7a9708fd792e32acae5b03dc7d4c3aca021d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 17 Jul 2018 01:27:15 -0400
 Subject: [PATCH] Add Material Tags
@@ -614,10 +614,10 @@ index 00000000..328c5147
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index 596384b1..763befad 100644
+index 61993528..5f9d3482 100644
 --- a/src/test/java/org/bukkit/TestServer.java
 +++ b/src/test/java/org/bukkit/TestServer.java
-@@ -28,6 +28,16 @@ public final class TestServer implements InvocationHandler {
+@@ -29,6 +29,16 @@ public final class TestServer implements InvocationHandler {
                          }
                      }
                  );
diff --git a/Spigot-API-Patches/0159-Add-sun-related-API.patch b/Spigot-API-Patches/0159-Add-sun-related-API.patch
index 926127417c..b269a41150 100644
--- a/Spigot-API-Patches/0159-Add-sun-related-API.patch
+++ b/Spigot-API-Patches/0159-Add-sun-related-API.patch
@@ -1,14 +1,14 @@
-From 6c29a689f44834265546b00ccd11758431e6e39a Mon Sep 17 00:00:00 2001
+From 20baf564f13aaaa1f0ec80f2b1695581523dda2c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index dd51aa31..696cd649 100644
+index 150c5af2..951eba31 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1495,6 +1495,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1508,6 +1508,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public void setFullTime(long time);
  
diff --git a/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
index bcb8d56294..ccc6c342ec 100644
--- a/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -1,4 +1,4 @@
-From 11f2703bdec691d543ce1d7fb34e7b3ecf950a5f Mon Sep 17 00:00:00 2001
+From 75492423338959a60f7831eff9e5e9a737d2f676 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 15:53:43 +0000
 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit
@@ -21,7 +21,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
-index 69c9e499..f0c0bae5 100644
+index 963b9ead..a976c32d 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 @@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
@@ -44,9 +44,9 @@ index 69c9e499..f0c0bae5 100644
      }
  
      /**
-@@ -34,9 +42,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
-     }
+@@ -36,9 +44,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
  
+     @Override
      public void setCancelled(boolean cancel) {
 +        // Paper start
 +        if (cancel && !isCancellable) {
diff --git a/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch
index 61b4e53a23..addbee7411 100644
--- a/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch
@@ -1,14 +1,14 @@
-From 60f914151d133a85f5ed0a0e506540d494c515f7 Mon Sep 17 00:00:00 2001
+From d5abb48e4d10b87de170ca3471261b766960bc61 Mon Sep 17 00:00:00 2001
 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 Date: Tue, 23 Oct 2018 19:32:55 +0300
 Subject: [PATCH] Change the reserved channel check to be sensible
 
 
 diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-index 8227b375..cc750eb3 100644
+index 1d061412..6fda7f3a 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-@@ -171,7 +171,7 @@ public class StandardMessenger implements Messenger {
+@@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger {
      public boolean isReservedChannel(@NotNull String channel) {
          channel = validateAndCorrectChannel(channel);
  
@@ -16,9 +16,9 @@ index 8227b375..cc750eb3 100644
 +        return channel.equals("minecraft:register") || channel.equals("minecraft:unregister"); // Paper
      }
  
-     public void registerOutgoingPluginChannel(@NotNull Plugin plugin, @NotNull String channel) {
+     @Override
 diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
-index c15fa003..31ff2f61 100644
+index dce3d619..7e2335ed 100644
 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
 +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
 @@ -25,8 +25,8 @@ public class StandardMessengerTest {
diff --git a/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 90807aa194..e45ee971a1 100644
--- a/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 0c244d3a0ef40f461a59e81f0c420991fa9368d5 Mon Sep 17 00:00:00 2001
+From 7742ee299c1d018e0f7c0bb73870428e901dc42e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:31:12 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,10 +16,10 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index aed01189..f6782e0d 100644
+index 222a9a7b..3ab914fb 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -144,7 +144,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -146,7 +146,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * UTC.
       *
       * @return Date of last log-in for this player, or 0
@@ -29,7 +29,7 @@ index aed01189..f6782e0d 100644
      public long getLastPlayed();
  
      /**
-@@ -163,4 +165,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -165,4 +167,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
      @Nullable
      public Location getBedSpawnLocation();
  
diff --git a/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch
index 819b1b850b..13d2cd21e8 100644
--- a/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch
@@ -1,4 +1,4 @@
-From d553fac2c7725eb035224170171d9d134f64e90b Mon Sep 17 00:00:00 2001
+From 2de9aa3c54fb5e949cf3dac28525918527141317 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 28 Jan 2014 19:13:57 -0500
 Subject: [PATCH] Add ItemStack Recipe API helper methods
@@ -6,10 +6,10 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods
 Allows using ExactChoice Recipes with easier methodss
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 038ed0a6..2181f09b 100644
+index d742c405..222a12ba 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -143,6 +143,13 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed {
          return this;
      }
  
@@ -24,10 +24,10 @@ index 038ed0a6..2181f09b 100644
       * Get a copy of the ingredients map.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 823645c5..062924ea 100644
+index 84062dd7..ddcf84e6 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -141,6 +141,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -143,6 +143,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
          return this;
      }
  
diff --git a/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
index 4c77eba81d..1f97512b1f 100644
--- a/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
+++ b/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From b663560421b798309ed99e5cc5f981cfa76e02e5 Mon Sep 17 00:00:00 2001
+From 33c9867ff8e00e5f2903999c23cd50cd1f826362 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:21:23 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b0ba2d97..61aa4999 100644
+index f41243f9..29229c64 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -643,5 +643,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -657,5 +657,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull
      Chunk getChunk();
diff --git a/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch
index 1b9fe7d190..4e756bd647 100644
--- a/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch
+++ b/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch
@@ -1,4 +1,4 @@
-From edb2d6dfb38c6b17a6d159252e6bce00a1a92f8b Mon Sep 17 00:00:00 2001
+From d41b85d8d0510fc739f63d301c4f2ceb16ea2d28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:39:01 -0400
 Subject: [PATCH] Flip some Spigot API null annotations
@@ -31,10 +31,10 @@ index 3b883b93..9f56e7f8 100644
          return server.getTag(registry, tag, clazz);
      }
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 7713f183..c12d2a26 100644
+index 4e69f277..2a40da99 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -43,7 +43,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
       * @param y The y-coordinate of this new location
       * @param z The z-coordinate of this new location
       */
@@ -43,24 +43,24 @@ index 7713f183..c12d2a26 100644
          this(world, x, y, z, 0, 0);
      }
  
-@@ -57,7 +57,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -60,7 +60,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
       * @param yaw The absolute rotation on the x-plane, in degrees
       * @param pitch The absolute rotation on the y-plane, in degrees
       */
 -    public Location(@Nullable final World world, final double x, final double y, final double z, final float yaw, final float pitch) {
-+    public Location(@UndefinedNullability final World world, final double x, final double y, final double z, final float yaw, final float pitch) { // Paper
-         this.world = world;
-         this.x = x;
-         this.y = y;
-@@ -80,7 +80,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
-      *
-      * @return World that contains this location
++    public Location(@UndefinedNullability final World world, final double x, final double y, final double z, final float yaw, final float pitch) {
+         if (world != null) {
+             this.world = new WeakReference<>(world);
+         }
+@@ -102,7 +102,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
+      * @throws IllegalArgumentException when world is unloaded
+      * @see #isWorldLoaded()
       */
 -    @Nullable
 +    @UndefinedNullability
      public World getWorld() {
-         return world;
-     }
+         if (this.world == null) {
+             return null;
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
 index 63a661bd..2f2be03f 100644
 --- a/src/main/java/org/bukkit/Server.java
@@ -105,7 +105,7 @@ index dca77bba..56734f8e 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 76da06d1..4f72cd7c 100644
+index 6d18de76..495161f6 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -8,6 +8,7 @@ import java.util.Set; // Paper
@@ -116,7 +116,7 @@ index 76da06d1..4f72cd7c 100644
  import org.bukkit.Utility;
  import org.bukkit.configuration.serialization.ConfigurationSerializable;
  import org.bukkit.enchantments.Enchantment;
-@@ -527,7 +528,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -528,7 +529,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
       *
       * @return a copy of the current ItemStack's ItemData
       */
diff --git a/Spigot-API-Patches/0182-Add-Heightmap-API.patch b/Spigot-API-Patches/0182-Add-Heightmap-API.patch
index 44d78c0da9..b3b2620cfd 100644
--- a/Spigot-API-Patches/0182-Add-Heightmap-API.patch
+++ b/Spigot-API-Patches/0182-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From 053132875985ae1a3b5b2b0ca97e76aec417ba59 Mon Sep 17 00:00:00 2001
+From 3bfd84603554d6cbb91aec86b2a689ffa29cebae Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Dec 2018 19:00:36 -0800
 Subject: [PATCH] Add Heightmap API
@@ -46,10 +46,10 @@ index 00000000..4cd9b5ed
 +    SOLID_OR_LIQUID_NO_LEAVES;
 +}
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index c12d2a26..1eef404e 100644
+index 2a40da99..3e1ca4c9 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -609,6 +609,33 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -638,6 +638,33 @@ public class Location implements Cloneable, ConfigurationSerializable {
          return centerLoc;
      }
  
@@ -84,10 +84,10 @@ index c12d2a26..1eef404e 100644
       * Creates explosion at this location with given power
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 696cd649..5469ee4f 100644
+index 951eba31..2da92d39 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -160,6 +160,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -161,6 +161,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Block getHighestBlockAt(@NotNull Location location);
  
diff --git a/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch
index db4f28062a..9d61c45fd7 100644
--- a/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch
@@ -1,14 +1,14 @@
-From c12775547e70620e86c3d13910ed31fc1edfecff Mon Sep 17 00:00:00 2001
+From 8a7fdc3db38d4b47cc8f1309e7426abfab179799 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:19 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java
-index 5773e99e..31c5a006 100644
+index e73fb0ef..2ff0f24d 100644
 --- a/src/main/java/org/bukkit/block/CreatureSpawner.java
 +++ b/src/main/java/org/bukkit/block/CreatureSpawner.java
-@@ -199,4 +199,18 @@ public interface CreatureSpawner extends BlockState {
+@@ -199,4 +199,18 @@ public interface CreatureSpawner extends TileState {
       * @param spawnRange the new spawn range
       */
      public void setSpawnRange(int spawnRange);
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index b374956b5f..2858ffd83d 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 3772a276f6566458d67baefb11a255c09b8ad02d Mon Sep 17 00:00:00 2001
+From 9e4cbf4b8c647145b7f6718dd8564c35c1df4ddd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -535,10 +535,10 @@ index e1ba833f3e..b60956218d 100644
          this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
          this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bc9894f84e..0819f56a62 100644
+index fd8397bd4d..77015bc06e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -131,9 +131,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -134,9 +134,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      private static final DataWatcherObject<Boolean> aC = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      protected static final DataWatcherObject<EntityPose> X = DataWatcher.a(Entity.class, DataWatcherRegistry.s);
      public boolean inChunk;
@@ -596,7 +596,7 @@ index 84155573df..83fdea893c 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dcdd3b002d..9021ab34fa 100644
+index be03fe24b8..5dc2bb1246 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -751,6 +751,7 @@ public final class CraftServer implements Server {
@@ -623,7 +623,7 @@ index dcdd3b002d..9021ab34fa 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -1949,4 +1952,26 @@ public final class CraftServer implements Server {
+@@ -1953,4 +1956,26 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
@@ -651,10 +651,10 @@ index dcdd3b002d..9021ab34fa 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ae320c2bb1..fd02ba1916 100644
+index e17d914185..f406464ef8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -127,6 +127,14 @@ public class Main {
+@@ -128,6 +128,14 @@ public class Main {
                          .defaultsTo(new File("spigot.yml"))
                          .describedAs("Yml file");
                  // Spigot End
@@ -670,43 +670,49 @@ index ae320c2bb1..fd02ba1916 100644
          };
  
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 20597d30c5..222adb40c1 100644
+index 6bceeb120b..9a51c0ef7a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -39,31 +39,31 @@ public class SpigotWorldConfig
+@@ -39,36 +39,36 @@ public class SpigotWorldConfig
          config.set( "world-settings.default." + path, val );
      }
  
 -    private boolean getBoolean(String path, boolean def)
-+    public boolean getBoolean(String path, boolean def)
++    public boolean getBoolean(String path, boolean def) // Paper - private -> public
      {
          config.addDefault( "world-settings.default." + path, def );
          return config.getBoolean( "world-settings." + worldName + "." + path, config.getBoolean( "world-settings.default." + path ) );
      }
  
 -    private double getDouble(String path, double def)
-+    public double getDouble(String path, double def)
++    public double getDouble(String path, double def) // Paper - private -> public
      {
          config.addDefault( "world-settings.default." + path, def );
          return config.getDouble( "world-settings." + worldName + "." + path, config.getDouble( "world-settings.default." + path ) );
      }
  
+-    private int getInt(String path)
++    public int getInt(String path) // Paper - private -> public
+     {
+         return config.getInt( "world-settings." + worldName + "." + path );
+     }
+ 
 -    private int getInt(String path, int def)
-+    public int getInt(String path, int def)
++    public int getInt(String path, int def) // Paper - private -> public
      {
          config.addDefault( "world-settings.default." + path, def );
          return config.getInt( "world-settings." + worldName + "." + path, config.getInt( "world-settings.default." + path ) );
      }
  
 -    private <T> List getList(String path, T def)
-+    public <T> List getList(String path, T def)
++    public <T> List getList(String path, T def) // Paper - private -> public
      {
          config.addDefault( "world-settings.default." + path, def );
          return (List<T>) config.getList( "world-settings." + worldName + "." + path, config.getList( "world-settings.default." + path ) );
      }
  
 -    private String getString(String path, String def)
-+    public String getString(String path, String def)
++    public String getString(String path, String def) // Paper - private -> public
      {
          config.addDefault( "world-settings.default." + path, def );
          return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index 63161ef493..c3b86f7908 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -1,4 +1,4 @@
-From 9fc1ff726d9990ee6e85e86545100faa7103b892 Mon Sep 17 00:00:00 2001
+From 3c1c8843086f86670aaa95e3b59bc09b5c3cd7d9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -732,10 +732,10 @@ index 4e20cfba41..363ab5da12 100644
          int j = 0;
          ChunkSection[] achunksection = chunk.getSections();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 10ebb23c66..23e37b5008 100644
+index 8080e38b37..78a090ac75 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -69,9 +69,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private final MinecraftServer minecraftServer;
      public EntityPlayer player;
      private int e;
@@ -799,7 +799,7 @@ index b3799ab564..5fae5a1233 100644
  
      public static long getTimeMillis() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 73dd802205..9ed7f8ede4 100644
+index 42f7bb0f7d..5d71addb0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -85,6 +85,7 @@ public final class CraftItemStack extends ItemStack {
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 4cb2a4e6e2..f7345e6872 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 aeb013fd8fa88372a085b1e30e1c081c87db0298 Mon Sep 17 00:00:00 2001
+From 97044255b2aeb519750c02b7c656dadfc681b17b 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
@@ -19,10 +19,10 @@ index 2e79b0b5ff..f38179e983 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 0819f56a62..89e54089c2 100644
+index 77015bc06e..01e4863899 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -46,7 +46,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
+@@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
  import org.bukkit.plugin.PluginManager;
  // CraftBukkit end
  
@@ -31,7 +31,7 @@ index 0819f56a62..89e54089c2 100644
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -1663,12 +1663,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1677,12 +1677,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
@@ -65,7 +65,7 @@ index 0819f56a62..89e54089c2 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 65ad9243f8..9aed0d6b82 100644
+index 3217a8ed18..c7fb8f513b 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> {
@@ -92,24 +92,28 @@ index 0000000000..743142d030
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 888c9605c8..94fbf228d2 100644
+index 080fd819b6..77d77fcb8b 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -7,11 +7,11 @@ import org.apache.logging.log4j.Logger;
+@@ -10,7 +10,7 @@ import org.bukkit.inventory.InventoryHolder;
+ // CraftBukkit end
  import org.spigotmc.CustomTimingsHandler; // Spigot
- import org.bukkit.inventory.InventoryHolder; // CraftBukkit
  
 -public abstract class TileEntity {
 +public abstract class TileEntity implements KeyedObject { // Paper
  
      public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
+     // CraftBukkit start - data containers
+@@ -18,7 +18,7 @@ public abstract class TileEntity {
+     public final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
+     // CraftBukkit end
      private static final Logger LOGGER = LogManager.getLogger();
 -    private final TileEntityTypes<?> b;
 +    private final TileEntityTypes<?> b; public TileEntityTypes getTileEntityType() { return b; } // Paper - OBFHELPER
      @Nullable
      protected World world;
      protected BlockPosition position;
-@@ -24,6 +24,26 @@ public abstract class TileEntity {
+@@ -31,6 +31,26 @@ public abstract class TileEntity {
          this.b = tileentitytypes;
      }
  
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 d63d6c9f5b..41bb3625c5 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 f51b5f65d158341dd5a12fc57a5d9bb6d70cf3a1 Mon Sep 17 00:00:00 2001
+From 43fe880530ba71a467d76e1a5d6ad57ba9fed5d5 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
@@ -93,10 +93,10 @@ index 8f789c91f7..15be6bb33f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 89e54089c2..53f8e6811a 100644
+index 01e4863899..14c3f04170 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -130,7 +130,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -133,7 +133,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private static final DataWatcherObject<Boolean> aB = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Boolean> aC = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      protected static final DataWatcherObject<EntityPose> X = DataWatcher.a(Entity.class, DataWatcherRegistry.s);
@@ -105,7 +105,7 @@ index 89e54089c2..53f8e6811a 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
-@@ -1664,6 +1664,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1678,6 +1678,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      // Paper start
@@ -146,10 +146,10 @@ index 89e54089c2..53f8e6811a 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 94fbf228d2..42303f5b39 100644
+index 77d77fcb8b..4c811325c3 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -42,6 +42,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -49,6 +49,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
          getMinecraftKey(); // Try to load if it doesn't exists.
          return tileEntityKeyString;
      }
@@ -166,7 +166,7 @@ index 94fbf228d2..42303f5b39 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 ee34d42160..cebbdec741 100644
+index eddac6ed95..049641db06 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;
@@ -177,7 +177,7 @@ index ee34d42160..cebbdec741 100644
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Server;
-@@ -173,6 +174,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -178,6 +179,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entity = entity;
      }
  
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 247ddcc65e..ff0383e97e 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 87ac79ba576c04901783ab5e163826a361488db7 Mon Sep 17 00:00:00 2001
+From a7ea633b747bb806e7fcc6077f30fcab76b59d04 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
@@ -546,7 +546,7 @@ index b60956218d..19e2df3098 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 53f8e6811a..114a851f0f 100644
+index 14c3f04170..6127f9ba96 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;
@@ -559,7 +559,7 @@ index 53f8e6811a..114a851f0f 100644
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
-@@ -158,7 +159,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -161,7 +162,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public boolean valid;
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
@@ -568,7 +568,7 @@ index 53f8e6811a..114a851f0f 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -474,7 +475,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -483,7 +484,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@@ -576,7 +576,7 @@ index 53f8e6811a..114a851f0f 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().b(vec3d));
              this.recalcPosition();
-@@ -639,7 +639,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -648,7 +648,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              this.world.getMethodProfiler().exit();
          }
@@ -661,7 +661,7 @@ index f86e6a4c51..85567a7072 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 741105fb6c..277fa64e24 100644
+index 4de927416b..4c1c914132 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,7 @@
@@ -682,7 +682,7 @@ index 741105fb6c..277fa64e24 100644
  
  public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable, Runnable {
  
-@@ -659,6 +661,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -672,6 +674,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
          // CraftBukkit end
          MinecraftServer.LOGGER.info("Stopping server");
@@ -690,7 +690,7 @@ index 741105fb6c..277fa64e24 100644
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -929,7 +932,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -949,7 +952,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      protected void exit() {}
  
      protected void a(BooleanSupplier booleansupplier) {
@@ -699,7 +699,7 @@ index 741105fb6c..277fa64e24 100644
          this.slackActivityAccountant.tickStarted(); // Spigot
          long i = SystemUtils.getMonotonicNanos();
  
-@@ -950,14 +953,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -970,14 +973,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@@ -714,7 +714,7 @@ index 741105fb6c..277fa64e24 100644
          }
  
          this.methodProfiler.enter("snooper");
-@@ -980,29 +981,28 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1000,29 +1001,28 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.methodProfiler.exit();
          org.spigotmc.WatchdogThread.tick(); // Spigot
          this.slackActivityAccountant.tickEnded(l); // Spigot
@@ -752,7 +752,7 @@ index 741105fb6c..277fa64e24 100644
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.ticks % 20 == 0) {
              for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
-@@ -1010,7 +1010,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1030,7 +1030,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
              }
          }
@@ -761,7 +761,7 @@ index 741105fb6c..277fa64e24 100644
  
          // WorldServer worldserver; // CraftBukkit - dropped down
          long i;
-@@ -1057,20 +1057,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1077,20 +1077,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          this.methodProfiler.exitEnter("connection");
@@ -789,7 +789,7 @@ index 741105fb6c..277fa64e24 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 4d8491c760..a44525304d 100644
+index 755c0406e1..ee65b01f43 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,6 +1,8 @@
@@ -801,7 +801,7 @@ index 4d8491c760..a44525304d 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Sets;
  import com.mojang.datafixers.DataFixer;
-@@ -248,6 +250,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -244,6 +246,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                      playerchunk = new PlayerChunk(new ChunkCoordIntPair(i), j, this.lightEngine, this.q, this);
                  }
  
@@ -826,32 +826,31 @@ index 4d8491c760..a44525304d 100644
                  this.updatingChunks.put(i, playerchunk);
                  this.updatingChunksModified = true;
              }
-@@ -350,6 +370,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-                 this.a(i, playerchunk, event); // CraftBukkit
-             } else {
-                 if (this.g.remove(i, playerchunk) && ichunkaccess != null) {
-+
-+                    // TODO: VERIFY THIS
-+                    // Paper - Update neighbor counts
-+                    for (int x = -2; x < 3; x++) {
-+                        for (int z = -2; z < 3; z++) {
-+                            if (x == 0 && z == 0) {
-+                                continue;
-+                            }
+@@ -332,6 +352,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+                         ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk, chunk.isNeedsSaving());
+                         this.world.getServer().getPluginManager().callEvent(event);
+                         this.saveChunk(ichunkaccess, event.isSaveChunk());
++                        // TODO: VERIFY THIS
++                        // Paper - Update neighbor counts
++                        for (int x = -2; x < 3; x++) {
++                            for (int z = -2; z < 3; z++) {
++                                if (x == 0 && z == 0) {
++                                    continue;
++                                }
 +
 +
-+                            Chunk neighbor = ((Chunk) ichunkaccess).world.getChunkProvider().getChunkAt(event.getChunk().getX(), event.getChunk().getZ(), false);
-+                            if (neighbor != null) {
-+                                neighbor.setNeighborUnloaded(-x, -z);
-+                                ((Chunk) ichunkaccess).setNeighborUnloaded(x, z);
++                                Chunk neighbor = ((Chunk) ichunkaccess).world.getChunkProvider().getChunkAt(event.getChunk().getX(), event.getChunk().getZ(), false);
++                                if (neighbor != null) {
++                                    neighbor.setNeighborUnloaded(-x, -z);
++                                    ((Chunk) ichunkaccess).setNeighborUnloaded(x, z);
++                                }
 +                            }
 +                        }
-+                    }
-+                    // Paper
-                     // CraftBukkit start
-                     if (event == null) {
-                         this.saveChunk(ichunkaccess);
-@@ -424,7 +462,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
++                        // Paper
+                         // CraftBukkit end
+ 
+                         chunk.c(false);
+@@ -402,7 +439,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
              });
  
              return completablefuture.thenComposeAsync((either) -> {
@@ -860,7 +859,7 @@ index 4d8491c760..a44525304d 100644
                      try {
                          CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture1 = chunkstatus.a(this.world, this.chunkGenerator, this.definedStructureManager, this.lightEngine, (ichunkaccess) -> {
                              return this.b(playerchunk);
-@@ -904,6 +942,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -879,6 +916,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
  
          PlayerChunkMap.EntityTracker playerchunkmap_entitytracker;
          ObjectIterator objectiterator;
@@ -868,7 +867,7 @@ index 4d8491c760..a44525304d 100644
  
          for (objectiterator = this.trackedEntities.values().iterator(); objectiterator.hasNext(); playerchunkmap_entitytracker.trackerEntry.a()) {
              playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next();
-@@ -921,9 +960,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -896,9 +934,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  playerchunkmap_entitytracker.e = sectionposition1;
              }
          }
@@ -881,10 +880,10 @@ index 4d8491c760..a44525304d 100644
              playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next();
              playerchunkmap_entitytracker.track(list);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 23e37b5008..287bba3f6c 100644
+index 78a090ac75..e07f4a9680 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -60,6 +60,7 @@ import org.bukkit.inventory.CraftingInventory;
+@@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
  import org.bukkit.inventory.EquipmentSlot;
  import org.bukkit.inventory.InventoryView;
  import org.bukkit.util.NumberConversions;
@@ -892,7 +891,7 @@ index 23e37b5008..287bba3f6c 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn {
-@@ -137,7 +138,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -135,7 +136,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit end
  
      public void tick() {
@@ -900,7 +899,7 @@ index 23e37b5008..287bba3f6c 100644
          this.syncPosition();
          this.player.playerTick();
          this.player.setLocation(this.l, this.m, this.n, this.player.yaw, this.player.pitch);
-@@ -210,7 +210,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -208,7 +208,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
              this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
              this.disconnect(new ChatMessage("multiplayer.disconnect.idling", new Object[0]));
          }
@@ -908,7 +907,7 @@ index 23e37b5008..287bba3f6c 100644
  
      }
  
-@@ -1648,7 +1647,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1647,7 +1646,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -917,7 +916,7 @@ index 23e37b5008..287bba3f6c 100644
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1659,7 +1658,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1658,7 +1657,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -926,7 +925,7 @@ index 23e37b5008..287bba3f6c 100644
              return;
          }
  
-@@ -1672,7 +1671,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1671,7 +1670,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
@@ -936,7 +935,7 @@ index 23e37b5008..287bba3f6c 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index c8d2c81c58..aefc3eb19c 100644
+index cb6d50ea70..9ba03f8ed0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,5 +1,8 @@
@@ -954,15 +953,15 @@ index c8d2c81c58..aefc3eb19c 100644
          if (!iasynctaskhandler.isMainThread()) {
 +            Timing timing = MinecraftTimings.getPacketTiming(packet); // Paper
              iasynctaskhandler.execute(() -> {
-                 if (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect) return; // CraftBukkit
+                 if (MinecraftServer.getServer().hasStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) return; // CraftBukkit, MC-142590
 +                try (Timing ignored = timing.startTiming()) { // Paper
                  packet.a(t0);
-+            } // Paper - timings
++                } // Paper - timings
              });
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b0c6b1385d..7939208a5a 100644
+index 56e36c8668..7a837ec0fc 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -972,7 +971,7 @@ index b0c6b1385d..7939208a5a 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -892,10 +893,11 @@ public abstract class PlayerList {
+@@ -894,10 +895,11 @@ public abstract class PlayerList {
      }
  
      public void savePlayers() {
@@ -1039,25 +1038,24 @@ index 537e610797..b48e5b51a0 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 42303f5b39..456afbf079 100644
+index 4c811325c3..da30d2cf86 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
+@@ -8,11 +8,12 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
+ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
+ import org.bukkit.inventory.InventoryHolder;
+ // CraftBukkit end
 -import org.spigotmc.CustomTimingsHandler; // Spigot
 +import co.aikar.timings.MinecraftTimings; // Paper
 +import co.aikar.timings.Timing; // Paper
- import org.bukkit.inventory.InventoryHolder; // CraftBukkit
  
  public abstract class TileEntity implements KeyedObject { // Paper
  
 -    public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
 +    public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper
-     private static final Logger LOGGER = LogManager.getLogger();
-     private final TileEntityTypes<?> b; public TileEntityTypes getTileEntityType() { return b; } // Paper - OBFHELPER
-     @Nullable
+     // CraftBukkit start - data containers
+     private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
+     public final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
 index 83fdea893c..738d9da8ce 100644
 --- a/src/main/java/net/minecraft/server/World.java
@@ -1123,7 +1121,7 @@ index 83fdea893c..738d9da8ce 100644
          // Spigot end
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 20900593af..d54d58e1ee 100644
+index d08c5fc93b..11cd9003e3 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,7 @@
@@ -1200,10 +1198,10 @@ index 20900593af..d54d58e1ee 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9021ab34fa..672a647960 100644
+index 5dc2bb1246..8e877055c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1922,12 +1922,31 @@ public final class CraftServer implements Server {
+@@ -1926,12 +1926,31 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -1408,10 +1406,10 @@ index 38f211526b..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 57d4427097..25726dd751 100644
+index 6806ada495..e45fd0028b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1726,6 +1726,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1728,6 +1728,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -1427,7 +1425,7 @@ index 57d4427097..25726dd751 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e9fce8622f..d99634062b 100644
+index b90979c7ba..8823f94f7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -1,5 +1,6 @@
@@ -1437,7 +1435,7 @@ index e9fce8622f..d99634062b 100644
  import com.google.common.util.concurrent.ThreadFactoryBuilder;
  import java.util.ArrayList;
  import java.util.Comparator;
-@@ -246,7 +247,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -248,7 +249,7 @@ public class CraftScheduler implements BukkitScheduler {
                              }
                          }
                          return false;
@@ -1446,7 +1444,7 @@ index e9fce8622f..d99634062b 100644
          handle(task, 0L);
          for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
              if (taskPending == task) {
-@@ -280,7 +281,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -283,7 +284,7 @@ public class CraftScheduler implements BukkitScheduler {
                              }
                          }
                      }
@@ -1455,7 +1453,7 @@ index e9fce8622f..d99634062b 100644
          handle(task, 0L);
          for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
              if (taskPending == task) {
-@@ -387,9 +388,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -390,9 +391,7 @@ public class CraftScheduler implements BukkitScheduler {
              if (task.isSync()) {
                  currentTask = task;
                  try {
@@ -1465,7 +1463,7 @@ index e9fce8622f..d99634062b 100644
                  } catch (final Throwable throwable) {
                      task.getOwner().getLogger().log(
                              Level.WARNING,
-@@ -416,8 +415,10 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -419,8 +418,10 @@ public class CraftScheduler implements BukkitScheduler {
                  runners.remove(task.getTaskId());
              }
          }
@@ -1476,7 +1474,7 @@ index e9fce8622f..d99634062b 100644
          debugHead = debugHead.getNextHead(currentTick);
      }
  
-@@ -450,6 +451,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -453,6 +454,7 @@ public class CraftScheduler implements BukkitScheduler {
      }
  
      private void parsePending() {
@@ -1484,7 +1482,7 @@ index e9fce8622f..d99634062b 100644
          CraftTask head = this.head;
          CraftTask task = head.getNext();
          CraftTask lastTask = head;
-@@ -468,6 +470,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -471,6 +473,7 @@ public class CraftScheduler implements BukkitScheduler {
             task.setNext(null);
          }
          this.head = lastTask;
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 77424a5e9f..1ee73f2932 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,4 +1,4 @@
-From 4c5ba563e76ce1ad1703efc25ef3952b56e373e6 Mon Sep 17 00:00:00 2001
+From cd36b4b77d0828ac52974d0ec163f700246157f6 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
@@ -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 114a851f0f..ca21afc199 100644
+index 6127f9ba96..ffad35a61f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1769,6 +1769,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1783,6 +1783,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(itemstack, 0.0F);
      }
  
diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 3f615896ff..86b05a9e7e 100644
--- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From d6da37cf3560528b02e72e0b5c08747103db3fcf Mon Sep 17 00:00:00 2001
+From 8576fa86b2ba7e75460dee37d44bfb56edf84203 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -19,10 +19,10 @@ index 3f35a28ba1..cf00f35a5b 100644
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 277fa64e24..33e8030def 100644
+index 4c1c914132..13a0918cea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1264,7 +1264,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1288,7 +1288,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -32,7 +32,7 @@ index 277fa64e24..33e8030def 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 672a647960..07e052b649 100644
+index 8e877055c3..def01ae423 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -196,7 +196,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -45,10 +45,10 @@ index 672a647960..07e052b649 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index fd02ba1916..a96c144fca 100644
+index f406464ef8..7f5ea764d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -199,12 +199,25 @@ public class Main {
+@@ -200,12 +200,25 @@ public class Main {
                      deadline.add(Calendar.DAY_OF_YEAR, -3);
                      if (buildDate.before(deadline.getTime())) {
                          System.err.println("*** Error, this build is outdated ***");
diff --git a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
index edaa8a721d..11fbcced9e 100644
--- a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
@@ -1,11 +1,11 @@
-From 20708be3fdc6f6bb1b11884a04087c6499756984 Mon Sep 17 00:00:00 2001
+From b2f98146b39d7ce91a285ea261c8fbc958c679db Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 07401b4d9b..20460ad98a 100644
+index ffaeb76d0f..d0713bfcd1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -70,6 +70,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -45,10 +45,10 @@ index dbbc34d91b..d823c6b6d9 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 25726dd751..ca65d51d81 100644
+index e45fd0028b..ffe29917ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1639,7 +1639,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1641,7 +1641,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
index 116455fb8b..1deae6bbd3 100644
--- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From c0f630db178f498a793777ac2084016fa9b5e453 Mon Sep 17 00:00:00 2001
+From 072bc1538cc7c59fb817c5ab3d645f5137bdcee4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 33e8030def..48286867fe 100644
+index 13a0918cea..320af3f503 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -150,7 +150,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -24,7 +24,7 @@ index 33e8030def..48286867fe 100644
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public File bukkitDataPackFolder;
-@@ -159,7 +159,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -160,7 +160,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      // Spigot start
      public static final int TPS = 20;
      public static final int TICK_TIME = 1000000000 / TPS;
@@ -33,7 +33,7 @@ index 33e8030def..48286867fe 100644
      public final double[] recentTps = new double[ 3 ];
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -745,6 +745,57 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -758,6 +758,57 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      {
          return ( avg * exp ) + ( tps * ( 1 - exp ) );
      }
@@ -91,7 +91,7 @@ index 33e8030def..48286867fe 100644
      // Spigot End
  
      public void run() {
-@@ -757,30 +808,48 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -770,30 +821,48 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
                  // Spigot start
                  Arrays.fill( recentTps, 20 );
@@ -156,20 +156,21 @@ index 33e8030def..48286867fe 100644
                      this.nextTick += 50L;
                      if (this.T) {
                          this.T = false;
-@@ -848,7 +917,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -861,8 +930,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      private boolean canSleepForTick() {
--        return this.isEntered() || SystemUtils.getMonotonicMillis() < (this.ac ? this.ab : this.nextTick);
-+        return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
+-        // CraftBukkit start
+-        return this.forceTicks || this.isEntered() || SystemUtils.getMonotonicMillis() < (this.ac ? this.ab : this.nextTick);
++        return this.forceTicks || System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
      }
  
-     protected void sleepForTick() {
+     private void executeModerately() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 07e052b649..de592ae851 100644
+index def01ae423..72902d2f5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1919,6 +1919,17 @@ public final class CraftServer implements Server {
+@@ -1923,6 +1923,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
diff --git a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
index 31ec1c1d58..4ba6e250d9 100644
--- a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
@@ -1,14 +1,14 @@
-From 4076d548ca6e55ff95403b309eb842e650799e87 Mon Sep 17 00:00:00 2001
+From 30114cb020556b26a53429e43b61641166f4ca02 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ca65d51d81..6b93cc3a57 100644
+index ffe29917ce..a3628b2c2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1328,12 +1328,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1330,12 +1330,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index 0eca083d46..7ec9d74763 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From 6ca1200c22d2e6055bdedabe5c6b11c83b110374 Mon Sep 17 00:00:00 2001
+From 70bd27dafcbb7673fa92e6ac6909bc1479626d75 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 ca21afc199..af019fc3f1 100644
+index ffad35a61f..7b7a437b93 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -160,6 +160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
      public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
@@ -16,19 +16,19 @@ index ca21afc199..af019fc3f1 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1528,6 +1529,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-                 }
+@@ -1542,6 +1543,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+                 this.bukkitEntity.storeBukkitValues(nbttagcompound);
              }
- 
+             // CraftBukkit end
 +            // Paper start - Save the entity's origin location
-+            if (origin != null) {
++            if (this.origin != null) {
 +                nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
 +            }
 +            // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1649,6 +1655,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1663,6 +1669,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index ca21afc199..af019fc3f1 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1726,6 +1739,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1740,6 +1753,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -101,10 +101,10 @@ 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 d54d58e1ee..742e7d793e 100644
+index 11cd9003e3..e99b1b9460 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1101,6 +1101,11 @@ public class WorldServer extends World {
+@@ -1102,6 +1102,11 @@ public class WorldServer extends World {
                  this.I.add(((EntityInsentient) entity).getNavigation());
              }
              entity.valid = true; // CraftBukkit
@@ -117,10 +117,10 @@ index d54d58e1ee..742e7d793e 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index cebbdec741..d20c05265a 100644
+index 049641db06..cc493ab7f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -944,4 +944,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1009,4 +1009,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
diff --git a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
index 3e972d960c..c7b9b70fd6 100644
--- a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,14 +1,14 @@
-From def800183b248ecec16bb7fe8c23196ff3450dc0 Mon Sep 17 00:00:00 2001
+From d3030029a797dd7be902e3c097c3821d170c7560 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index b5e0ba3909..16957b9aa2 100644
+index da30d2cf86..acd9edd670 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -179,7 +179,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -197,7 +197,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
              return IRegistry.BLOCK_ENTITY_TYPE.getKey(this.q()) + " // " + this.getClass().getCanonicalName();
          });
          if (this.world != null) {
@@ -23,7 +23,7 @@ index b5e0ba3909..16957b9aa2 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 446f864420..62c77d8f51 100644
+index 0d8e622294..051d7531d1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -674,11 +674,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
index df80f1b92d..9bfb69a9a0 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From 1ab46ee6d9339d3bcd0aeb14a5bf5167779f3bda Mon Sep 17 00:00:00 2001
+From 4b6c1894e50426cb0ea92df05d1cb611b786ea4b 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
@@ -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 af019fc3f1..49245b5c5f 100644
+index 7b7a437b93..fe73aef9cb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -384,9 +384,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -393,9 +393,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.fallDistance *= 0.5F;
          }
  
@@ -48,7 +48,7 @@ index af019fc3f1..49245b5c5f 100644
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -396,6 +402,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -405,6 +411,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.world.getMethodProfiler().exit();
      }
  
@@ -66,7 +66,7 @@ index af019fc3f1..49245b5c5f 100644
      protected void E() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -463,6 +480,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -472,6 +489,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fireTicks = 0;
      }
  
diff --git a/Spigot-Server-Patches/0028-Configurable-end-credits.patch b/Spigot-Server-Patches/0028-Configurable-end-credits.patch
index b6afb2f78b..1ba82e55ad 100644
--- a/Spigot-Server-Patches/0028-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0028-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From b050f65ecd22f2c4a4658bd195e2633834001d62 Mon Sep 17 00:00:00 2001
+From 96e182ab7959d4040f27304a92958605f8b05e5a Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -20,10 +20,10 @@ index a797a57671..c2b9690a0c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e7856b2abe..5548163666 100644
+index 67988b6c6a..550e6714bc 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -59,7 +59,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      private long cm = SystemUtils.getMonotonicMillis();
      private Entity spectatedEntity;
      public boolean worldChangeInvuln;
@@ -32,7 +32,7 @@ index e7856b2abe..5548163666 100644
      private final RecipeBookServer recipeBook;
      private Vec3D cr;
      private int cs;
-@@ -697,6 +697,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -698,6 +698,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.getWorldServer().removePlayer(this);
              if (!this.viewingCredits) {
                  this.viewingCredits = true;
diff --git a/Spigot-Server-Patches/0030-Optimize-explosions.patch b/Spigot-Server-Patches/0030-Optimize-explosions.patch
index 497661f64b..95d84acf69 100644
--- a/Spigot-Server-Patches/0030-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0030-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From bdafbcf48a32bfbede63ff359df1f1dfc81c23a5 Mon Sep 17 00:00:00 2001
+From 0b795b90b210f2cc81cb8c42dd048b493115dcc3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -123,10 +123,10 @@ index e1c628f177..bcff117619 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7dfe1f0a3c..8704c091d7 100644
+index 320af3f503..1a9a981ade 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1122,6 +1122,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1141,6 +1141,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
                  this.methodProfiler.exit();
                  this.methodProfiler.exit();
@@ -135,7 +135,7 @@ index 7dfe1f0a3c..8704c091d7 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 62c77d8f51..25f19091c7 100644
+index 051d7531d1..ee953c880e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -19,6 +19,7 @@ import org.apache.logging.log4j.util.Supplier;
diff --git a/Spigot-Server-Patches/0035-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0035-Send-absolute-position-the-first-time-an-entity-is-s.patch
index 818d9c8412..1037bb0683 100644
--- a/Spigot-Server-Patches/0035-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0035-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,4 +1,4 @@
-From 696f64b5a8f1a08651b60d9ebd499c623b2e41d9 Mon Sep 17 00:00:00 2001
+From 349002e874920f5e828deeee07cfbcdd4b8d36a2 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 315c3d9165..aaf3a54b08 100644
  
                  this.c();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index a44525304d..f49575b3ab 100644
+index ee65b01f43..0a64432384 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -1057,10 +1057,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1031,10 +1031,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 a44525304d..f49575b3ab 100644
              this.tracker = entity;
              this.trackingDistance = i;
              this.e = SectionPosition.a(entity);
-@@ -1142,7 +1146,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1116,7 +1120,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/0037-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0037-Configurable-container-update-tick-rate.patch
index fe5df936fc..3db5747be6 100644
--- a/Spigot-Server-Patches/0037-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0037-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From 0e0cdbb47aad3fb40ef01d000940577277963df4 Mon Sep 17 00:00:00 2001
+From 1b44495fde971b1629df210ba39c03af28d125ed Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -19,10 +19,10 @@ index e4e00e2e1c..d663b15ceb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fbde752052..dbb9a9a694 100644
+index 550e6714bc..409443356a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -71,6 +71,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public boolean e;
      public int ping;
      public boolean viewingCredits;
@@ -30,7 +30,7 @@ index fbde752052..dbb9a9a694 100644
  
      // CraftBukkit start
      public String displayName;
-@@ -348,7 +349,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -349,7 +350,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              --this.noDamageTicks;
          }
  
diff --git a/Spigot-Server-Patches/0038-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0038-Use-UserCache-for-player-heads.patch
index 9c67e08f0d..4110c5557d 100644
--- a/Spigot-Server-Patches/0038-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0038-Use-UserCache-for-player-heads.patch
@@ -1,14 +1,14 @@
-From f21af7ce096c13e137b69a2704cf76b7a80ae5b4 Mon Sep 17 00:00:00 2001
+From c0388a11bd083d4ad27ce482b73392570976b7b2 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 63ec8d06e4..f270532763 100644
+index c83bebe709..0136e1bfe1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -152,7 +152,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -155,7 +155,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          if (name == null) {
              profile = null;
          } else {
diff --git a/Spigot-Server-Patches/0042-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0042-Ensure-commands-are-not-ran-async.patch
index 19fe189cce..bde196b137 100644
--- a/Spigot-Server-Patches/0042-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0042-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From b65da8135d73b3be5877239a3751c4dcd150f97f Mon Sep 17 00:00:00 2001
+From 16a2ee411f4aa6292cf8f94b00b89e58f594641f 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 287bba3f6c..9d7bbafe02 100644
+index e07f4a9680..c73fd79666 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1579,6 +1579,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1578,6 +1578,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index 287bba3f6c..9d7bbafe02 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 de592ae851..9c54d151df 100644
+index 72902d2f5d..8551073ab2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -704,6 +704,29 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0045-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0045-Expose-server-CommandMap.patch
index a06f41bb79..ef454414c9 100644
--- a/Spigot-Server-Patches/0045-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0045-Expose-server-CommandMap.patch
@@ -1,14 +1,14 @@
-From cbac1504f2d1b1c6ebe7c912bbe54df2e4a856f9 Mon Sep 17 00:00:00 2001
+From 9a6df7e78a63ba269903c9ad72ce7820692e0974 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9c54d151df..1c96beab7d 100644
+index 8551073ab2..bb20024ba2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1579,6 +1579,7 @@ public final class CraftServer implements Server {
+@@ -1582,6 +1582,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  
diff --git a/Spigot-Server-Patches/0046-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0046-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 6b2b28abd3..2a6fa65adc 100644
--- a/Spigot-Server-Patches/0046-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0046-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,14 +1,14 @@
-From 86ae9c4cb8b6cae07cff69f6ee2a0ff8aa5fb7d1 Mon Sep 17 00:00:00 2001
+From 379ad4d6b1430efec2297f0b1472ea0136bc6d59 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d01e06f1b9..d98b98e856 100644
+index 46b3001439..4b5b2ae34e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -99,7 +99,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -101,7 +101,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setHealth(double health) {
          health = (float) health;
          if ((health < 0) || (health > getMaxHealth())) {
diff --git a/Spigot-Server-Patches/0047-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0047-Player-Tab-List-and-Title-APIs.patch
index 148e021868..2ac839eb34 100644
--- a/Spigot-Server-Patches/0047-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0047-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 7ee3c5a8e6f38b0679e2450f39f8e2e9e2413c03 Mon Sep 17 00:00:00 2001
+From be4d46773160f8c9ce10bcd3f1ecff3f5e7673e8 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -52,7 +52,7 @@ index 3a6e780007..535056c64e 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6b93cc3a57..d56fbdf80b 100644
+index a3628b2c2c..00be351e07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -62,7 +62,7 @@ index 6b93cc3a57..d56fbdf80b 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -206,6 +207,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -208,6 +209,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/Spigot-Server-Patches/0051-Add-velocity-warnings.patch b/Spigot-Server-Patches/0051-Add-velocity-warnings.patch
index cc9fbc2561..63b0709899 100644
--- a/Spigot-Server-Patches/0051-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0051-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From f030cae6bc568729c3bdb652614b9265f2df84a7 Mon Sep 17 00:00:00 2001
+From 789cd00899d4fbcbb5379909561c1bcae7648929 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1c96beab7d..01d5a49cf7 100644
+index bb20024ba2..120c3a613b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -230,6 +230,7 @@ public final class CraftServer implements Server {
@@ -17,10 +17,10 @@ index 1c96beab7d..01d5a49cf7 100644
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d20c05265a..fb2047bffa 100644
+index cc493ab7f7..0b7fc359d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -396,10 +396,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -405,10 +405,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public void setVelocity(Vector velocity) {
          Preconditions.checkArgument(velocity != null, "velocity");
          velocity.checkFinite();
diff --git a/Spigot-Server-Patches/0052-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0052-Configurable-inter-world-teleportation-safety.patch
index bcf12fcd49..b84e50b03f 100644
--- a/Spigot-Server-Patches/0052-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0052-Configurable-inter-world-teleportation-safety.patch
@@ -1,4 +1,4 @@
-From 3b560988fe8b70cd78cf8e5913ef9b8963cab5c2 Mon Sep 17 00:00:00 2001
+From ccde4241ae0089c2dbc015c597c9ed037db7f42b Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -30,10 +30,10 @@ index 320fd07c62..94f5c90b3c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d56fbdf80b..b993d236b5 100644
+index 00be351e07..afa209f227 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -743,7 +743,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -745,7 +745,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {
diff --git a/Spigot-Server-Patches/0053-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0053-Add-exception-reporting-event.patch
index aab2aa7ae7..de9a927b43 100644
--- a/Spigot-Server-Patches/0053-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0053-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 132e8398b585be26653081f5ad7d9b558b9c0484 Mon Sep 17 00:00:00 2001
+From b7e3ec23edd18418b43f7932d0a9ea4310e0ee8d 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
@@ -121,10 +121,10 @@ index 1dd793d2fb..61ea2818b1 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index f49575b3ab..26125fe27a 100644
+index 0a64432384..5ecf446e11 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -622,6 +622,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -596,6 +596,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 f49575b3ab..26125fe27a 100644
                  return;
              }
  
-@@ -648,6 +649,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -622,6 +623,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  this.write(chunkcoordintpair, nbttagcompound);
              } catch (Exception exception) {
                  PlayerChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception);
@@ -267,7 +267,7 @@ index 3c5b3fe101..47a4ea9985 100644
          } finally {
              if (pushbackinputstream != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index d99634062b..86a5ee8aac 100644
+index 8823f94f7b..552daf4376 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -280,7 +280,7 @@ index d99634062b..86a5ee8aac 100644
  import org.apache.commons.lang.Validate;
  import org.bukkit.plugin.IllegalPluginAccessException;
  import org.bukkit.plugin.Plugin;
-@@ -390,20 +393,26 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -393,20 +396,26 @@ public class CraftScheduler implements BukkitScheduler {
                  try {
                      task.run();
                  } catch (final Throwable throwable) {
diff --git a/Spigot-Server-Patches/0055-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0055-Disable-Scoreboards-for-non-players-by-default.patch
index f8a639f537..c48e73a9b7 100644
--- a/Spigot-Server-Patches/0055-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0055-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 3e23947760e0ec7eb777f34679372e128c282a02 Mon Sep 17 00:00:00 2001
+From 22f37631cf7184718b02b44242679a71a62c4959 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
@@ -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 49245b5c5f..9ad8893943 100644
+index fe73aef9cb..67199fd0ff 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2188,6 +2188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2208,6 +2208,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase getScoreboardTeam() {
diff --git a/Spigot-Server-Patches/0056-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0056-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 79079dd0fb..407021be2f 100644
--- a/Spigot-Server-Patches/0056-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0056-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,14 +1,14 @@
-From 36f151f93826062aa0d486731dd87c96c6ced8dc Mon Sep 17 00:00:00 2001
+From 60c47a3db5b36b1b1742c452527d895223afb2a9 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index defcfc9337..424b2b7088 100644
+index 4b5b2ae34e..540f6ea8ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -538,4 +538,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -585,4 +585,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public boolean isCollidable() {
          return getHandle().collides;
      }
diff --git a/Spigot-Server-Patches/0057-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0057-Complete-resource-pack-API.patch
index 6cf29e262d..dc4e0eeb4e 100644
--- a/Spigot-Server-Patches/0057-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0057-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From a48383fd414daf754066154d927930852400201e Mon Sep 17 00:00:00 2001
+From da1180199e3adcaaa60cb6370fad3352e3dc2144 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 9d7bbafe02..e83ebaf4f4 100644
+index c73fd79666..b7c8cab9ea 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1344,7 +1344,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1343,7 +1343,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 9d7bbafe02..e83ebaf4f4 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 b993d236b5..326200fd58 100644
+index afa209f227..7209794ce9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -131,6 +131,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -36,7 +36,7 @@ index b993d236b5..326200fd58 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1753,6 +1757,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1755,6 +1759,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          getHandle().server.getCommandDispatcher().a(getHandle());
      }
  
diff --git a/Spigot-Server-Patches/0060-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0060-Allow-Reloading-of-Custom-Permissions.patch
index 168e2c4e80..686e4c7fa5 100644
--- a/Spigot-Server-Patches/0060-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0060-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From eee12efdff4e2f32f84f028a95839c0da8018e70 Mon Sep 17 00:00:00 2001
+From 20fd4a7f1c069d95060617fb16f35f8ba4b26397 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b2861fd0ba..591d3702b5 100644
+index 10588bc672..4d3a246ee5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2029,5 +2029,23 @@ public final class CraftServer implements Server {
+@@ -2033,5 +2033,23 @@ public final class CraftServer implements Server {
              return false;
          }
      }
diff --git a/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
index c43a988771..6ef0893759 100644
--- a/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 254ea00cb305b0db306aafaf25b383c0e3b83fb4 Mon Sep 17 00:00:00 2001
+From 059159f7ef5559325d589a7702c9c16eb9d07d60 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -78,7 +78,7 @@ index aa6a58dd88..b643a41235 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 9ed7f8ede4..6c00ca7378 100644
+index 5d71addb0c..00497350a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -178,28 +178,11 @@ public final class CraftItemStack extends ItemStack {
@@ -193,7 +193,7 @@ index 9ed7f8ede4..6c00ca7378 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index e3ca978f89..b3f8249b06 100644
+index ab77a37e75..0d513e1f33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -24,6 +24,7 @@ import java.util.ArrayList;
@@ -220,7 +220,7 @@ index e3ca978f89..b3f8249b06 100644
  import net.minecraft.server.NBTBase;
  import net.minecraft.server.NBTCompressedStreamTools;
  import net.minecraft.server.NBTTagCompound;
-@@ -263,7 +266,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -268,7 +271,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      private List<IChatBaseComponent> lore;
      private Integer customModelData;
      private String blockData;
@@ -229,16 +229,16 @@ index e3ca978f89..b3f8249b06 100644
      private Multimap<Attribute, AttributeModifier> attributeModifiers;
      private int repairCost;
      private int hideFlag;
-@@ -274,7 +277,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-     private static final CraftCustomTagTypeRegistry TAG_TYPE_REGISTRY = new CraftCustomTagTypeRegistry();
+@@ -279,7 +282,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+     private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
  
      private NBTTagCompound internalTag;
 -    private final Map<String, NBTBase> unhandledTags = new HashMap<String, NBTBase>();
 +    private final Map<String, NBTBase> unhandledTags = new TreeMap<>(); // Paper
-     private final CraftCustomItemTagContainer publicItemTagContainer = new CraftCustomItemTagContainer(TAG_TYPE_REGISTRY);
+     private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
  
      private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only
-@@ -295,7 +298,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -300,7 +303,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          this.blockData = meta.blockData;
  
          if (meta.enchantments != null) { // Spigot
@@ -247,7 +247,7 @@ index e3ca978f89..b3f8249b06 100644
          }
  
          if (meta.hasAttributeModifiers()) {
-@@ -391,13 +394,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -396,13 +399,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -263,7 +263,7 @@ index e3ca978f89..b3f8249b06 100644
  
          for (int i = 0; i < ench.size(); i++) {
              String id = ((NBTTagCompound) ench.get(i)).getString(ENCHANTMENTS_ID.NBT);
-@@ -549,13 +552,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -554,13 +557,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -279,14 +279,15 @@ index e3ca978f89..b3f8249b06 100644
          for (Map.Entry<?, ?> entry : ench.entrySet()) {
              // Doctor older enchants
              String enchantKey = entry.getKey().toString();
-@@ -798,13 +801,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-     }
+@@ -811,14 +814,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
+     @Override
      public Map<Enchantment, Integer> getEnchants() {
 -        return hasEnchants() ? ImmutableMap.copyOf(enchantments) : ImmutableMap.<Enchantment, Integer>of();
 +        return hasEnchants() ? ImmutableSortedMap.copyOfSorted(enchantments) : ImmutableMap.<Enchantment, Integer>of(); // Paper
      }
  
+     @Override
      public boolean addEnchant(Enchantment ench, int level, boolean ignoreRestrictions) {
          Validate.notNull(ench, "Enchantment cannot be null");
          if (enchantments == null) {
@@ -295,7 +296,7 @@ index e3ca978f89..b3f8249b06 100644
          }
  
          if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) {
-@@ -1170,7 +1173,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1196,7 +1199,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              clone.customModelData = this.customModelData;
              clone.blockData = this.blockData;
              if (this.enchantments != null) {
@@ -304,7 +305,7 @@ index e3ca978f89..b3f8249b06 100644
              }
              if (this.hasAttributeModifiers()) {
                  clone.attributeModifiers = HashMultimap.create(this.attributeModifiers);
-@@ -1395,6 +1398,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1424,6 +1427,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
diff --git a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 81b6a17b2c..d7b7bfebf3 100644
--- a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From 464d72e32ae10b3fe24c1191eb13cabde58a3872 Mon Sep 17 00:00:00 2001
+From 42d31ed7a97bc379dbe761f4215fbe03e7fa75a3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
@@ -44,10 +44,10 @@ index 44570edcae..5ae7014887 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 326200fd58..e866480f04 100644
+index 7209794ce9..7edb01082a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1563,6 +1563,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1565,6 +1565,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
diff --git a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
index 0ab6a12438..aa76ea3371 100644
--- a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From da7e2198ebbb80405295fbe12e64addb0c7de6bc Mon Sep 17 00:00:00 2001
+From 89ff2472dac345bdfabad959e4624bfd8e1c4bcf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,10 +6,10 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9ad8893943..5744760acc 100644
+index 67199fd0ff..bff30aac1c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -51,6 +51,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -54,6 +54,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
@@ -30,7 +30,7 @@ index 9ad8893943..5744760acc 100644
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -182,7 +196,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -185,7 +199,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.B = Vec3D.a;
          this.av = 1.0F;
          this.aw = 1.0F;
diff --git a/Spigot-Server-Patches/0072-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0072-Access-items-by-EquipmentSlot.patch
index f1b875bb26..465c83226c 100644
--- a/Spigot-Server-Patches/0072-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0072-Access-items-by-EquipmentSlot.patch
@@ -1,14 +1,14 @@
-From 95cb3da5a69aa89cc552cf83a94d4eeff8cb2625 Mon Sep 17 00:00:00 2001
+From 8c74d27fd8b984b8301ef5712a94a74d5733a0ad Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index d5b90069c..c7db9bd39 100644
+index 5873b76236..ef4cd7a7b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-@@ -249,4 +249,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
+@@ -268,4 +268,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
      public void setBootsDropChance(float chance) {
          throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
      }
diff --git a/Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 5a6907cbf0..0eba07fcad 100644
--- a/Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -1,4 +1,4 @@
-From 8340921d81719bbc4211856ad6cd864a09883c89 Mon Sep 17 00:00:00 2001
+From 3d9dc4c654ac0bd1d7a1c8a7e5c81e3c61b2b403 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
@@ -32,10 +32,10 @@ index 469a3be057..f2c429f22e 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4e97e74a20..c5359ae248 100644
+index 1a9a981ade..f35289e4ff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1087,6 +1087,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1106,6 +1106,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          // CraftBukkit - dropTickTime
          for (Iterator iterator = this.getWorlds().iterator(); iterator.hasNext();) {
              WorldServer worldserver = (WorldServer) iterator.next();
@@ -66,7 +66,7 @@ index 3d47fc899e..d8723c82d8 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 399a766b3b..7923808ff1 100644
+index 6857e8a052..5fe2041b9d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -76,6 +76,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
index 6e86550a5a..6b5f0b5251 100644
--- a/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,14 +1,14 @@
-From d647d04ede2b5474f0cb91095508711bd941a00c Mon Sep 17 00:00:00 2001
+From c5bd4c046c5623d852b9dc727a4b8f0cba872b3f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7923808ff1..0fee51ac4a 100644
+index 5fe2041b9d..269f793926 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1107,6 +1107,7 @@ public class WorldServer extends World {
+@@ -1108,6 +1108,7 @@ public class WorldServer extends World {
                  entity.origin = entity.getBukkitEntity().getLocation();
              }
              // Paper end
@@ -16,7 +16,7 @@ index 7923808ff1..0fee51ac4a 100644
          }
  
      }
-@@ -1116,6 +1117,7 @@ public class WorldServer extends World {
+@@ -1117,6 +1118,7 @@ public class WorldServer extends World {
          if (this.tickingEntities) {
              throw new IllegalStateException("Removing entity while ticking!");
          } else {
diff --git a/Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch
index 31b43a8cc2..508e7a4a3b 100644
--- a/Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,11 +1,11 @@
-From 042628a3daddaf353397c8378d2ea16071cad063 Mon Sep 17 00:00:00 2001
+From 2e277508847c335f51c14a2bb61758099d1bdbcb 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 680adbdeb..3f7697b39 100644
+index 680adbdeb0..3f7697b39c 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 680adbdeb..3f7697b39 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 e83ebaf4f..7b8caa0b9 100644
+index b7c8cab9ea..ce98f690e8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1923,6 +1923,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1922,6 +1922,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
              }
          }
diff --git a/Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 51996ca658..e37c0dc412 100644
--- a/Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,14 +1,14 @@
-From d372b2f3ee68da28fec46cd5c9d313d6b734e0c7 Mon Sep 17 00:00:00 2001
+From 41f9603cf89851f8d59fdc5c9111138712090c3a 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 f904e1c28..bf6cf1ce5 100644
+index 6541ce24fa..6997c31a2c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -160,6 +160,7 @@ public abstract class PlayerList {
+@@ -161,6 +161,7 @@ public abstract class PlayerList {
          playerconnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
          playerconnection.sendPacket(new PacketPlayOutRecipeUpdate(this.server.getCraftingManager().b()));
          playerconnection.sendPacket(new PacketPlayOutTags(this.server.getTagRegistry()));
diff --git a/Spigot-Server-Patches/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index bf7027bd9c..4c1d28d900 100644
--- a/Spigot-Server-Patches/0087-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 6176b038f0f8fddd52cea7c668e06dc3a7403c4b Mon Sep 17 00:00:00 2001
+From 4b363f2ad753aad4f3cea1a978ed611e23fbd38a 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 59d11e68c..1da7ffab5 100644
+index 59d11e68c9..1da7ffab5d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -250,4 +250,9 @@ public class PaperWorldConfig {
@@ -26,10 +26,10 @@ index 59d11e68c..1da7ffab5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7b8caa0b9..42eac6b71 100644
+index ce98f690e8..cd0f62f5f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1657,7 +1657,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1656,7 +1656,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      return;
                  }
  
@@ -48,10 +48,10 @@ index 7b8caa0b9..42eac6b71 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 bf6cf1ce5..b3343fca2 100644
+index 6997c31a2c..4f47b245da 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -175,7 +175,7 @@ public abstract class PlayerList {
+@@ -176,7 +176,7 @@ public abstract class PlayerList {
          }
          // CraftBukkit start
          chatmessage.a(EnumChatFormat.YELLOW);
diff --git a/Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch
index 29489f82e8..cbf4a7a0e7 100644
--- a/Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 30b50625c0c4b3e5c9bc22a5ecc7b7ff55f9c26c Mon Sep 17 00:00:00 2001
+From 85f4312ca4d64509eb61b9d85665e53ce8d433d6 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,10 +6,10 @@ 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 e866480f0..bc1b46484 100644
+index 7edb01082a..f75ac03b74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -753,6 +753,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -755,6 +755,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
diff --git a/Spigot-Server-Patches/0091-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0091-Configurable-Player-Collision.patch
index 266e701305..71d06f38b4 100644
--- a/Spigot-Server-Patches/0091-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0091-Configurable-Player-Collision.patch
@@ -1,11 +1,11 @@
-From 64e3e00b0d04cf06cb339c4804a6f30d4668d75f Mon Sep 17 00:00:00 2001
+From 0e050619e109c562ed59cc20e4cca894719f7c41 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 e929ba452..033fcf50e 100644
+index e929ba4529..033fcf50ea 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -220,4 +220,9 @@ public class PaperConfig {
@@ -19,11 +19,11 @@ index e929ba452..033fcf50e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c5359ae24..43cd6d2c6 100644
+index f35289e4ff..e0dde2216a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -438,6 +438,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-             this.loadSpawn(worldserver.getChunkProvider().playerChunkMap.worldLoadListener, worldserver);
+@@ -440,6 +440,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+             this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
  
 +        // Paper start - Handle collideRule team for player collision toggle
@@ -44,7 +44,7 @@ index c5359ae24..43cd6d2c6 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 b0740965a..6b1a914d2 100644
+index b0740965a4..6b1a914d2f 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 b0740965a..6b1a914d2 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 b3343fca2..7003c4a93 100644
+index 4f47b245da..882dd07e7f 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 {
@@ -68,7 +68,7 @@ index b3343fca2..7003c4a93 100644
  
      public PlayerList(MinecraftServer minecraftserver, int i) {
          this.cserver = minecraftserver.server = new CraftServer((DedicatedServer) minecraftserver, this);
-@@ -284,6 +285,13 @@ public abstract class PlayerList {
+@@ -285,6 +286,13 @@ public abstract class PlayerList {
          }
  
          entityplayer.syncInventory();
@@ -82,7 +82,7 @@ index b3343fca2..7003c4a93 100644
          // CraftBukkit - Moved from above, added world
          PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.world.worldData.getName(), entityplayer.locX, entityplayer.locY, entityplayer.locZ);
      }
-@@ -402,6 +410,16 @@ public abstract class PlayerList {
+@@ -403,6 +411,16 @@ public abstract class PlayerList {
          entityplayer.playerTick();// SPIGOT-924
          // CraftBukkit end
  
@@ -99,7 +99,7 @@ index b3343fca2..7003c4a93 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getRootVehicle();
-@@ -1024,7 +1042,13 @@ public abstract class PlayerList {
+@@ -1026,7 +1044,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end
diff --git a/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch
index 9fceb63dcc..bf9d9423db 100644
--- a/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch
@@ -1,14 +1,14 @@
-From 75eff88fb2e2b9bb608a0e69a7a173085eea922c Mon Sep 17 00:00:00 2001
+From 5b8f5317f8a927fdcfb7a0153a52663d7d76dd82 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 dbb9a9a69..6b6c14567 100644
+index 409443356a..9b68c5fec1 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -36,7 +36,7 @@ import org.bukkit.inventory.MainHand;
+@@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
  public class EntityPlayer extends EntityHuman implements ICrafting {
  
      private static final Logger LOGGER = LogManager.getLogger();
@@ -17,7 +17,7 @@ index dbb9a9a69..6b6c14567 100644
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
-@@ -1423,13 +1423,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1441,13 +1441,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }
@@ -40,10 +40,10 @@ index dbb9a9a69..6b6c14567 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 bc1b46484..4e12b6406 100644
+index f75ac03b74..06db4a8f04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1747,8 +1747,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1749,8 +1749,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
@@ -56,7 +56,7 @@ index bc1b46484..4e12b6406 100644
      }
  
      // Paper start
-@@ -1827,7 +1829,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1829,7 +1831,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
diff --git a/Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch
index 3198ddd621..f5ae61ee36 100644
--- a/Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From d8085c16c673d63ddda105426826b113e4c1aee5 Mon Sep 17 00:00:00 2001
+From 2d693aeba36b336a2f470b3a6b9c648d06f20b4c 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 43cd6d2c6..cddb4311a 100644
+index e0dde2216a..e9fad2999d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -61,6 +61,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -17,7 +17,7 @@ index 43cd6d2c6..cddb4311a 100644
      public static final Logger LOGGER = LogManager.getLogger();
      public static final File b = new File("usercache.json");
      public static final WorldSettings c = (new WorldSettings((long) "North Carolina".hashCode(), EnumGamemode.SURVIVAL, true, false, WorldType.NORMAL)).a();
-@@ -166,6 +167,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -167,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
          super("Server");
@@ -25,7 +25,7 @@ index 43cd6d2c6..cddb4311a 100644
          this.ae = new ResourceManager(EnumResourcePackType.SERVER_DATA, this.serverThread);
          this.resourcePackRepository = new ResourcePackRepository<>(ResourcePackLoader::new);
          this.ai = new CraftingManager();
-@@ -1893,7 +1895,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1916,7 +1918,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Deprecated
      public static MinecraftServer getServer() {
diff --git a/Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch
index 4f20b10fb0..fa716d6e4e 100644
--- a/Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 472adc5afb5e00d4237f753c14899bd06f52071f Mon Sep 17 00:00:00 2001
+From 0db0762560688201711a37c7d2b1289a82a89301 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 377f4983b..805aa5699 100644
+index 377f4983b7..805aa56999 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -265,4 +265,26 @@ public class PaperWorldConfig {
@@ -43,7 +43,7 @@ index 377f4983b..805aa5699 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 000000000..d6fce3112
+index 0000000000..d6fce3112e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -82,7 +82,7 @@ index 000000000..d6fce3112
 +}
 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 000000000..5e637782d
+index 0000000000..5e637782d5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
 @@ -0,0 +1,28 @@
@@ -116,7 +116,7 @@ index 000000000..5e637782d
 +}
 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 000000000..856843fc9
+index 0000000000..856843fc91
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
 @@ -0,0 +1,71 @@
@@ -193,7 +193,7 @@ index 000000000..856843fc9
 +}
 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 000000000..b5401eaf9
+index 0000000000..b5401eaf97
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 @@ -0,0 +1,179 @@
@@ -378,7 +378,7 @@ index 000000000..b5401eaf9
 +}
 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 000000000..f9fbc221b
+index 0000000000..f9fbc221bd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
 @@ -0,0 +1,64 @@
@@ -448,7 +448,7 @@ index 000000000..f9fbc221b
 +}
 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 000000000..d50410532
+index 0000000000..d50410532c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 @@ -0,0 +1,67 @@
@@ -520,10 +520,10 @@ index 000000000..d50410532
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5744760ac..3dcd93e5e 100644
+index bff30aac1c..2f4e56fc56 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -69,6 +69,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
  
@@ -532,7 +532,7 @@ index 5744760ac..3dcd93e5e 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 66826da45..b84a70edb 100644
+index 66826da450..b84a70edb4 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 66826da45..b84a70edb 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 56c7f9b4e..a12d49fc4 100644
+index 56c7f9b4e3..a12d49fc4d 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,10 +646,10 @@ index 56c7f9b4e..a12d49fc4 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 8617fac6b..4f4121adc 100644
+index 57443ca6f0..d8b3d2f3d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-@@ -61,7 +61,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
+@@ -65,7 +65,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
      }
  
      // gets the wrapped TileEntity
@@ -659,10 +659,10 @@ index 8617fac6b..4f4121adc 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 0e8f1a89f..18c80b35b 100644
+index 6beb992622..019fa71181 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-@@ -12,8 +12,9 @@ import org.bukkit.craftbukkit.CraftWorld;
+@@ -11,8 +11,9 @@ import org.bukkit.craftbukkit.CraftWorld;
  import org.bukkit.craftbukkit.inventory.CraftInventory;
  import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
  import org.bukkit.inventory.Inventory;
@@ -674,7 +674,7 @@ index 0e8f1a89f..18c80b35b 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 e1ad26a24..678aa09d4 100644
+index e1ad26a242..678aa09d47 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 e1ad26a24..678aa09d4 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 9225082bd..3f82a7957 100644
+index e05624e643..ab4807b2cd 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 9225082bd..3f82a7957 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 2d776b520..fcc978784 100644
+index 2d776b520b..fcc9787848 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 2d776b520..fcc978784 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 44b3418b1..d56cbeac4 100644
+index 334bd5bb3f..f5b31237fc 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/0103-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch
index c736a95aee..9752b2dd24 100644
--- a/Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From 245f3f088315c482ace01add5ac71d7876577d44 Mon Sep 17 00:00:00 2001
+From f91fbcf96f3da34af86e02ca8361b0d95c3d7a9e 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,10 +10,10 @@ 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 cddb4311a..c41adf441 100644
+index e9fad2999d..d7071929b8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -727,7 +727,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -740,7 +740,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          // Spigot start
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              LOGGER.info("Saving usercache.json");
@@ -23,7 +23,7 @@ index cddb4311a..c41adf441 100644
          // Spigot end
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 41be5bf64..cd8a652eb 100644
+index 41be5bf64e..cd8a652eb6 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -108,7 +108,7 @@ public class UserCache {
diff --git a/Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch
index c972bcdb66..92ad3b6b7c 100644
--- a/Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,4 +1,4 @@
-From b797b2e75914664e9f3ec6516cea6ba9deaec506 Mon Sep 17 00:00:00 2001
+From ff6b987910bf028eaeab7c4ed38bd9e7ee35e319 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
@@ -32,10 +32,10 @@ index 805aa56999..92ab55182f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3dcd93e5e9..989fb44a0d 100644
+index 2f4e56fc56..2f1cd47619 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -104,7 +104,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -107,7 +107,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public double locX;
      public double locY;
      public double locZ;
@@ -44,7 +44,7 @@ index 3dcd93e5e9..989fb44a0d 100644
      public float yaw;
      public float pitch;
      public float lastYaw;
-@@ -1094,6 +1094,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1103,6 +1103,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean au() {
@@ -57,7 +57,7 @@ index 3dcd93e5e9..989fb44a0d 100644
          return this.isInWater() || this.l();
      }
  
-@@ -2620,6 +2626,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2640,6 +2646,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bD() {
diff --git a/Spigot-Server-Patches/0107-Add-server-name-parameter.patch b/Spigot-Server-Patches/0107-Add-server-name-parameter.patch
index 7c942c8831..b6642e43d2 100644
--- a/Spigot-Server-Patches/0107-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0107-Add-server-name-parameter.patch
@@ -1,14 +1,14 @@
-From 1b2bce1bc325f0feb676e7d86a35588a9a598278 Mon Sep 17 00:00:00 2001
+From 00dc73fe3a8769eb28d5bc2eb930d75ae7816654 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 a96c144fc..5203e781e 100644
+index 7f5ea764d7..c5d5121fd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -135,6 +135,14 @@ public class Main {
+@@ -136,6 +136,14 @@ public class Main {
                          .defaultsTo(new File("paper.yml"))
                          .describedAs("Yml file");
                  // Paper end
diff --git a/Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch
index 42858a7eb0..bfa19d5217 100644
--- a/Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 8199add0f4a50441fb4a954f46f98486a36f8d75 Mon Sep 17 00:00:00 2001
+From 573d367a58a83b1d1598fa03f3ab124a6b8d5ae7 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 dabfb8067..f80ba567f 100644
+index dabfb8067b..f80ba567f2 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,19 +25,19 @@ index dabfb8067..f80ba567f 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 85a1c5666..d8cc35352 100644
+index acd9edd670..d70b678de3 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -12,6 +12,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
- 
-     public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper
+@@ -19,6 +19,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+     public final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
+     // CraftBukkit end
      private static final Logger LOGGER = LogManager.getLogger();
 +    boolean isLoadingStructure = false; // Paper
      private final TileEntityTypes<?> b; public TileEntityTypes getTileEntityType() { return b; } // Paper - OBFHELPER
      @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 86505f25c..9de03a24c 100644
+index 86505f25c1..9de03a24cf 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-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch
index 4d7a567490..6fac52df61 100644
--- a/Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,14 +1,14 @@
-From 5519add5355658a7cf972992a598a442e340a47f Mon Sep 17 00:00:00 2001
+From 18e3888c278a1fb0720e69e10bb56d8dde181796 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 42eac6b71..57ef91a43 100644
+index cd0f62f5f0..a95abdbc6d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -363,7 +363,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -361,7 +361,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                  if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
                      flag1 = true;
diff --git a/Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch
index a9f0036d10..950cd6a295 100644
--- a/Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch
@@ -1,14 +1,14 @@
-From ce65ea14cded06d3150ff4e7fa6a1b46ba0d92a8 Mon Sep 17 00:00:00 2001
+From bd4ea8e02d139fda914a2764aa6b778fa36ce1ac 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 6b6c145675..b075e80f79 100644
+index 9b68c5fec1..088475d8f6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -959,6 +959,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -975,6 +975,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (entity1 != entity && this.playerConnection != null) {
              this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
          }
diff --git a/Spigot-Server-Patches/0114-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0114-Add-setting-for-proxy-online-mode-status.patch
index a89457c0fe..7513413c05 100644
--- a/Spigot-Server-Patches/0114-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 67285c293c5b07083146b9c3b1c06efe8c7ca294 Mon Sep 17 00:00:00 2001
+From 4019a8443459dda1b6c7c007d844cd5bce470116 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 a89a9bfcb..1089be17d 100644
+index a89a9bfcb5..1089be17d9 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 a89a9bfcb..1089be17d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 61ea2818b..26c786106 100644
+index 61ea2818b1..26c7861061 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,10 +45,10 @@ index 61ea2818b..26c786106 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 cf9594ea2..46f902073 100644
+index d8ad366341..1f0e63a1c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1349,7 +1349,8 @@ public final class CraftServer implements Server {
+@@ -1352,7 +1352,8 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
diff --git a/Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch
index 9466037233..ec43ac3e5f 100644
--- a/Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From 5570566531af5978d5fe573b05b3e6fe43119a77 Mon Sep 17 00:00:00 2001
+From 18c845e8e2c155c0fd9a9941ec290b4e47264bed 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 1089be17d..a2e204014 100644
+index 1089be17d9..a2e204014f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -240,4 +240,13 @@ public class PaperConfig {
@@ -23,10 +23,10 @@ index 1089be17d..a2e204014 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 57ef91a43..cb6199603 100644
+index a95abdbc6d..d0689953de 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1217,13 +1217,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1216,13 +1216,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
diff --git a/Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch
index 137d8f489e..d3f8f02f61 100644
--- a/Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From 4f280e6c0438b87dafa7a464285978a00c2f362b Mon Sep 17 00:00:00 2001
+From 5f17b7d7f61edeebee71d652cfefc570c3d4f1dd 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 a2e204014..7ce370e92 100644
+index a2e204014f..7ce370e92f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -249,4 +249,11 @@ public class PaperConfig {
@@ -21,10 +21,10 @@ index a2e204014..7ce370e92 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cb6199603..982b15dec 100644
+index d0689953de..ea62e9bafd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -146,7 +146,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          if (this.B) {
              if (++this.C > 80) {
                  PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getDisplayName().getString());
@@ -33,7 +33,7 @@ index cb6199603..982b15dec 100644
                  return;
              }
          } else {
-@@ -165,7 +165,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -163,7 +163,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              if (this.D && this.player.getRootVehicle().getRidingPassenger() == this.player) {
                  if (++this.E > 80) {
                      PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getDisplayName().getString());
diff --git a/Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 40d48fc08b..5a3e66eea0 100644
--- a/Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,14 +1,14 @@
-From 3a18bc30e3b1330325004d59524861dfe4769ba8 Mon Sep 17 00:00:00 2001
+From 0caf657407a19815246778d82f2941f8de3c70fd 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 75aae03b6..fea7ca9db 100644
+index 1ed9a4e32e..9eb9801376 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-@@ -61,4 +61,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {
+@@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {
          Validate.isTrue(chance >= 0 && chance <= 1, "The bite chance must be between 0 and 1.");
          this.biteChance = chance;
      }
diff --git a/Spigot-Server-Patches/0120-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0120-Auto-fix-bad-Y-levels-on-player-login.patch
index aaf5e615de..3b167cfc81 100644
--- a/Spigot-Server-Patches/0120-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 f86a4c50936dac9d4370480b8ffacf603b5c1543 Mon Sep 17 00:00:00 2001
+From 17b7e7a2d3ad65237784d2d68b538ba13df67153 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,10 +6,10 @@ 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 c1ba294ec..5610c539a 100644
+index 088475d8f6..d61d159d11 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -190,6 +190,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -191,6 +191,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void a(NBTTagCompound nbttagcompound) {
          super.a(nbttagcompound);
diff --git a/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
index 6e0708761b..d6c7cb3d81 100644
--- a/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From beab69d9648328eeebe81983434ee0f661a7b31a Mon Sep 17 00:00:00 2001
+From d8b81595d51b50634099cdc7a0864b272bcef917 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 01202e4d5..616075569 100644
+index 01202e4d53..616075569f 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 01202e4d5..616075569 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 cc66f565c..c34868324 100644
+index cc66f565c3..c348683247 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -573,6 +573,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,10 +39,10 @@ index cc66f565c..c34868324 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 9f592d2fc..0d16d1430 100644
+index 0736c83a4e..1632969249 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -980,6 +980,14 @@ public class CraftEventFactory {
+@@ -994,6 +994,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0126-Optimise-removeQueue.patch b/Spigot-Server-Patches/0126-Optimise-removeQueue.patch
index d5f7f37aa3..864ef1e25c 100644
--- a/Spigot-Server-Patches/0126-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0126-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From a5a3b9ff7494452e2713dae4f6c2a3f8cdefa9f1 Mon Sep 17 00:00:00 2001
+From 4c4a157dd89cb73330a1850b5062b9880bae307c 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 97b5dc7f24..df850f7b9c 100644
+index d61d159d11..f4f5ae50b4 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;
@@ -18,7 +18,7 @@ index 97b5dc7f24..df850f7b9c 100644
  import java.util.Iterator;
  import java.util.List;
  import java.util.OptionalInt;
-@@ -40,7 +42,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -41,7 +43,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
@@ -27,7 +27,7 @@ index 97b5dc7f24..df850f7b9c 100644
      private final AdvancementDataPlayer advancementDataPlayer;
      private final ServerStatisticManager serverStatisticManager;
      private float lastHealthScored = Float.MIN_VALUE;
-@@ -364,13 +366,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -365,13 +367,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          while (!this.removeQueue.isEmpty()) {
              int i = Math.min(this.removeQueue.size(), Integer.MAX_VALUE);
              int[] aint = new int[i];
@@ -50,7 +50,7 @@ index 97b5dc7f24..df850f7b9c 100644
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -1299,7 +1308,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1315,7 +1324,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.lastHealthSent = -1.0F;
          this.lastFoodSent = -1;
          // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit
diff --git a/Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch
index 224c188b25..c7772cbaf0 100644
--- a/Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From f6b2bcea328754fe2f0c853fedd20742ea002443 Mon Sep 17 00:00:00 2001
+From 8dbb982c625689f7e40c8134d8200d6b1fddef7b 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,10 +6,10 @@ 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 46f902073..bc1de9d9e 100644
+index 1f0e63a1c2..2757ed338c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2058,5 +2058,24 @@ public final class CraftServer implements Server {
+@@ -2062,5 +2062,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }
diff --git a/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
index 0c4eebf415..2131cf4e7a 100644
--- a/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From f72c891cbff8397c4fa29c971acffa84c971a860 Mon Sep 17 00:00:00 2001
+From e1a693bed3d52e7114065c979613eb0b8323ec0f 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 b20813be6..bfba08fb2 100644
+index b20813be64..bfba08fb24 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,10 +18,10 @@ index b20813be6..bfba08fb2 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 0d16d1430..f22319d78 100644
+index 1632969249..451d4f030c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -99,6 +99,7 @@ import org.bukkit.entity.Projectile;
+@@ -101,6 +101,7 @@ import org.bukkit.entity.Projectile;
  import org.bukkit.entity.ThrownExpBottle;
  import org.bukkit.entity.ThrownPotion;
  import org.bukkit.entity.Vehicle;
@@ -29,7 +29,7 @@ index 0d16d1430..f22319d78 100644
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -943,6 +944,17 @@ public class CraftEventFactory {
+@@ -957,6 +958,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch
index ac076106ec..7d34025994 100644
--- a/Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch
@@ -1,14 +1,14 @@
-From 8fd0513571c259e78452131eb90b5ce32a8e212d Mon Sep 17 00:00:00 2001
+From 5f0ebb18b40884e04d4ec3cc143b75a76dbc3035 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 b68e2fc04..cbdc267fa 100644
+index 2f1cd47619..e74baac5bc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -153,7 +153,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public boolean af;
      public boolean impulse;
      public int portalCooldown;
@@ -18,7 +18,7 @@ index b68e2fc04..cbdc267fa 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 b082d0a82..15a686cb2 100644
+index b082d0a820..15a686cb29 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/0131-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
index db7430c942..ff686bfa11 100644
--- a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 65dc485716c009ae92fda5358ad3b8615a30c9d0 Mon Sep 17 00:00:00 2001
+From ffdf77e2218dabe4c5eb150a763d49099e51ffb7 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 b5b569ef9..43ece829f 100644
+index 531bb7f663..bb3ee4320d 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 b5b569ef9..43ece829f 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 739e48ec7..192ee928f 100644
+index 739e48ec7c..192ee928fa 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 739e48ec7..192ee928f 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 15a686cb2..78527f350 100644
+index 15a686cb29..78527f3509 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 15a686cb2..78527f350 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 ac62f836d..bb4679cf7 100644
+index ac62f836d1..bb4679cf76 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,10 +92,10 @@ index ac62f836d..bb4679cf7 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 f22319d78..b75369275 100644
+index 451d4f030c..3ad614b7de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1084,6 +1084,16 @@ public class CraftEventFactory {
+@@ -1098,6 +1098,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch
index 211e21e5b2..5c9e205878 100644
--- a/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 15cccacab669f6cbdce15c88cc02878b33c2f32b Mon Sep 17 00:00:00 2001
+From 3a0455f9978597e53e4b162eddf94b8e42342e6c 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,10 +6,10 @@ 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 df850f7b9c..f44199b180 100644
+index f4f5ae50b4..071fe14d34 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1770,7 +1770,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1788,7 +1788,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      protected boolean isFrozen() {
@@ -19,10 +19,10 @@ index df850f7b9c..f44199b180 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 982b15dec0..6874563e43 100644
+index ea62e9bafd..693688c340 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2541,7 +2541,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2540,7 +2540,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      }
  
      public final boolean isDisconnected() {
diff --git a/Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch
index fea147ab9a..12a10a6b68 100644
--- a/Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From f333f65aab67ab8c458cf23bdf17639f475fce50 Mon Sep 17 00:00:00 2001
+From fc25517cebc592f17213a25323f0954d9e540e5d 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 c97e116aa..e1af5c488 100644
+index 3448b5588e..d7dc516e4a 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,10 +42,10 @@ index c97e116aa..e1af5c488 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 4e12b6406..0b0053207 100644
+index 06db4a8f04..37e9c86375 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -212,6 +212,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -214,6 +214,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
diff --git a/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch
index 07decbbb95..9153072fca 100644
--- a/Spigot-Server-Patches/0141-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 0e3a58ce27f0f4622708b7a49ce885158b9420f2 Mon Sep 17 00:00:00 2001
+From ae519f467fcc1b34f171226dc77c4bad75efebaf 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
@@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 90b87bb01..3c7f62fc5 100644
+index b8de760079..db390ced15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -264,6 +264,29 @@ public class CraftWorld implements World {
+@@ -265,6 +265,29 @@ public class CraftWorld implements World {
      private int waterAnimalSpawn = -1;
      private int ambientSpawn = -1;
  
diff --git a/Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch
index 7af6c2fe05..856986148e 100644
--- a/Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 7775e6a4b54fa6fed95237091b82abbb736158c0 Mon Sep 17 00:00:00 2001
+From 141dac0efd72ea2e0702616331db1cd427173959 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,10 +7,10 @@ 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 7003c4a93..a1659e6a2 100644
+index 882dd07e7f..6457317d78 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -927,11 +927,13 @@ public abstract class PlayerList {
+@@ -929,11 +929,13 @@ public abstract class PlayerList {
      }
  
      public void savePlayers() {
diff --git a/Spigot-Server-Patches/0143-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0143-Don-t-allow-entities-to-ride-themselves-572.patch
index 590754590b..64ce665e47 100644
--- a/Spigot-Server-Patches/0143-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 ef810037b85957693112a707cc2c2983c4678a46 Mon Sep 17 00:00:00 2001
+From 2ac056ffdc0345a4c864592cc8b401220649867f 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 cbdc267fa..3fd560027 100644
+index e74baac5bc..92e450f668 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1980,6 +1980,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1994,6 +1994,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected boolean addPassenger(Entity entity) { // CraftBukkit
diff --git a/Spigot-Server-Patches/0144-Fix-block-break-desync.patch b/Spigot-Server-Patches/0144-Fix-block-break-desync.patch
index 7ad09bd3e3..7cb97c4808 100644
--- a/Spigot-Server-Patches/0144-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0144-Fix-block-break-desync.patch
@@ -1,14 +1,14 @@
-From d4cdb325da7cbe6154860e78f0bbec61ecea6c14 Mon Sep 17 00:00:00 2001
+From d5e37d75b964cb7f9204a33914e6432d4adadae1 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 6874563e4..868d0e98b 100644
+index 693688c340..24615c5bfe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1176,6 +1176,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1175,6 +1175,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
              double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
              if (d3 > 36.0D) {
diff --git a/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 0d2a7eb104..427081ac8a 100644
--- a/Spigot-Server-Patches/0145-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 9716d2455797ed8b3dad7d75f7b6e0cd3c0d1f98 Mon Sep 17 00:00:00 2001
+From 0707463bba0cc2100576d3b6c1fb29dbfeb64d8c 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
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index fd23d4534..69e65ea6c 100644
+index fd23d45346..69e65ea6c8 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -504,13 +504,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index fd23d4534..69e65ea6c 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
-index 2e4f81ebe..88b9655bb 100644
+index 2e4f81ebe4..88b9655bb0 100644
 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
 +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
 @@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container {
@@ -41,7 +41,7 @@ index 2e4f81ebe..88b9655bb 100644
  
                      world.triggerEffect(1042, blockposition, 0);
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index bfdb63094..3a6ae654c 100644
+index bfdb63094b..3a6ae654cc 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -602,7 +602,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -54,7 +54,7 @@ index bfdb63094..3a6ae654c 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index bfba08fb2..49668f2c2 100644
+index bfba08fb24..49668f2c21 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity {
@@ -134,7 +134,7 @@ index bfba08fb2..49668f2c2 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 78527f350..03f782d4b 100644
+index 78527f3509..03f782d4b9 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -404,7 +404,7 @@ public class EntityFishingHook extends Entity {
@@ -147,7 +147,7 @@ index 78527f350..03f782d4b 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 780287f91..014404ade 100644
+index 482d6f7c62..567112ffc7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -381,7 +381,8 @@ public abstract class EntityLiving extends Entity {
@@ -161,7 +161,7 @@ index 780287f91..014404ade 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 77dd4c99a..398b499bb 100644
+index 77dd4c99a6..398b499bbe 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@@ -174,7 +174,7 @@ index 77dd4c99a..398b499bb 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 7c6506a91..1b4933c07 100644
+index 7c6506a912..1b4933c077 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -512,7 +512,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -187,7 +187,7 @@ index 7c6506a91..1b4933c07 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index c34868324..bc04086d7 100644
+index c348683247..bc04086d79 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -421,7 +421,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -200,7 +200,7 @@ index c34868324..bc04086d7 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 1d612d828..002ff8880 100644
+index 1d612d828e..002ff88800 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -213,7 +213,7 @@ index 1d612d828..002ff8880 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index d25a05736..9d0b1ffef 100644
+index d25a05736e..9d0b1ffefa 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -226,7 +226,7 @@ index d25a05736..9d0b1ffef 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 6e90f21ea..a7411c75a 100644
+index 6e90f21ea2..a7411c75ac 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -367,7 +367,7 @@ public class PlayerInteractManager {
@@ -239,7 +239,7 @@ index 6e90f21ea..a7411c75a 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index d2698e847..edc4a5c34 100644
+index d2698e847c..edc4a5c34e 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -252,7 +252,7 @@ index d2698e847..edc4a5c34 100644
  
      public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index adb1a0913..be16fe9a9 100644
+index adb1a09133..be16fe9a9e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -265,10 +265,10 @@ index adb1a0913..be16fe9a9 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3c7f62fc5..3fbc48150 100644
+index db390ced15..453f925cbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1540,7 +1540,7 @@ public class CraftWorld implements World {
+@@ -1620,7 +1620,7 @@ public class CraftWorld implements World {
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
              entity = new EntityTNTPrimed(world, x, y, z, null);
          } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@@ -278,10 +278,10 @@ index 3c7f62fc5..3fbc48150 100644
              entity = new EntityLightning(world, x, y, z, false);
          } else if (Firework.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3d..3302af0e4 100644
+index 1b512cc45c..fbad045675 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-@@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
+@@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
          getHandle().value = value;
      }
  
diff --git a/Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch
index a0521eaa08..305d436667 100644
--- a/Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From ff7027977adf0a4d6114e34fd1d7dc19fcdb2169 Mon Sep 17 00:00:00 2001
+From 2019fa14fe25d17f8cac6ab5908927c9ba8a7ce1 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 406bc611c..58fe5a8c4 100644
+index 406bc611c1..58fe5a8c4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -320,4 +320,10 @@ public class PaperWorldConfig {
@@ -27,10 +27,10 @@ index 406bc611c..58fe5a8c4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3fd560027..ee7fe30c7 100644
+index 92e450f668..14fbea5460 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -181,6 +181,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
      public boolean fromMobSpawner;
@@ -39,7 +39,7 @@ index 3fd560027..ee7fe30c7 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 014404ade..b0c9eda48 100644
+index 567112ffc7..177051699f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2553,8 +2553,11 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
index c3d20e72d9..ec558994df 100644
--- a/Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 551d84659a7b941c757445155a784a02238d7122 Mon Sep 17 00:00:00 2001
+From d272757d9e21e1082eb9be530126f9f0344a3a74 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,10 +9,10 @@ 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 86a5ee8aa..36eecb670 100644
+index 552daf4376..e102be583c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -411,7 +411,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
                  }
                  parsePending();
              } else {
@@ -21,7 +21,7 @@ index 86a5ee8aa..36eecb670 100644
                  executor.execute(new ServerSchedulerReportingWrapper(task)); // Paper
                  // We don't need to parse pending
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
-@@ -428,7 +428,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -431,7 +431,7 @@ public class CraftScheduler implements BukkitScheduler {
          pending.addAll(temp);
          temp.clear();
          MinecraftTimings.bukkitSchedulerFinishTimer.stopTiming();
@@ -30,7 +30,7 @@ index 86a5ee8aa..36eecb670 100644
      }
  
      private void addTask(final CraftTask task) {
-@@ -488,10 +488,15 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -491,10 +491,15 @@ public class CraftScheduler implements BukkitScheduler {
  
      @Override
      public String toString() {
diff --git a/Spigot-Server-Patches/0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 98630558b6..54570ce4b6 100644
--- a/Spigot-Server-Patches/0148-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 4d3fd62b7ff11893c01e2d58f9d6ca7c483d6573 Mon Sep 17 00:00:00 2001
+From 3b9e8f3661c32ede626e0cfe0c935584e7050e6e 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 26125fe27a..9fe34782ed 100644
+index 5ecf446e11..26dafe0d29 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -315,7 +315,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -311,7 +311,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
              // Spigot start
              org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
              activityAccountant.startActivity(0.5);
diff --git a/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch
index 64b48f85b5..034f8c4b41 100644
--- a/Spigot-Server-Patches/0150-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 a5592be696baf2e08fb817f8d29c2a90a559c241 Mon Sep 17 00:00:00 2001
+From 33332f35059abad5b341500014eb43e2145912f4 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 c41adf441..2d5e340ee 100644
+index d7071929b8..486e45d9df 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -80,6 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -41,7 +41,7 @@ index c41adf441..2d5e340ee 100644
      private boolean isStopped;
      private int ticks;
      protected final Proxy proxy;
-@@ -690,7 +691,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -703,7 +704,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          if (this.playerList != null) {
              MinecraftServer.LOGGER.info("Saving players");
              this.playerList.savePlayers();
@@ -50,7 +50,7 @@ index c41adf441..2d5e340ee 100644
              try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
  
-@@ -744,8 +745,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -757,8 +758,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return this.isRunning;
      }
  
@@ -64,7 +64,7 @@ index c41adf441..2d5e340ee 100644
          if (flag) {
              try {
                  this.serverThread.join();
-@@ -755,6 +761,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -768,6 +774,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
      }
@@ -73,10 +73,10 @@ index c41adf441..2d5e340ee 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 a1659e6a2..46a3f0751 100644
+index 6457317d78..274e93a25d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1038,10 +1038,15 @@ public abstract class PlayerList {
+@@ -1040,10 +1040,15 @@ public abstract class PlayerList {
          entityplayer.playerInteractManager.b(generatoraccess.getWorldData().getGameType());
      }
  
@@ -93,7 +93,7 @@ index a1659e6a2..46a3f0751 100644
          }
          // CraftBukkit end
          // Paper start - Remove collideRule team if it exists
-@@ -1052,6 +1057,7 @@ public abstract class PlayerList {
+@@ -1054,6 +1059,7 @@ public abstract class PlayerList {
          }
          // Paper end
      }
@@ -102,7 +102,7 @@ index a1659e6a2..46a3f0751 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 ccea803f5..aefea3a9a 100644
+index ccea803f58..aefea3a9a8 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/0151-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0151-Add-system-property-to-disable-book-size-limits.patch
index 723cb9ec27..473d95fafa 100644
--- a/Spigot-Server-Patches/0151-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 8b8bf29963073a01cab38ed94ca062b0621fb85a Mon Sep 17 00:00:00 2001
+From fb7829457c361493e1d405c657122abd1dc625bc 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 0291ff194..49c93b75c 100644
+index fe8e6dcb77..f8a3c9718d 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 {
@@ -22,7 +22,7 @@ index 0291ff194..49c93b75c 100644
  
      protected String title;
      protected String author;
-@@ -192,7 +193,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -198,7 +199,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
          if (title == null) {
              this.title = null;
              return true;
@@ -31,7 +31,7 @@ index 0291ff194..49c93b75c 100644
              return false;
          }
  
-@@ -228,7 +229,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -238,7 +239,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
              throw new IllegalArgumentException("Invalid page number " + page + "/" + pages.size());
          }
  
@@ -40,8 +40,8 @@ index 0291ff194..49c93b75c 100644
          pages.set(page - 1, CraftChatMessage.fromString(newText, true)[0]);
      }
  
-@@ -240,13 +241,13 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
- 
+@@ -252,13 +253,13 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+     @Override
      public void addPage(final String... pages) {
          for (String page : pages) {
 -            if (this.pages.size() >= MAX_PAGES) {
diff --git a/Spigot-Server-Patches/0152-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
index 567853c3bf..f7e095d278 100644
--- a/Spigot-Server-Patches/0152-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 57c8f5b53873eb694f6cd8bf78808bbdcab3ca48 Mon Sep 17 00:00:00 2001
+From 0fd3f99953ccbf38ef0022ec4926b61cd0e1e934 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 58fe5a8c4..a34121495 100644
+index 58fe5a8c4d..a341214952 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -326,4 +326,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 58fe5a8c4..a34121495 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 8a6f8e875..5df763d92 100644
+index 8a6f8e8756..5df763d925 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 8a6f8e875..5df763d92 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 37caa2a70..69a786e8d 100644
+index 24615c5bfe..939061b40f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1784,6 +1784,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1783,6 +1783,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
          switch (packetplayinentityaction.c()) {
          case START_SNEAKING:
              this.player.setSneaking(true);
diff --git a/Spigot-Server-Patches/0153-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0153-Add-configuration-option-to-prevent-player-names-fro.patch
index d2edf79855..a36613330d 100644
--- a/Spigot-Server-Patches/0153-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 5a583fb24c0c02301aa12e9bdae2c64344868a4f Mon Sep 17 00:00:00 2001
+From e57454ba4d40b9c6e186851f01eff09cb08ac5eb 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 7ce370e92..1adbb2480 100644
+index 7ce370e92f..1adbb24802 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -256,4 +256,9 @@ public class PaperConfig {
@@ -20,10 +20,10 @@ index 7ce370e92..1adbb2480 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bc1de9d9e..b2aee24e5 100644
+index 2757ed338c..436f10c50a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2077,5 +2077,10 @@ public final class CraftServer implements Server {
+@@ -2081,5 +2081,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
diff --git a/Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch
index 09091e69dd..89d0876e69 100644
--- a/Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 41f633a47824331f98f400103bb76b0b9a19a49a Mon Sep 17 00:00:00 2001
+From 039c8642c08930a79f6823e5ca076d99af111612 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
@@ -185,7 +185,7 @@ index 19e2df3098..3d0cb874d7 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 2d5e340eea..dc6d7b3a27 100644
+index 486e45d9df..ff7491131e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -50,7 +50,7 @@ import org.apache.commons.lang3.Validate;
@@ -206,7 +206,7 @@ index 2d5e340eea..dc6d7b3a27 100644
      public static int currentTick = 0; // Paper - Further improve tick loop
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
-@@ -199,7 +199,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -200,7 +200,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.K = s;
          // CraftBukkit start
          this.options = options;
@@ -216,7 +216,7 @@ index 2d5e340eea..dc6d7b3a27 100644
          if (System.console() == null && System.getProperty("jline.terminal") == null) {
              System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
              Main.useJline = false;
-@@ -220,6 +222,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -221,6 +223,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  LOGGER.warn((String) null, ex);
              }
          }
@@ -225,7 +225,7 @@ index 2d5e340eea..dc6d7b3a27 100644
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
      }
      // CraftBukkit end
-@@ -928,7 +932,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -941,7 +945,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              } finally {
                  // CraftBukkit start - Restore terminal to original settings
                  try {
@@ -234,7 +234,7 @@ index 2d5e340eea..dc6d7b3a27 100644
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
-@@ -1402,7 +1406,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1425,7 +1429,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent) {
@@ -244,7 +244,7 @@ index 2d5e340eea..dc6d7b3a27 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 46a3f07512..52b2f48749 100644
+index 274e93a25d..9577b537fc 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 46a3f07512..52b2f48749 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 b2aee24e51..2bdbc939e8 100644
+index 436f10c50a..d5883dfab7 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;
@@ -269,7 +269,7 @@ index b2aee24e51..2bdbc939e8 100644
  import net.minecraft.server.Advancement;
  import net.minecraft.server.ArgumentEntity;
  import net.minecraft.server.Block;
-@@ -1084,9 +1083,13 @@ public final class CraftServer implements Server {
+@@ -1087,9 +1086,13 @@ public final class CraftServer implements Server {
          return logger;
      }
  
@@ -284,7 +284,7 @@ index b2aee24e51..2bdbc939e8 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 5203e781e3..e3d163ac4d 100644
+index c5d5121fd9..4aebe53f8a 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;
@@ -296,7 +296,7 @@ index 5203e781e3..e3d163ac4d 100644
  
  public class Main {
      public static boolean useJline = true;
-@@ -177,6 +177,8 @@ public class Main {
+@@ -178,6 +178,8 @@ public class Main {
              }
  
              try {
@@ -305,7 +305,7 @@ index 5203e781e3..e3d163ac4d 100644
                  // This trick bypasses Maven Shade's clever rewriting of our getProperty call when using String literals
                  String jline_UnsupportedTerminal = new String(new char[] {'j','l','i','n','e','.','U','n','s','u','p','p','o','r','t','e','d','T','e','r','m','i','n','a','l'});
                  String jline_terminal = new String(new char[] {'j','l','i','n','e','.','t','e','r','m','i','n','a','l'});
-@@ -194,10 +196,18 @@ public class Main {
+@@ -195,10 +197,18 @@ public class Main {
                      // This ensures the terminal literal will always match the jline implementation
                      System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
                  }
@@ -403,10 +403,10 @@ 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 48d4dc7e2c..24f4a16a69 100644
+index befcc19f9b..5510266fb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-@@ -4,19 +4,30 @@ import java.util.Collections;
+@@ -4,20 +4,31 @@ import java.util.Collections;
  import java.util.List;
  import java.util.concurrent.ExecutionException;
  import java.util.logging.Level;
@@ -432,8 +432,9 @@ index 48d4dc7e2c..24f4a16a69 100644
          this.server = server;
      }
  
--    public int complete(final String buffer, final int cursor, final List<CharSequence> candidates) {
 +    // Paper start - Change method signature for JLine update
+     @Override
+-    public int complete(final String buffer, final int cursor, final List<CharSequence> candidates) {
 +    public void complete(LineReader reader, ParsedLine line, List<Candidate> candidates) {
 +        final CraftServer server = this.server.server;
 +        final String buffer = line.line();
@@ -441,7 +442,7 @@ index 48d4dc7e2c..24f4a16a69 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
              protected List<String> evaluate() {
-@@ -28,25 +39,37 @@ public class ConsoleCommandCompleter implements Completer {
+@@ -29,25 +40,37 @@ public class ConsoleCommandCompleter implements Completer {
                  return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
              }
          };
@@ -499,10 +500,10 @@ 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 f239cd6236..0000000000
+index f267f99f96..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
-@@ -1,56 +0,0 @@
+@@ -1,57 +0,0 @@
 -package org.bukkit.craftbukkit.util;
 -
 -import com.mojang.util.QueueLogAppender;
@@ -526,6 +527,7 @@ index f239cd6236..0000000000
 -        this.setDaemon(true);
 -    }
 -
+-    @Override
 -    public void run() {
 -        String message;
 -
diff --git a/Spigot-Server-Patches/0156-Item-canEntityPickup.patch b/Spigot-Server-Patches/0156-Item-canEntityPickup.patch
index 3961d9f57b..9066ad6843 100644
--- a/Spigot-Server-Patches/0156-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0156-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From e165a8a956f42b823b6cf6597b5ed62d6fb9e404 Mon Sep 17 00:00:00 2001
+From 0fcebb3fdb6b1e7a0f3b7aac127c5b2b7ac9eb8d 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 5d830b245..f1621a9e9 100644
+index 5d830b245d..f1621a9e9d 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -510,6 +510,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index 5d830b245..f1621a9e9 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index fe70a3a8b..36b5fb537 100644
+index fe70a3a8b6..36b5fb537e 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,10 +33,10 @@ index fe70a3a8b..36b5fb537 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 0dbca8f00..65b23f511 100644
+index cc593fbc99..3f552b5905 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -44,6 +44,16 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
          item.age = value;
      }
  
diff --git a/Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch
index 5b129e2389..0a8f77f101 100644
--- a/Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 23cbe9f146fddcdc7b886f7d8951163dc89dddc7 Mon Sep 17 00:00:00 2001
+From 5e0855bcc077ddb925fa8b515ea46f7a0db63789 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 000000000..b151a13c1
+index 0000000000..b151a13c1b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 000000000..b151a13c1
 +}
 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 000000000..25836b975
+index 0000000000..25836b975b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 000000000..25836b975
 +}
 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 000000000..3bcdb8f93
+index 0000000000..3bcdb8f93f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 000000000..3bcdb8f93
 +}
 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 000000000..4b2a67423
+index 0000000000..4b2a67423f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 000000000..4b2a67423
 +}
 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 000000000..3aceb0ea8
+index 0000000000..3aceb0ea8a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 000000000..3aceb0ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index e1af5c488..0ef5ad116 100644
+index d7dc516e4a..d2019fb74c 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,10 +429,10 @@ index e1af5c488..0ef5ad116 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 dc6d7b3a2..27d0d818b 100644
+index ff7491131e..91eed567cb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1237,7 +1237,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1256,7 +1256,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              DispenserRegistry.init();
              DispenserRegistry.c();
              String s = "."; // PAIL?
@@ -441,7 +441,7 @@ index dc6d7b3a2..27d0d818b 100644
              MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
              GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
              UserCache usercache = new UserCache(gameprofilerepository, new File(s, MinecraftServer.b.getName()));
-@@ -1693,6 +1693,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1716,6 +1716,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.H = i;
      }
  
@@ -450,7 +450,7 @@ index dc6d7b3a2..27d0d818b 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 409bc6da9..9eaf1539f 100644
+index 409bc6da9e..9eaf1539f7 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 409bc6da9..9eaf1539f 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 4e5e2d109..cfcb7a4fd 100644
+index 6a12d3ba8d..63bfdc052e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -195,6 +195,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -499,7 +499,7 @@ index 4e5e2d109..cfcb7a4fd 100644
  public final class CraftServer implements Server {
      private final String serverName = "Paper"; // Paper
      private final String serverVersion;
-@@ -2092,5 +2095,24 @@ public final class CraftServer implements Server {
+@@ -2096,5 +2099,24 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
diff --git a/Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch
index 2bdca09b27..62dcbd9a5c 100644
--- a/Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From 7b2008881f05671eedc216afd33c945de5eb313b Mon Sep 17 00:00:00 2001
+From 0a6a031445dde56a47bd0203630bedfdce7f04e7 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 5df763d92..0f8100a05 100644
+index 5df763d925..0f8100a05e 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,10 +59,10 @@ index 5df763d92..0f8100a05 100644
      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 a7b495c7a..c2b6e792a 100644
+index d6d04995ab..ad76feb253 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -610,6 +610,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -653,6 +653,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          getHandle().getCooldownTracker().a(CraftMagicNumbers.getItem(material), ticks);
      }
  
diff --git a/Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch
index 1bae83746d..151517e1c3 100644
--- a/Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch
@@ -1,14 +1,14 @@
-From aff8505a2edba9a9deb67a83ea1bcfd2809cf2d4 Mon Sep 17 00:00:00 2001
+From 833f6f6f14af57ed256f90d2ec87367e89490d0c 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 ee7fe30c7b..c28b498a2a 100644
+index 14fbea5460..f2a001c28b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -181,6 +181,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
      public boolean fromMobSpawner;
@@ -16,8 +16,8 @@ index ee7fe30c7b..c28b498a2a 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1573,6 +1574,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             if (origin != null) {
+@@ -1587,6 +1588,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()));
              }
 +            // Save entity's from mob spawner status
@@ -27,7 +27,7 @@ index ee7fe30c7b..c28b498a2a 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1700,6 +1705,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1714,6 +1719,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));
              }
@@ -49,10 +49,10 @@ index 6499d27e63..2b2af2daa7 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 fb2047bffa..ac94d05733 100644
+index 0b7fc359d9..4af2527d63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -982,5 +982,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1047,5 +1047,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          Location origin = getHandle().origin;
          return origin == null ? null : origin.clone();
      }
diff --git a/Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch
index e407325dec..67a871e48e 100644
--- a/Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 415781dddbe5dae2d4483881168112c89c3fa53e Mon Sep 17 00:00:00 2001
+From 26d89a2eeaa02fd155a59f45c7b1ee3aaa44ece1 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 14d041680..e56bef334 100644
+index 09016e3547..9952db3eb5 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;
@@ -18,7 +18,7 @@ index 14d041680..e56bef334 100644
  import org.bukkit.entity.AbstractHorse;
  import org.bukkit.entity.AnimalTamer;
  import org.bukkit.entity.Horse;
-@@ -92,6 +93,6 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
+@@ -99,6 +100,6 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
  
      @Override
      public AbstractHorseInventory getInventory() {
@@ -27,7 +27,7 @@ index 14d041680..e56bef334 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 173818e68..2f6852404 100644
+index 63991bf4be..9a47a1adc1 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 173818e68..2f6852404 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 000000000..99cfbaf90
+index 0000000000..99cfbaf90b
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 @@ -0,0 +1,15 @@
diff --git a/Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch
index d70882681c..ad2e15a007 100644
--- a/Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From f11ee1d20bd3ca71dee58b437a3dc79141d421a1 Mon Sep 17 00:00:00 2001
+From 8c1e731358dc64c98eadcd0ad88ebae60fdf9339 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
@@ -7,10 +7,10 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index f529367c8..2a51fa41a 100644
+index a4320f8446..af1db68aa7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -312,4 +312,10 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -321,4 +321,10 @@ public final class CraftItemFactory implements ItemFactory {
      public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
          return ((CraftMetaItem) meta).updateMaterial(material);
      }
diff --git a/Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch
index 394a6063d3..254dc79855 100644
--- a/Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From c4add1f5b9e89c011b0efe544cccca56c0ff7bc6 Mon Sep 17 00:00:00 2001
+From 1f1766228187bb45fdb46d714879bb3106dd1f82 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
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 8fe8e28aa..295c01b28 100644
+index 8fe8e28aa3..295c01b281 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -44,10 +44,12 @@ public class LocaleLanguage {
@@ -25,10 +25,10 @@ index 8fe8e28aa..295c01b28 100644
          return this.c(s);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 2a51fa41a..dd02fb95a 100644
+index af1db68aa7..929d73692a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -317,5 +317,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -326,5 +326,18 @@ public final class CraftItemFactory implements ItemFactory {
      public ItemStack ensureServerConversions(ItemStack item) {
          return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
      }
diff --git a/Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch
index 618996a0ad..755813a4d9 100644
--- a/Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch
@@ -1,14 +1,14 @@
-From b35a0e4863b159d80828469756202fc68e18e00f Mon Sep 17 00:00:00 2001
+From 7f8eb3c3b567f8cf69bd6ab8e12d5f5432ec2e22 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 52b2f4874..b855e7968 100644
+index 9577b537fc..cacd769543 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -519,9 +519,9 @@ public abstract class PlayerList {
+@@ -520,9 +520,9 @@ public abstract class PlayerList {
  
              // return chatmessage;
              if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage)); // Spigot
@@ -20,7 +20,7 @@ index 52b2f4874..b855e7968 100644
          } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
              IpBanEntry ipbanentry = this.l.get(socketaddress);
  
-@@ -889,9 +889,25 @@ public abstract class PlayerList {
+@@ -891,9 +891,25 @@ public abstract class PlayerList {
          this.server.getCommandDispatcher().a(entityplayer);
      }
  
diff --git a/Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch
index f941a64d57..0ec577cd7e 100644
--- a/Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 4b74b8f599e4aab980e2e02073bdb3653cfb5ead Mon Sep 17 00:00:00 2001
+From 9f279b64f8437fda9e1888d14208617321137760 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,10 +9,10 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e3d163ac4..a991cda1f 100644
+index 4aebe53f8a..405ea5c465 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -216,10 +216,12 @@ public class Main {
+@@ -217,10 +217,12 @@ public class Main {
                      Calendar deadline = Calendar.getInstance();
                      deadline.add(Calendar.DAY_OF_YEAR, -3);
                      if (buildDate.before(deadline.getTime())) {
diff --git a/Spigot-Server-Patches/0174-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0174-LivingEntity-setKiller.patch
index 4d28e9887e..d53291efea 100644
--- a/Spigot-Server-Patches/0174-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0174-LivingEntity-setKiller.patch
@@ -1,14 +1,27 @@
-From de17608d7017d74e39664f79b7243c5840d6b415 Mon Sep 17 00:00:00 2001
+From 9da8461e89182c566d98f8d68880d72d9c23ea25 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 1fb99c08f9..c6cfa794d5 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 {
+     public float aN;
+     public float aO;
+     public EntityHuman killer;
+-    protected int lastDamageByPlayerTime;
++    public int lastDamageByPlayerTime; // Paper - protected -> public
+     protected boolean killed;
+     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 424b2b708..f95347df0 100644
+index 540f6ea8ed..8bd2f95f48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -277,6 +277,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -301,6 +301,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity();
      }
  
@@ -22,9 +35,9 @@ index 424b2b708..f95347df0 100644
 +    }
 +    // Paper end
 +
+     @Override
      public boolean addPotionEffect(PotionEffect effect) {
          return addPotionEffect(effect, false);
-     }
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch
index 40acad802f..4a5b7659bb 100644
--- a/Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch
@@ -1,14 +1,14 @@
-From 720eb49fed3242715f0bceec19e5ef72af4d8e74 Mon Sep 17 00:00:00 2001
+From cd5b61c4c8aae7b976325746682fa18065e62ba6 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 c07bb9b74..82dad99ef 100644
+index 939061b40f..7a4b14f865 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -60,6 +60,8 @@ import org.bukkit.inventory.CraftingInventory;
+@@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
  import org.bukkit.inventory.EquipmentSlot;
  import org.bukkit.inventory.InventoryView;
  import org.bukkit.util.NumberConversions;
@@ -17,7 +17,7 @@ index c07bb9b74..82dad99ef 100644
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -913,7 +915,34 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -912,7 +914,34 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              d8 = d5 - this.p;
                              d9 = d6 - this.q;
                              if (this.player.onGround && !packetplayinflying.b() && d8 > 0.0D) {
diff --git a/Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch
index 024457ae5b..c78b969b3b 100644
--- a/Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 662f1be875e018ce68fcc261c909bf9a339cf19d Mon Sep 17 00:00:00 2001
+From 1c4c4bb0482e6d05872f36222423a4ac1e228074 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 82dad99ef..62c0137a7 100644
+index 7a4b14f865..de34c4e3ee 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2504,14 +2504,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2503,14 +2503,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/Spigot-Server-Patches/0181-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0181-Expose-client-protocol-version-and-virtual-host.patch
index 4aa0e8a3fd..a94474b341 100644
--- a/Spigot-Server-Patches/0181-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 14c5f2f61a0c28123ccb3504d313683bceec5807 Mon Sep 17 00:00:00 2001
+From 180375855a3a2db7d76c294ae6e06ad4edead878 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 000000000..5caca6439
+index 0000000000..5caca6439d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 000000000..5caca6439
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 60be2fa99..da88978db 100644
+index 60be2fa991..da88978db7 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 60be2fa99..da88978db 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 2db7229e9..5d5e23c18 100644
+index 2db7229e91..5d5e23c187 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 2db7229e9..5d5e23c18 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 4f008e472..8545146fb 100644
+index 4f008e4723..8545146fb1 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,10 +111,10 @@ index 4f008e472..8545146fb 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 0b0053207..bb50ae1ac 100644
+index 37e9c86375..ec52987820 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -179,6 +179,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -181,6 +181,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch
index e0d15e32e3..8beb10ef5c 100644
--- a/Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 6a33d0f087cf96e9f875fe67da1cdfd73aa8d382 Mon Sep 17 00:00:00 2001
+From 732dd110cfd78c4edb4c357ec5c29d15bc5f23be 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,10 +17,10 @@ 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 62c0137a7..9a981a608 100644
+index de34c4e3ee..bb276daa72 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -72,7 +72,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private final MinecraftServer minecraftServer;
      public EntityPlayer player;
      private int e;
@@ -29,7 +29,7 @@ index 62c0137a7..9a981a608 100644
      private boolean awaitingKeepAlive; private void setPendingPing(boolean isPending) { this.awaitingKeepAlive = isPending;}; private boolean isPendingPing() { return this.awaitingKeepAlive;}; // Paper - OBFHELPER
      private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; };  // Paper - OBFHELPER
      // CraftBukkit start - multithreaded fields
-@@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -101,6 +101,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private int E;
      private int receivedMovePackets;
      private int processedMovePackets;
@@ -37,7 +37,7 @@ index 62c0137a7..9a981a608 100644
  
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
          this.minecraftServer = minecraftserver;
-@@ -181,18 +182,25 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -179,18 +180,25 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          this.minecraftServer.getMethodProfiler().enter("keepAlive");
diff --git a/Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch
index d48313f55c..3c0ee55e03 100644
--- a/Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,11 +1,11 @@
-From 8b33d0de3f3ad917a98f1a15c009286a04c612ae Mon Sep 17 00:00:00 2001
+From b3328de9c961142f14d916b9a9b87c0570120f28 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 abc967d3f..2a50d6bab 100644
+index abc967d3f5..2a50d6babf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -338,4 +338,10 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index abc967d3f..2a50d6bab 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b75369275..8fca14243 100644
+index 3ad614b7de..87b2ad7960 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -499,16 +499,32 @@ public class CraftEventFactory {
+@@ -513,16 +513,32 @@ public class CraftEventFactory {
              EntityExperienceOrb xp = (EntityExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {
diff --git a/Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch
index a6ec8611bd..3487051f94 100644
--- a/Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From ac4ff4469b68dab3d8f1f382ec05dfc687257495 Mon Sep 17 00:00:00 2001
+From 86492da20337216397e5af641569923b7b87b9f7 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,10 +13,10 @@ 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 d8cc35352..4ac97a59c 100644
+index d70b678de3..b76f30dd24 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -207,7 +207,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -225,7 +225,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
      }
  
      // CraftBukkit start - add method
@@ -29,7 +29,7 @@ index d8cc35352..4ac97a59c 100644
          if (world == null) return null;
          // Spigot start
          org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
-@@ -216,7 +221,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -234,7 +239,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
              return null;
          }
          // Spigot end
@@ -39,12 +39,12 @@ index d8cc35352..4ac97a59c 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 8eabf8602..69b449507 100644
+index a36876e495..d31447ccd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -294,6 +294,20 @@ public class CraftBlock implements Block {
-     }
+@@ -312,6 +312,20 @@ public class CraftBlock implements Block {
  
+     @Override
      public BlockState getState() {
 +        // Paper start - allow disabling the use of snapshots
 +        return getState(true);
@@ -64,12 +64,12 @@ index 8eabf8602..69b449507 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 4f4121adc..082a1b6e2 100644
+index d8b3d2f3d5..7cb4c3e503 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-@@ -23,20 +23,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
-         CraftWorld world = (CraftWorld) this.getWorld();
+@@ -27,20 +27,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
          this.tileEntity = tileEntityClass.cast(world.getHandle().getTileEntity(this.getPosition()));
+         Preconditions.checkState(this.tileEntity != null, "Tile is null, asynchronous access? " + block);
  
 +        // Paper start
 +        this.snapshotDisabled = DISABLE_SNAPSHOT;
@@ -114,10 +114,10 @@ index 4f4121adc..082a1b6e2 100644
  
      private T createSnapshot(T tileEntity, World world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index e6f86cc4b..3a8f64360 100644
+index e7e58877e2..6d85a6d18e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-@@ -15,10 +15,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
+@@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
  
      public CraftSign(final Block block) {
          super(block, TileEntitySign.class);
diff --git a/Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch
index eb09d21c9c..22db195630 100644
--- a/Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 1144e668d90e4453f729861abc04adee62832f27 Mon Sep 17 00:00:00 2001
+From 2fd4f2215bae93e2d1d55a40969172899d37c545 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,10 +14,10 @@ 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 9a981a608..25c86b53e 100644
+index bb276daa72..96ec50f6c6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -521,10 +521,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -519,10 +519,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
@@ -30,7 +30,7 @@ index 9a981a608..25c86b53e 100644
              return;
          }
          // CraftBukkit end
-@@ -534,12 +534,35 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -532,12 +532,35 @@ public class PlayerConnection implements PacketListenerPlayIn {
              stringreader.skip();
          }
  
@@ -70,10 +70,10 @@ index 9a981a608..25c86b53e 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cfcb7a4fd..2173f34fe 100644
+index 63bfdc052e..9f2aa9570b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1658,7 +1658,7 @@ public final class CraftServer implements Server {
+@@ -1661,7 +1661,7 @@ public final class CraftServer implements Server {
              offers = tabCompleteChat(player, message);
          }
  
@@ -83,10 +83,10 @@ index cfcb7a4fd..2173f34fe 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 24f4a16a6..a01d793e7 100644
+index 5510266fb1..a51202ed53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-@@ -27,6 +27,39 @@ public class ConsoleCommandCompleter implements Completer {
+@@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
      public void complete(LineReader reader, ParsedLine line, List<Candidate> candidates) {
          final CraftServer server = this.server.server;
          final String buffer = line.line();
diff --git a/Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch
index df946b77f5..995dc179a6 100644
--- a/Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From c1554b6404351df0b3eacf9d551c9da16d38ba3b Mon Sep 17 00:00:00 2001
+From 680fd7bae23eb525705eed9a735fa3d6ff029e26 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,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8fca14243..8d3dca2a9 100644
+index 87b2ad7960..db44e82a10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -509,7 +509,7 @@ public class CraftEventFactory {
+@@ -523,7 +523,7 @@ public class CraftEventFactory {
                      if (e instanceof EntityExperienceOrb) {
                          EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
                          // Paper start
diff --git a/Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch
index 46a46ad6ba..cec920fb5d 100644
--- a/Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 1950b2903db0bb07952b8bf76d16166951ac1442 Mon Sep 17 00:00:00 2001
+From 1dfbde3564fde9115630f366cd4e001b9e2450aa 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
@@ -43,10 +43,10 @@ index 704a48c8ea..64d71a9a2a 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 bb50ae1acd..a175dd383c 100644
+index ec52987820..92d45ab7df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1052,8 +1052,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1054,8 +1054,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
      }
  
diff --git a/Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch
index 62a9e87e82..8e129052ab 100644
--- a/Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From 6f02cf46c9ae0b5b0516064e1bf23686d2966915 Mon Sep 17 00:00:00 2001
+From c75853cc4f8ae4188516daa9f9848e7761826f5e 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 9fe34782ed..7273323e36 100644
+index 26dafe0d29..99beb30093 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -736,11 +736,16 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -710,11 +710,16 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          int chunkRange = world.spigotConfig.mobSpawnRange;
          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/0198-Add-setPlayerProfile-API-for-Skulls.patch
index 2b799c64e2..c245c3085a 100644
--- a/Spigot-Server-Patches/0198-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0198-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From 07ae0176d0b9c8fe33856a95e62d95d92412a2fd Mon Sep 17 00:00:00 2001
+From b7edad7363c088065a78acc0b2aee22b51f0f413 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 a4bc7f970..2dd2f476f 100644
+index a4bc7f9701..2dd2f476f0 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 a4bc7f970..2dd2f476f 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 f27053276..5c8e16c00 100644
+index 0136e1bfe1..aee97b9f03 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;
@@ -68,7 +68,7 @@ index f27053276..5c8e16c00 100644
  @DelegateDeserialization(SerializableMeta.class)
  class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
  
-@@ -129,6 +132,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -131,6 +134,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          return hasOwner() ? profile.getName() : null;
      }
  
diff --git a/Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch
index a1fb963c1f..18ee3cc2d5 100644
--- a/Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 3d8dc5bfef162c4777544c8d604a491225c3d81c Mon Sep 17 00:00:00 2001
+From 4b232cd90061c3234462a8fddd8c265d56269971 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,10 +13,10 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index dd02fb95a..7c2c4ecc5 100644
+index 929d73692a..df70c5c0ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -191,6 +191,8 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -194,6 +194,8 @@ public final class CraftItemFactory implements ItemFactory {
              return meta instanceof CraftMetaSpawnEgg ? meta : new CraftMetaSpawnEgg(meta);
          case KNOWLEDGE_BOOK:
              return meta instanceof CraftMetaKnowledgeBook ? meta : new CraftMetaKnowledgeBook(meta);
@@ -26,7 +26,7 @@ index dd02fb95a..7c2c4ecc5 100644
          case CHEST:
          case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 6c00ca737..4d8013685 100644
+index 00497350a3..88154d2f23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -395,6 +395,8 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index 6c00ca737..4d8013685 100644
              case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 new file mode 100644
-index 000000000..c00b89c8d
+index 0000000000..c00b89c8d4
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -0,0 +1,311 @@
@@ -356,23 +356,23 @@ index 000000000..c00b89c8d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index b3f8249b0..9435136cc 100644
+index 0d513e1f33..159037fc3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -157,6 +157,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                     .put(CraftMetaCharge.class, "FIREWORK_EFFECT")
+@@ -161,6 +161,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                      .put(CraftMetaKnowledgeBook.class, "KNOWLEDGE_BOOK")
                      .put(CraftMetaTropicalFishBucket.class, "TROPICAL_FISH_BUCKET")
+                     .put(CraftMetaCrossbow.class, "CROSSBOW")
 +                    .put(CraftMetaArmorStand.class, "ARMOR_STAND")
                      .put(CraftMetaItem.class, "UNSPECIFIC")
                      .build();
  
-@@ -1391,7 +1392,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                         CraftMetaCharge.EXPLOSION.NBT,
-                         CraftMetaBlockState.BLOCK_ENTITY_TAG.NBT,
+@@ -1420,7 +1421,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                          CraftMetaKnowledgeBook.BOOK_RECIPES.NBT,
--                        CraftMetaTropicalFishBucket.VARIANT.NBT
-+                        CraftMetaTropicalFishBucket.VARIANT.NBT,
+                         CraftMetaTropicalFishBucket.VARIANT.NBT,
+                         CraftMetaCrossbow.CHARGED.NBT,
+-                        CraftMetaCrossbow.CHARGED_PROJECTILES.NBT
++                        CraftMetaCrossbow.CHARGED_PROJECTILES.NBT,
 +                        // Paper start
 +                        CraftMetaArmorStand.ENTITY_TAG.NBT,
 +                        CraftMetaArmorStand.INVISIBLE.NBT,
@@ -385,7 +385,7 @@ index b3f8249b0..9435136cc 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 176b8f528..93c4e1239 100644
+index 6abde9030d..2a0852675b 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -6,6 +6,7 @@ import java.util.ArrayList;
@@ -396,15 +396,14 @@ index 176b8f528..93c4e1239 100644
  import net.minecraft.server.Block;
  import net.minecraft.server.IRegistry;
  import net.minecraft.server.ITileEntity;
-@@ -335,7 +336,18 @@ public class ItemMetaTest extends AbstractTestingBase {
+@@ -344,7 +345,17 @@ public class ItemMetaTest extends AbstractTestingBase {
                      cleanStack.setItemMeta(meta);
                      return cleanStack;
                  }
 +            },
 +            // Paper start
 +            new StackProvider(Material.ARMOR_STAND) {
-+                @Override
-+                ItemStack operate(ItemStack cleanStack) {
++                @Override ItemStack operate(ItemStack cleanStack) {
 +                    final ArmorStandMeta meta = (ArmorStandMeta) cleanStack.getItemMeta();
 +                    meta.setInvisible(true);
 +                    cleanStack.setItemMeta(meta);
diff --git a/Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch
index 027ef87c82..8a45d5802b 100644
--- a/Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From fbe1d515b22f27d9a619256afd81899fa198f1aa Mon Sep 17 00:00:00 2001
+From 44e7a3d44b8c47e34b6de9b4d71d0809f10dfaad 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,10 +7,10 @@ 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 e56bef334..cc9d432e7 100644
+index 9952db3eb5..1aea5f3f05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-@@ -83,6 +83,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
+@@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
          }
      }
  
@@ -21,7 +21,7 @@ index e56bef334..cc9d432e7 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 2498fba31..0869cb091 100644
+index 5dfa40dda1..407b95cafd 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/0208-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch
index 4aaa62d862..71a32cdc7b 100644
--- a/Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 20af9903243aa2a49973b413011de18e113a4f92 Mon Sep 17 00:00:00 2001
+From 2e14f427f05f592a27e0b7e4d149435d4f16fe93 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 000000000..c1a8e295b
+index 0000000000..c1a8e295b6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 @@ -0,0 +1,31 @@
@@ -43,7 +43,7 @@ index 000000000..c1a8e295b
 +}
 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 000000000..a2a409e63
+index 0000000000..a2a409e635
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 @@ -0,0 +1,11 @@
@@ -60,7 +60,7 @@ index 000000000..a2a409e63
 +}
 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 000000000..a85466bc7
+index 0000000000..a85466bc7e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
@@ -177,7 +177,7 @@ index 000000000..a85466bc7
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 27d0d818b..359ce72fc 100644
+index 91eed567cb..d3620b18a0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,6 +1,7 @@
@@ -188,7 +188,7 @@ index 27d0d818b..359ce72fc 100644
  import com.google.common.base.Stopwatch;
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
-@@ -1037,7 +1038,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1056,7 +1057,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          if (i - this.Z >= 5000000000L) {
              this.Z = i;
              this.serverPing.setPlayerSample(new ServerPing.ServerPingPlayerSample(this.getMaxPlayers(), this.getPlayerCount()));
@@ -198,7 +198,7 @@ index 27d0d818b..359ce72fc 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 b247a18b9..ba1c76c1a 100644
+index b247a18b9e..ba1c76c1a5 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 {
@@ -221,7 +221,7 @@ index b247a18b9..ba1c76c1a 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index aa125a52d..ea52e89bd 100644
+index aa125a52dc..ea52e89bd9 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 {
@@ -246,7 +246,7 @@ index aa125a52d..ea52e89bd 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 0d827815c..062a24c3c 100644
+index bd601333ee..6c5430ff94 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/0209-Improved-Async-Task-Scheduler.patch
index f653a27b5e..edb7b1e36d 100644
--- a/Spigot-Server-Patches/0209-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0209-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From c8cbb14ffc51c91d0746aa18089280993e7b0a0b Mon Sep 17 00:00:00 2001
+From c2ec98180b068515c689d86b4e3610f7d308d0c9 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 000000000..3c1992e21
+index 0000000000..3c1992e212
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +1,122 @@
@@ -159,7 +159,7 @@ index 000000000..3c1992e21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 36eecb670..15f165d9b 100644
+index e102be583c..5db848de14 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 {
@@ -169,9 +169,9 @@ index 36eecb670..15f165d9b 100644
 -    private final PriorityQueue<CraftTask> pending = new PriorityQueue<CraftTask>(10,
 +    final PriorityQueue<CraftTask> pending = new PriorityQueue<CraftTask>(10, // Paper
              new Comparator<CraftTask>() {
+                 @Override
                  public int compare(final CraftTask o1, final CraftTask o2) {
-                     int value = Long.compare(o1.getNextRun(), o2.getNextRun());
-@@ -78,21 +78,38 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -79,21 +79,38 @@ public class CraftScheduler implements BukkitScheduler {
      /**
       * These are tasks that are currently active. It's provided for 'viewing' the current state.
       */
@@ -215,7 +215,7 @@ index 36eecb670..15f165d9b 100644
      @Override
      public int scheduleSyncDelayedTask(final Plugin plugin, final Runnable task) {
          return this.scheduleSyncDelayedTask(plugin, task, 0L);
-@@ -209,7 +226,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -210,7 +227,7 @@ public class CraftScheduler implements BukkitScheduler {
          } else if (period < CraftTask.NO_REPEATING) {
              period = CraftTask.NO_REPEATING;
          }
@@ -224,7 +224,7 @@ index 36eecb670..15f165d9b 100644
      }
  
      @Override
-@@ -225,6 +242,11 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -226,6 +243,11 @@ public class CraftScheduler implements BukkitScheduler {
          if (taskId <= 0) {
              return;
          }
@@ -236,7 +236,7 @@ index 36eecb670..15f165d9b 100644
          CraftTask task = runners.get(taskId);
          if (task != null) {
              task.cancel0();
-@@ -265,6 +287,11 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -267,6 +289,11 @@ public class CraftScheduler implements BukkitScheduler {
      @Override
      public void cancelTasks(final Plugin plugin) {
          Validate.notNull(plugin, "Cannot cancel tasks of null plugin");
@@ -247,8 +247,8 @@ index 36eecb670..15f165d9b 100644
 +        // Paper end
          final CraftTask task = new CraftTask(
                  new Runnable() {
-                     public void run() {
-@@ -303,6 +330,13 @@ public class CraftScheduler implements BukkitScheduler {
+                     @Override
+@@ -306,6 +333,13 @@ public class CraftScheduler implements BukkitScheduler {
  
      @Override
      public boolean isCurrentlyRunning(final int taskId) {
@@ -262,7 +262,7 @@ index 36eecb670..15f165d9b 100644
          final CraftTask task = runners.get(taskId);
          if (task == null) {
              return false;
-@@ -321,6 +355,11 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -324,6 +358,11 @@ public class CraftScheduler implements BukkitScheduler {
          if (taskId <= 0) {
              return false;
          }
@@ -274,7 +274,7 @@ index 36eecb670..15f165d9b 100644
          for (CraftTask task = head.getNext(); task != null; task = task.getNext()) {
              if (task.getTaskId() == taskId) {
                  return task.getPeriod() >= CraftTask.NO_REPEATING; // The task will run
-@@ -332,6 +371,12 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -335,6 +374,12 @@ public class CraftScheduler implements BukkitScheduler {
  
      @Override
      public List<BukkitWorker> getActiveWorkers() {
@@ -287,7 +287,7 @@ index 36eecb670..15f165d9b 100644
          final ArrayList<BukkitWorker> workers = new ArrayList<BukkitWorker>();
          for (final CraftTask taskObj : runners.values()) {
              // Iterator will be a best-effort (may fail to grab very new values) if called from an async thread
-@@ -369,6 +414,11 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -372,6 +417,11 @@ public class CraftScheduler implements BukkitScheduler {
                  pending.add(task);
              }
          }
@@ -299,7 +299,7 @@ index 36eecb670..15f165d9b 100644
          return pending;
      }
  
-@@ -376,6 +426,11 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -379,6 +429,11 @@ public class CraftScheduler implements BukkitScheduler {
       * This method is designed to never block or wait for locks; an immediate execution of all current tasks.
       */
      public void mainThreadHeartbeat(final int currentTick) {
@@ -311,7 +311,7 @@ index 36eecb670..15f165d9b 100644
          this.currentTick = currentTick;
          final List<CraftTask> temp = this.temp;
          parsePending();
-@@ -412,7 +467,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -415,7 +470,7 @@ public class CraftScheduler implements BukkitScheduler {
                  parsePending();
              } else {
                  //debugTail = debugTail.setNext(new CraftAsyncDebugger(currentTick + RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
@@ -320,7 +320,7 @@ index 36eecb670..15f165d9b 100644
                  // We don't need to parse pending
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
-@@ -431,7 +486,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -434,7 +489,7 @@ public class CraftScheduler implements BukkitScheduler {
          //debugHead = debugHead.getNextHead(currentTick); // Paper
      }
  
@@ -329,7 +329,7 @@ index 36eecb670..15f165d9b 100644
          final AtomicReference<CraftTask> tail = this.tail;
          CraftTask tailTask = tail.get();
          while (!tail.compareAndSet(tailTask, task)) {
-@@ -440,7 +495,13 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -443,7 +498,13 @@ public class CraftScheduler implements BukkitScheduler {
          tailTask.setNext(task);
      }
  
@@ -344,7 +344,7 @@ index 36eecb670..15f165d9b 100644
          task.setNextRun(currentTick + delay);
          addTask(task);
          return task;
-@@ -459,8 +520,8 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -462,8 +523,8 @@ public class CraftScheduler implements BukkitScheduler {
          return ids.incrementAndGet();
      }
  
@@ -355,7 +355,7 @@ index 36eecb670..15f165d9b 100644
          CraftTask head = this.head;
          CraftTask task = head.getNext();
          CraftTask lastTask = head;
-@@ -479,7 +540,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -482,7 +543,7 @@ public class CraftScheduler implements BukkitScheduler {
             task.setNext(null);
          }
          this.head = lastTask;
diff --git a/Spigot-Server-Patches/0211-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0211-Call-PortalCreateEvent-for-exit-portals.patch
deleted file mode 100644
index 169f6db649..0000000000
--- a/Spigot-Server-Patches/0211-Call-PortalCreateEvent-for-exit-portals.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3875cf67129d1cceb03e3c6500121465ad92985c Mon Sep 17 00:00:00 2001
-From: MiniDigger <admin@minidigger.me>
-Date: Sun, 18 Mar 2018 15:44:44 +0100
-Subject: [PATCH] Call PortalCreateEvent for exit portals
-
-
-diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index e7ca777c1..7807f7c41 100644
---- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
-+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-@@ -259,6 +259,9 @@ public class PortalTravelAgent {
-             l5 = -l5;
-         }
- 
-+        java.util.Collection<org.bukkit.block.Block> bukkitBlocks = new java.util.HashSet<>(); // Paper
-+        java.util.Map<BlockPosition, IBlockData> nmsBlocks = new java.util.LinkedHashMap<>(); // Paper
-+
-         if (d0 < 0.0D) {
-             i1 = MathHelper.clamp(i1, 70, this.world.getHeight() - 10);
-             j5 = i1;
-@@ -271,8 +274,11 @@ public class PortalTravelAgent {
-                         i4 = j2 + (i3 - 1) * l5 - k2 * k5;
-                         boolean flag1 = l2 < 0;
- 
--                        blockposition_mutableblockposition.d(j3, l3, i4);
--                        this.world.setTypeUpdate(blockposition_mutableblockposition, flag1 ? Blocks.OBSIDIAN.getBlockData() : Blocks.AIR.getBlockData());
-+                        // Paper start
-+                        BlockPosition pos = new BlockPosition(j3, l3, i4);
-+                        nmsBlocks.put(pos, flag1 ? Blocks.OBSIDIAN.getBlockData() : Blocks.AIR.getBlockData());
-+                        bukkitBlocks.add(this.world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()));
-+                        // Paper end
-                     }
-                 }
-             }
-@@ -282,7 +288,11 @@ public class PortalTravelAgent {
-             for (i3 = -1; i3 < 4; ++i3) {
-                 if (k2 == -1 || k2 == 2 || i3 == -1 || i3 == 3) {
-                     blockposition_mutableblockposition.d(i5 + k2 * k5, j5 + i3, j2 + k2 * l5);
--                    this.world.setTypeAndData(blockposition_mutableblockposition, Blocks.OBSIDIAN.getBlockData(), 3);
-+                    // Paper start
-+                    BlockPosition pos = new BlockPosition(blockposition_mutableblockposition.getX(), blockposition_mutableblockposition.getY(), blockposition_mutableblockposition.getZ());
-+                    nmsBlocks.put(pos, Blocks.OBSIDIAN.getBlockData());
-+                    bukkitBlocks.add(this.world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()));
-+                    // Paper end
-                 }
-             }
-         }
-@@ -292,10 +302,22 @@ public class PortalTravelAgent {
-         for (i3 = 0; i3 < 2; ++i3) {
-             for (l2 = 0; l2 < 3; ++l2) {
-                 blockposition_mutableblockposition.d(i5 + i3 * k5, j5 + l2, j2 + i3 * l5);
--                this.world.setTypeAndData(blockposition_mutableblockposition, iblockdata, 18);
-+
-+                // Paper start
-+                BlockPosition pos = new BlockPosition(blockposition_mutableblockposition.getX(), blockposition_mutableblockposition.getY(), blockposition_mutableblockposition.getZ());
-+                nmsBlocks.put(pos, iblockdata);
-+                bukkitBlocks.add(this.world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()));
-+                // Paper end
-             }
-         }
- 
-+        // Paper start
-+        org.bukkit.event.world.PortalCreateEvent event = new org.bukkit.event.world.PortalCreateEvent(bukkitBlocks, this.world.getWorld(), org.bukkit.event.world.PortalCreateEvent.CreateReason.OBC_DESTINATION);
-+        if (event.callEvent()) {
-+            nmsBlocks.forEach((pos, data) -> this.world.setTypeAndData(pos, data, 18)); // keep flag in sync with removed call above
-+        }
-+        // Paper end
-+
-         return true;
-     }
- 
--- 
-2.21.0
-
diff --git a/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch
index 65509fb333..ed4089bac9 100644
--- a/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From d8553987531b1251d0d2cc0d7746653a7611d19b Mon Sep 17 00:00:00 2001
+From fea19000fb2d1139365f782ba85605e09a573fb1 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 58e2601ef..1df83d13a 100644
+index 58e2601eff..1df83d13ab 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 58e2601ef..1df83d13a 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 7c3b9c0b9..d4d752ddb 100644
+index 7c3b9c0b97..d4d752ddb4 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 7c3b9c0b9..d4d752ddb 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 bea3ddf31..1aff6cab9 100644
+index 92d45ab7df..b2b36dcec5 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 @@
@@ -60,7 +60,7 @@ index bea3ddf31..1aff6cab9 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -1192,8 +1194,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1194,8 +1196,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
  
          // Remove this player from the hidden player's EntityTrackerEntry
@@ -75,7 +75,7 @@ index bea3ddf31..1aff6cab9 100644
          PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
          if (entry != null) {
              entry.clear(getHandle());
-@@ -1234,8 +1241,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1236,8 +1243,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          hiddenPlayers.remove(player.getUniqueId());
  
@@ -90,7 +90,7 @@ index bea3ddf31..1aff6cab9 100644
  
          getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
  
-@@ -1244,6 +1256,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1246,6 +1258,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entry.updatePlayer(getHandle());
          }
      }
diff --git a/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch
similarity index 92%
rename from Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch
index e3562a6fa7..1d020370b7 100644
--- a/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From ffe8cbd067c4fe4f42307a5356a6effdf74d2b94 Mon Sep 17 00:00:00 2001
+From 143f42bf1e4874b298ea26da4915b9dad3cf405a 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 cfe84f4d4..4ab310cd6 100644
+index cfe84f4d48..4ab310cd6b 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/0214-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch
similarity index 90%
rename from Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch
index c7689dfa8f..8a539e9b11 100644
--- a/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 50f2f6e9b61b949b54283000b425ec12b2398ab1 Mon Sep 17 00:00:00 2001
+From 789d81cfb7edd8ad81d1ac6981ff1ca9377e16bd 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,10 +9,10 @@ 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 2173f34fe..01ed56a2a 100644
+index 9f2aa9570b..91c86e451f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1351,6 +1351,26 @@ public final class CraftServer implements Server {
+@@ -1354,6 +1354,26 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  
diff --git a/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch
index 01d345057f..9cf2685bbd 100644
--- a/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From d3058492827153f44ddc06e920ba3b6424d59159 Mon Sep 17 00:00:00 2001
+From 394505f1d4e744131ee86d37952843f997f05eba 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 a9cf1b8e8..7fba61a6d 100644
+index a9cf1b8e8b..7fba61a6d3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -267,4 +267,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index a9cf1b8e8..7fba61a6d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a0254d8e5..e60e10c57 100644
+index a0254d8e51..e60e10c57d 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/0216-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch
index 33a3728d41..3217d738a8 100644
--- a/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From c6d5999b1480d39890cd4f18a1ad0de0d5aa55ef Mon Sep 17 00:00:00 2001
+From 9437cc71ca1b7e3b5ee6f2130b40da55b8cd4acc 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
diff --git a/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 99%
rename from Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 8f09da79a1..a711600461 100644
--- a/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From e1c2af36b6e7069f2abc68317de759fd2da7ea86 Mon Sep 17 00:00:00 2001
+From f113177c3094f1768d178d118a98374fe96173c2 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
diff --git a/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch
similarity index 91%
rename from Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch
index 6f73b630e1..b0db18cf17 100644
--- a/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 2adba7d40590352c767b1fdb4aebd8886fc15835 Mon Sep 17 00:00:00 2001
+From 361acebcb325d29609c67b1a6198a0623133dc4d 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 1aff6cab9..01e260024 100644
+index b2b36dcec5..23a205af1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -136,6 +136,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -20,7 +20,7 @@ index 1aff6cab9..01e260024 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1458,7 +1459,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1460,7 +1461,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {
diff --git a/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch
similarity index 87%
rename from Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch
index 8cc5ecdbc0..3037a7dee2 100644
--- a/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch
@@ -1,14 +1,14 @@
-From 1d5cd93e8dab70b3891db2a05b7a332c53033714 Mon Sep 17 00:00:00 2001
+From 140c69ba78c6f91daf7ec29260867f0df8bba17a 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 c2b6e792a..6478d6126 100644
+index ad76feb253..d0a019f50d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -709,4 +709,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -752,4 +752,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
              entity.remove();
          }
      }
diff --git a/Spigot-Server-Patches/0220-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0219-Load-version-history-at-server-start.patch
similarity index 88%
rename from Spigot-Server-Patches/0220-Load-version-history-at-server-start.patch
rename to Spigot-Server-Patches/0219-Load-version-history-at-server-start.patch
index b190c5796d..d99a58a603 100644
--- a/Spigot-Server-Patches/0220-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0219-Load-version-history-at-server-start.patch
@@ -1,11 +1,11 @@
-From ce0d24798899c83d963e9f0879fe170ea59132af Mon Sep 17 00:00:00 2001
+From bd50777e0d7f271872ef38ba9257dafea208727e Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:38:14 -0600
 Subject: [PATCH] Load version history at server start
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index d9f1c2205..c2c676e3b 100644
+index d9f1c22050..c2c676e3bb 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -172,6 +172,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0221-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch
similarity index 93%
rename from Spigot-Server-Patches/0221-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch
index 1d0a8a270b..4e2389d5e6 100644
--- a/Spigot-Server-Patches/0221-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 2dcdbc031e78acf21b630f4f21662851935325f2 Mon Sep 17 00:00:00 2001
+From 51a904fe3f153f669da47a13d8fc78d4aa234314 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 32bfe0e46..7024336c3 100644
+index 32bfe0e462..7024336c3a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -354,4 +354,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 32bfe0e46..7024336c3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1df83d13a..27bf83f37 100644
+index 1df83d13ab..27bf83f373 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/0222-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 86%
rename from Spigot-Server-Patches/0222-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 9bf858f84d..3de4ad5081 100644
--- a/Spigot-Server-Patches/0222-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,14 +1,14 @@
-From 7fcb20e1726495b07d82c141a552372c1d2efec1 Mon Sep 17 00:00:00 2001
+From 9685f7c711979c599f23ce5bab39b7c3c281c342 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 25c86b53e..c9caf4423 100644
+index 96ec50f6c6..594196107c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2516,7 +2516,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2515,7 +2515,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/0223-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0223-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0222-EndermanEscapeEvent.patch
index 913cd5f49e..40c4312bd3 100644
--- a/Spigot-Server-Patches/0223-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 631be52465547db97f19c1fbf1739710294218c3 Mon Sep 17 00:00:00 2001
+From 8e584b5ccf3f2e74b3df22065ddd9ff81ccb499d 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 9f2e350b3..2b484c819 100644
+index 9f2e350b33..2b484c8199 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/0224-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch
similarity index 85%
rename from Spigot-Server-Patches/0224-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch
index ea374fca32..6dec7482b7 100644
--- a/Spigot-Server-Patches/0224-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From c80235802b0eb5c67f0682ef37f8bb4f257671d4 Mon Sep 17 00:00:00 2001
+From 07e060c038faeb04adffbf51444aaa89f9f807d5 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 2b484c819..e441fa234 100644
+index 2b484c8199..e441fa234d 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 2b484c819..e441fa234 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 da8a70d6a..e56da9085 100644
+index 970efabd37..0c5f359346 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 {
@@ -26,9 +26,9 @@ index da8a70d6a..e56da9085 100644
      }
  
 +    @Override public boolean teleportRandomly() { return getHandle().teleportRandomly(); } // Paper
+     @Override
      public MaterialData getCarriedMaterial() {
          IBlockData blockData = getHandle().getCarried();
-         return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData);
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0225-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch
similarity index 93%
rename from Spigot-Server-Patches/0225-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch
index e3f2915bb6..adafa5b030 100644
--- a/Spigot-Server-Patches/0225-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 3881d12211b3b592149a8537eabf9ea2bae4996b Mon Sep 17 00:00:00 2001
+From a2b8eb20c4a62d998d65ed72ebe19a3b20952731 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 7024336c3..fe9415b1d 100644
+index 7024336c3a..fe9415b1de 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -359,4 +359,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 7024336c3..fe9415b1d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index bb4679cf7..c19828ed5 100644
+index bb4679cf76..c19828ed56 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/0226-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 94%
rename from Spigot-Server-Patches/0226-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch
index 82a7a392d9..8d9a622bd8 100644
--- a/Spigot-Server-Patches/0226-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 1d8c0897f3166b70c188632df0f63d57a3b6260d Mon Sep 17 00:00:00 2001
+From 29dfb9fa9f5e7daa700a965750d3a5725d1d4339 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2e78e4af95..3c6c6d227f 100644
+index f32c4913c5..390ba575f8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -55,7 +55,7 @@ public class WorldServer extends World {
@@ -22,7 +22,7 @@ index 2e78e4af95..3c6c6d227f 100644
      boolean tickingEntities;
      private final MinecraftServer server;
      private final WorldNBTStorage dataManager;
-@@ -1339,12 +1339,17 @@ public class WorldServer extends World {
+@@ -1340,12 +1340,17 @@ public class WorldServer extends World {
      }
  
      public <T extends ParticleParam> int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
@@ -43,10 +43,10 @@ index 2e78e4af95..3c6c6d227f 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3fbc481500..ab54624d60 100644
+index 453f925cbd..54ed349109 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1942,11 +1942,17 @@ public class CraftWorld implements World {
+@@ -2049,11 +2049,17 @@ public class CraftWorld implements World {
  
      @Override
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
diff --git a/Spigot-Server-Patches/0227-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0227-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch
index 7470895714..c75b80276d 100644
--- a/Spigot-Server-Patches/0227-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 561006a113ae741a0aee842e0e50b9d4e853711b Mon Sep 17 00:00:00 2001
+From 41b5bd130d90b9f3454e69599c857c9a6ac89a18 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 e441fa234..a1033ce28 100644
+index e441fa234d..a1033ce28b 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/0228-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0228-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch
index 0f1b47fa0e..84767bde5b 100644
--- a/Spigot-Server-Patches/0228-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From baa10d9b32eee5eacbdf112bd430ebcd0be6609c Mon Sep 17 00:00:00 2001
+From 5d70fcf0d6d534351e88769ca18f2b20ce841d68 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 477b53fa7..abac47d4c 100644
+index 477b53fa77..abac47d4cf 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/0229-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0229-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch
index 7ceea55646..ae06a11b6e 100644
--- a/Spigot-Server-Patches/0229-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 91612ff7638c1acee6859407f427cc583974e322 Mon Sep 17 00:00:00 2001
+From a78e9c34d5d673b93d9bf83e2887e9b238186435 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 abac47d4c..b9307d380 100644
+index abac47d4cf..b9307d380a 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/0230-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 88%
rename from Spigot-Server-Patches/0230-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 5250a7283c..aff8d8e2e0 100644
--- a/Spigot-Server-Patches/0230-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 50cdaa7cbf2d7b274416a5ddf8beedd4faba2fa7 Mon Sep 17 00:00:00 2001
+From aa531397acf9ab17832ce0b4f2065d8ee20f8526 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
@@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ab54624d6..3ed9d3f47 100644
+index 54ed349109..f568538243 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1236,6 +1236,10 @@ public class CraftWorld implements World {
+@@ -1316,6 +1316,10 @@ public class CraftWorld implements World {
          if (Boat.class.isAssignableFrom(clazz)) {
              entity = new EntityBoat(world, x, y, z);
              entity.setPositionRotation(x, y, z, yaw, pitch);
diff --git a/Spigot-Server-Patches/0231-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0231-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch
index 0aae74929f..8ef7f0e201 100644
--- a/Spigot-Server-Patches/0231-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch
@@ -1,11 +1,11 @@
-From d504fafc40b766c15453a3dda97e1351ec889280 Mon Sep 17 00:00:00 2001
+From 2c5d73a131d2a48f82a80f43c33b307c826138e0 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 b9307d380..ae9efb72c 100644
+index b9307d380a..ae9efb72c1 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/0232-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch
similarity index 91%
rename from Spigot-Server-Patches/0232-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch
index 2d7f38c7cb..f95a3cff80 100644
--- a/Spigot-Server-Patches/0232-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 221b24670380be1789c502a52c5adf4ae9edf22b Mon Sep 17 00:00:00 2001
+From 7b570ba36d932b379a2f030a356e9cd5bc1e6810 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 b7d327211..2acd02f2f 100644
+index b7d327211c..2acd02f2f4 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 b7d327211..2acd02f2f 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 4d8013685..1a7849767 100644
+index 88154d2f23..1609e6bbb6 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/0233-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0233-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch
index df02b24766..195c42ab69 100644
--- a/Spigot-Server-Patches/0233-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,11 +1,11 @@
-From f86419891df8d7944efd7630b3b4ce5f8a9d51a9 Mon Sep 17 00:00:00 2001
+From f5a86341b8dc7752da932871d5763574a17a4e40 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 5dd670615..734d04c09 100644
+index 5dd6706152..734d04c092 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/0234-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 93%
rename from Spigot-Server-Patches/0234-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 2218d0688c..a58f3af8e1 100644
--- a/Spigot-Server-Patches/0234-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 0dca0b4450442373fd420c8ec714f858a394bcca Mon Sep 17 00:00:00 2001
+From de94bc8a649115e56cbcc6989f60ed1c498ad0db 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 9f03d0337..29569805c 100644
+index 9f03d03375..29569805cb 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -11,7 +11,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0235-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch
similarity index 87%
rename from Spigot-Server-Patches/0235-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch
index 9a8e7e10d9..eb1921f9a9 100644
--- a/Spigot-Server-Patches/0235-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 8cb1169a6d40a9fa1a52f2fa5324867dd93e2c28 Mon Sep 17 00:00:00 2001
+From ead840b9a0f68489ec534f0faee33c1cc3438379 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,10 +21,10 @@ 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 ac94d05733..0119c96066 100644
+index 4af2527d63..af0fc9bd71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -685,14 +685,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -720,14 +720,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return false;
          }
          final CraftEntity other = (CraftEntity) obj;
@@ -43,7 +43,7 @@ index ac94d05733..0119c96066 100644
 +        // Paper end
      }
  
-     public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
+     @Override
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0236-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 98%
rename from Spigot-Server-Patches/0236-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch
index 9db1bc8508..bc0177cb8c 100644
--- a/Spigot-Server-Patches/0236-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From d0baaf4d6a59958256f8ab317b040d87e05e9531 Mon Sep 17 00:00:00 2001
+From 0ec637dda990151cc2a04371f27977c864920a07 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
diff --git a/Spigot-Server-Patches/0237-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 89%
rename from Spigot-Server-Patches/0237-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch
index c4b0bbd518..d913d6ac81 100644
--- a/Spigot-Server-Patches/0237-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,11 +1,11 @@
-From 42956378a65b0412666a7f30f8a29fca334e5ce6 Mon Sep 17 00:00:00 2001
+From 1bd0ad604e6a2d0840c269cc621335dfb635eb32 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 e60e10c57..350ac42d6 100644
+index e60e10c57d..350ac42d6b 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/0238-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0238-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch
index 949e89bc4e..c2a84e4ded 100644
--- a/Spigot-Server-Patches/0238-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From b3cdaca5ce72cb5807c5b6fb21744a9c0de5be0c Mon Sep 17 00:00:00 2001
+From 4533fc251af50ec3ec1372c6d4f05bc5dbc1c06d 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 fe9415b1d..ce17447fa 100644
+index fe9415b1de..ce17447faf 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 fe9415b1d..ce17447fa 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9ef605ba3..8c6d53f44 100644
+index 72a5a49038..ecbfe8cf8d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2915,7 +2915,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,10 +48,10 @@ index 9ef605ba3..8c6d53f44 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 f95347df0..182145ccf 100644
+index 8bd2f95f48..aeb4b7343e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -559,5 +559,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -606,5 +606,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setArrowsStuck(int arrows) {
          getHandle().setArrowCount(arrows);
      }
diff --git a/Spigot-Server-Patches/0239-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 93%
rename from Spigot-Server-Patches/0239-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 9816a7fe2e..af757243a5 100644
--- a/Spigot-Server-Patches/0239-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From 6731f23f1615e38fd9d7d0b6d89e50045ce2f016 Mon Sep 17 00:00:00 2001
+From 3ac291a4e463dd06a6f8f85e6bb6007322c2f38e 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 440e8f134..091c4abbd 100644
+index 440e8f1342..091c4abbd1 100644
 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java
 +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
 @@ -78,6 +78,10 @@ public class RecipeBookServer extends RecipeBook {
diff --git a/Spigot-Server-Patches/0240-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 94%
rename from Spigot-Server-Patches/0240-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 3717345e4d..2a601f3046 100644
--- a/Spigot-Server-Patches/0240-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 874ba3a727fad9bf8f9784944ac3a2e23a5c155d Mon Sep 17 00:00:00 2001
+From 2fe176bc1b672bcf7c69ef65687e041a10e9fa84 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 e575d3cff..85157e80d 100644
+index e575d3cff7..85157e80d2 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 e575d3cff..85157e80d 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 50b815dc8..4ec02c8ce 100644
+index 50b815dc89..4ec02c8ce7 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,10 +59,10 @@ index 50b815dc8..4ec02c8ce 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 569e117b7..144c63c9a 100644
+index 6da9e5e4b7..cd17b47771 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
-@@ -208,7 +208,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
+@@ -213,7 +213,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
                  ((IProjectile) object).shoot((double) vector3fa.a(), (double) vector3fa.b(), (double) vector3fa.c(), f1, f2);
              }
              // CraftBukkit start
@@ -72,10 +72,10 @@ index 569e117b7..144c63c9a 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 8d3dca2a9..4a16f2f53 100644
+index db44e82a10..30fe2528ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -47,6 +47,7 @@ import net.minecraft.server.GeneratorAccess;
+@@ -49,6 +49,7 @@ import net.minecraft.server.GeneratorAccess;
  import net.minecraft.server.IBlockData;
  import net.minecraft.server.IChatBaseComponent;
  import net.minecraft.server.IInventory;
@@ -83,7 +83,7 @@ index 8d3dca2a9..4a16f2f53 100644
  import net.minecraft.server.ItemActionContext;
  import net.minecraft.server.ItemStack;
  import net.minecraft.server.Items;
-@@ -437,16 +438,16 @@ public class CraftEventFactory {
+@@ -451,16 +452,16 @@ public class CraftEventFactory {
      /**
       * EntityShootBowEvent
       */
diff --git a/Spigot-Server-Patches/0241-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0241-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch
index bbdfa34fcc..f75e6d3e24 100644
--- a/Spigot-Server-Patches/0241-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 0cdddf9367dc7f2c534b18f99bce0f153d4cc7da Mon Sep 17 00:00:00 2001
+From ab2d09b574e37f4d6760c79255e7014706813d13 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 27bf83f37..3031d73f5 100644
+index 27bf83f373..3031d73f5f 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2032,6 +2032,17 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0242-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 93%
rename from Spigot-Server-Patches/0242-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch
index efd4ac6274..702ee93123 100644
--- a/Spigot-Server-Patches/0242-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,11 +1,11 @@
-From 15f975b03733628dbc8406c8b3dab599b68ea3bb Mon Sep 17 00:00:00 2001
+From b4996e5006a9a4c292a50c38e276f8148a0f235d 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 378267314..96ad67889 100644
+index 3782673141..96ad678893 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/0243-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0243-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch
index f186396bd0..df6b45337d 100644
--- a/Spigot-Server-Patches/0243-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 4312a5c952e133eafb39adc49e655f1445468cd7 Mon Sep 17 00:00:00 2001
+From 9ae191c6f59ffb79a82390660f5d5524a0b8f9fe 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 8c6d53f44..d65933e9e 100644
+index ecbfe8cf8d..66daa77d10 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1424,6 +1424,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0244-Expand-Explosions-API.patch b/Spigot-Server-Patches/0243-Expand-Explosions-API.patch
similarity index 83%
rename from Spigot-Server-Patches/0244-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0243-Expand-Explosions-API.patch
index 920a595f7b..c49d47263e 100644
--- a/Spigot-Server-Patches/0244-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0243-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 3fe29c64acb5071f4ee13259b444dcb4d298e859 Mon Sep 17 00:00:00 2001
+From f4d4ee382d5d7447231559f075303db9f8083f1d 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3ed9d3f47..c8cbedb5c 100644
+index f568538243..c4818af828 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -710,6 +710,11 @@ public class CraftWorld implements World {
+@@ -748,6 +748,11 @@ public class CraftWorld implements World {
      public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
          return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled;
      }
@@ -19,8 +19,8 @@ index 3ed9d3f47..c8cbedb5c 100644
 +    }
 +    // Paper end
  
+     @Override
      public boolean createExplosion(Location loc, float power) {
-         return createExplosion(loc, power, false);
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0245-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0245-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch
index f5ac3333f1..be624e69d9 100644
--- a/Spigot-Server-Patches/0245-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 42e917cd4fe357b4ebee9bb1e2adfff968f3b020 Mon Sep 17 00:00:00 2001
+From 5c1bdf2ae1a97542091fe38dad080f0f7376b059 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 d65933e9e..58bfe8c1c 100644
+index 66daa77d10..de0f9f57d2 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,10 +32,10 @@ index d65933e9e..58bfe8c1c 100644
          return this.isHandRaised() ? this.activeItem.k() - this.dm() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 182145ccf..29b23e30f 100644
+index aeb4b7343e..00fae68408 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -569,5 +569,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -616,5 +616,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setShieldBlockingDelay(int delay) {
          getHandle().setShieldBlockingDelay(delay);
      }
diff --git a/Spigot-Server-Patches/0246-RangedEntity-API.patch b/Spigot-Server-Patches/0245-RangedEntity-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0246-RangedEntity-API.patch
rename to Spigot-Server-Patches/0245-RangedEntity-API.patch
index f0151caaf4..fdee7e2cb5 100644
--- a/Spigot-Server-Patches/0246-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0245-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 14ffddbe3a78171ba0871e8c122359580ecec888 Mon Sep 17 00:00:00 2001
+From fd85ef8a2b0bae33f4fb75702f282c4b0f31de8e 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 000000000..696660b08
+index 0000000000..696660b089
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 @@ -0,0 +1,19 @@
@@ -32,7 +32,7 @@ index 000000000..696660b08
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java
-index b4178ce1e..9b79ac77d 100644
+index b4178ce1e8..9b79ac77db 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 b4178ce1e..9b79ac77d 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 2ec1af8be..f31d3eed3 100644
+index 2ec1af8be4..f31d3eed3a 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 2ec1af8be..f31d3eed3 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 23ab78da1..3f94c5a92 100644
+index 23ab78da15..3f94c5a920 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 23ab78da1..3f94c5a92 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 9fef81cc2..1dc9b4412 100644
+index b4ae898401..02df66ecfe 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 9fef81cc2..1dc9b4412 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 0349f0a57..2e3d8fcdf 100644
+index 27460c59e3..e482b1c9dc 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 0349f0a57..2e3d8fcdf 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 fb14179c3..49e0f2206 100644
+index 244e4dc8ec..bae107e76e 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 fb14179c3..49e0f2206 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 3df0fcb9b..a1d04ff28 100644
+index 38b555cc7e..03cf6136e6 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/0247-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 94%
rename from Spigot-Server-Patches/0247-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch
index c0f5960cf1..0a3f36e6b4 100644
--- a/Spigot-Server-Patches/0247-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,11 +1,11 @@
-From 578426cb83913b333e58ee88e26f12aa7e016c17 Mon Sep 17 00:00:00 2001
+From dc6efa41ccd1077be2f6ccd227527d0090d2d851 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 ce17447fa..3294fbbea 100644
+index ce17447faf..3294fbbeaf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -370,4 +370,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index ce17447fa..3294fbbea 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 5ae20b132..60ba37c92 100644
+index 5ae20b1322..60ba37c921 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/0248-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch
similarity index 80%
rename from Spigot-Server-Patches/0248-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch
index d92d48b696..75bba84fa3 100644
--- a/Spigot-Server-Patches/0248-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch
@@ -1,18 +1,19 @@
-From a2240a33505d12875b4c786d32e28c961acc6904 Mon Sep 17 00:00:00 2001
+From 2f6b011840b265acb30a8a757cdfecbef37f4d10 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/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c8cbedb5c..f8870f37b 100644
+index c4818af828..9a92d5b077 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1061,6 +1061,14 @@ public class CraftWorld implements World {
+@@ -1119,6 +1119,15 @@ public class CraftWorld implements World {
          return list;
      }
  
 +    // Paper start - getEntity by UUID API
++    @Override
 +    public Entity getEntity(UUID uuid) {
 +        Validate.notNull(uuid, "UUID cannot be null");
 +        net.minecraft.server.Entity entity = world.getEntity(uuid);
@@ -20,9 +21,9 @@ index c8cbedb5c..f8870f37b 100644
 +    }
 +    // Paper end
 +
+     @Override
      public void save() {
          this.server.checkSaveState();
-         try {
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0249-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch
similarity index 90%
rename from Spigot-Server-Patches/0249-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch
index 1bc5982e3e..d0fb00ae89 100644
--- a/Spigot-Server-Patches/0249-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 243a423c00b85f5654047ffb67abd3a65802b85e Mon Sep 17 00:00:00 2001
+From fb299c0d3bad297d88a19ff758a960a3d1cba451 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
@@ -34,10 +34,10 @@ index 3031d73f5f..f665dc0ebe 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 f44199b180..ae17e16af1 100644
+index 071fe14d34..870ef557a2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -359,7 +359,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -360,7 +360,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // Paper end
          if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
@@ -46,7 +46,7 @@ index f44199b180..ae17e16af1 100644
              this.activeContainer = this.defaultContainer;
          }
  
-@@ -527,7 +527,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -528,7 +528,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          // SPIGOT-943 - only call if they have an inventory open
          if (this.activeContainer != this.defaultContainer) {
@@ -55,7 +55,7 @@ index f44199b180..ae17e16af1 100644
          }
  
          String deathMessage = event.getDeathMessage();
-@@ -1037,7 +1037,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1053,7 +1053,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              return OptionalInt.empty();
          } else {
              if (this.activeContainer != this.defaultContainer) {
@@ -64,7 +64,7 @@ index f44199b180..ae17e16af1 100644
              }
  
              this.nextContainerCounter();
-@@ -1087,7 +1087,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1103,7 +1103,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // CraftBukkit end
          if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index f44199b180..ae17e16af1 100644
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1151,7 +1151,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1167,7 +1167,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void closeInventory() {
@@ -88,10 +88,10 @@ index f44199b180..ae17e16af1 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c9caf44231..fbdc755e80 100644
+index 594196107c..221eb5fdcd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2050,7 +2050,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2049,7 +2049,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
@@ -101,10 +101,10 @@ index c9caf44231..fbdc755e80 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 b855e79686..6d464a3dc2 100644
+index cacd769543..58bfafc6b2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -400,7 +400,7 @@ public abstract class PlayerList {
+@@ -401,7 +401,7 @@ public abstract class PlayerList {
          entityplayer.a(StatisticList.LEAVE_GAME);
  
          // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
@@ -114,7 +114,7 @@ index b855e79686..6d464a3dc2 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 3c6c6d227f..08168805d0 100644
+index 390ba575f8..bd38c65478 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -988,7 +988,7 @@ public class WorldServer extends World {
@@ -136,12 +136,12 @@ index 3c6c6d227f..08168805d0 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 6478d6126a..356c503dd7 100644
+index d0a019f50d..79fc638a0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -567,8 +567,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-     }
+@@ -607,8 +607,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
  
+     @Override
      public void closeInventory() {
 -        getHandle().closeInventory();
 +        // Paper start
@@ -152,13 +152,13 @@ index 6478d6126a..356c503dd7 100644
 +    }
 +    // Paper end
  
+     @Override
      public boolean isBlocking() {
-         return getHandle().isBlocking();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 04701a4cdb..1fa866c6d6 100644
+index 23a205af1e..88398c3320 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -769,7 +769,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -771,7 +771,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (getHandle().activeContainer != getHandle().defaultContainer) {
@@ -168,10 +168,10 @@ index 04701a4cdb..1fa866c6d6 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 4a16f2f532..de081ca1c5 100644
+index 30fe2528ae..b570e2778b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1225,8 +1225,19 @@ public class CraftEventFactory {
+@@ -1239,8 +1239,19 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0250-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0249-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 95%
rename from Spigot-Server-Patches/0250-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0249-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 5340ae23c2..f4502781d1 100644
--- a/Spigot-Server-Patches/0250-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0249-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From 49e199461743f603d9ca245880f23cb83c82c839 Mon Sep 17 00:00:00 2001
+From d3abd49c79cb7b3e679243895bf468a0cff438ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 03:39:51 -0400
 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk
@@ -45,7 +45,7 @@ index dd74f38038..2f79f9e947 100644
  
                          chunk.setTileEntity(tileentity1.getPosition(), tileentity1);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 459b7646a9..8cbb61bb8a 100644
+index bd38c65478..c5da81f770 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1068,7 +1068,7 @@ public class WorldServer extends World {
@@ -57,7 +57,7 @@ index 459b7646a9..8cbb61bb8a 100644
          if (entity instanceof EntityPlayer) {
              EntityPlayer entityplayer = (EntityPlayer) entity;
  
-@@ -1127,9 +1127,12 @@ public class WorldServer extends World {
+@@ -1128,9 +1128,12 @@ public class WorldServer extends World {
      }
  
      private void removeEntityFromChunk(Entity entity) {
diff --git a/Spigot-Server-Patches/0251-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0250-Configurable-Bed-Search-Radius.patch
similarity index 97%
rename from Spigot-Server-Patches/0251-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0250-Configurable-Bed-Search-Radius.patch
index b4c593011c..ecc1297888 100644
--- a/Spigot-Server-Patches/0251-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0250-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 123cf353a72db41320695ad0ca68af2be035beb5 Mon Sep 17 00:00:00 2001
+From 2694b57b65417360447f189021e0e5f416e900d3 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 3294fbbea..83e54cb90 100644
+index 3294fbbeaf..83e54cb904 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -375,4 +375,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index 3294fbbea..83e54cb90 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 2a451025f..75331c986 100644
+index 2a451025fe..75331c9864 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -171,6 +171,58 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
diff --git a/Spigot-Server-Patches/0252-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0251-Vex-getSummoner-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0252-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0251-Vex-getSummoner-API.patch
index c9feec9344..09b06f9ba8 100644
--- a/Spigot-Server-Patches/0252-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0251-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 0c4b39af55f46555a3913eaef96d6ea0e2afc844 Mon Sep 17 00:00:00 2001
+From fe6fa2197f8c1ca875823a241f0fcfdef81a46ad 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 ecfc057a1..83e022c91 100644
+index ecfc057a18..83e022c91b 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 ecfc057a1..83e022c91 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 737a37b6f..169c951ec 100644
+index 737a37b6fe..169c951ec3 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/0253-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0252-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 88%
rename from Spigot-Server-Patches/0253-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0252-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index a21cf4fd83..0b4145ad41 100644
--- a/Spigot-Server-Patches/0253-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0252-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 288ab6704822a825fba34d1d9d44fdb44d12f5df Mon Sep 17 00:00:00 2001
+From 36c87871e9642d083410a5b4a504686477d0f7cd 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 fbdc755e8..a0f6addef 100644
+index 221eb5fdcd..87fc6b6f30 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1964,6 +1964,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1963,6 +1963,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
  
                      if (event.isCancelled()) {
diff --git a/Spigot-Server-Patches/0254-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0253-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 88%
rename from Spigot-Server-Patches/0254-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0253-Don-t-change-the-Entity-Random-seed-for-squids.patch
index 0ca24fb570..970c85d3f6 100644
--- a/Spigot-Server-Patches/0254-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0253-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From a0ac76e611c316afe5b54e884aa833f58380a427 Mon Sep 17 00:00:00 2001
+From b2fabd7288c3c11b9562ecd5b60dd2bcd42b8f52 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 d5dff4b88..77c0ed42f 100644
+index d5dff4b88c..77c0ed42f4 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -19,7 +19,7 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0255-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0254-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 92%
rename from Spigot-Server-Patches/0255-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0254-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 6fcacb0946..92f4b70601 100644
--- a/Spigot-Server-Patches/0255-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0254-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From b92318c67ab59e8e299a7a1a8908bf62cee0c69e Mon Sep 17 00:00:00 2001
+From fd13ef62c84afb65c43b4137b0208f5ee5601bfd 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 af62ab182..0b4990a00 100644
+index c5da81f770..1ac79158c1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -973,7 +973,8 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0256-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0255-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 90%
rename from Spigot-Server-Patches/0256-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0255-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 2724d219bc..03406cf57a 100644
--- a/Spigot-Server-Patches/0256-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0255-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From d8d88222f6045eb3afdb50a693eec564b1825252 Mon Sep 17 00:00:00 2001
+From 9edeb09d0b0c03338fa0740036d36dd11bbf0ed8 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 c582c6711..c5fefa060 100644
+index c582c67119..c5fefa060b 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -166,6 +166,10 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0257-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0256-Use-asynchronous-Log4j-2-loggers.patch
similarity index 88%
rename from Spigot-Server-Patches/0257-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0256-Use-asynchronous-Log4j-2-loggers.patch
index 7d8c874942..a4b457f2c6 100644
--- a/Spigot-Server-Patches/0257-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0256-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From aef479838d337b9eb508d751c6544760f5001d1c Mon Sep 17 00:00:00 2001
+From b70b2818d5e0e75e666ff838988e110d3aea4fb7 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 16799b4cd..8c18a0c09 100644
+index 16799b4cd4..8c18a0c093 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -24,7 +24,7 @@ index 16799b4cd..8c18a0c09 100644
              <artifactId>asm</artifactId>
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
 new file mode 100644
-index 000000000..ee7c90784
+index 0000000000..ee7c90784c
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
 @@ -0,0 +1 @@
diff --git a/Spigot-Server-Patches/0258-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0257-add-more-information-to-Entity.toString.patch
similarity index 89%
rename from Spigot-Server-Patches/0258-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0257-add-more-information-to-Entity.toString.patch
index 4e8f8f0f2b..fc7d79c156 100644
--- a/Spigot-Server-Patches/0258-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0257-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From 07e48b2c5dbbf935e62fd18340ec507326878d8f Mon Sep 17 00:00:00 2001
+From c1dc8df7250f1045ac10f88413451b8bc08b6c9d 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 c28b498a2..c7d19d957 100644
+index f2a001c28b..0088d6088a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2423,7 +2423,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2443,7 +2443,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
diff --git a/Spigot-Server-Patches/0259-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0258-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 93%
rename from Spigot-Server-Patches/0259-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0258-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 51411db722..467f95b549 100644
--- a/Spigot-Server-Patches/0259-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0258-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From a862de455ad3f18990ad3c2debc852ca691c4857 Mon Sep 17 00:00:00 2001
+From 29e2b7d741c5bf7cc70114c2dc52d60f41eaed8b 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,10 +6,10 @@ 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 c7d19d957..8dd589aae 100644
+index 0088d6088a..56adea9cf4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -72,6 +72,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -75,6 +75,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
      protected CraftEntity bukkitEntity;
  
@@ -19,7 +19,7 @@ index c7d19d957..8dd589aae 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6bd181565..f9f0a94e9 100644
+index 2f79f9e947..f8c382cb69 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,6 +68,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -31,7 +31,7 @@ index 6bd181565..f9f0a94e9 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0b4990a00..3e41c080d 100644
+index 1ac79158c1..8515794059 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -77,6 +77,9 @@ public class WorldServer extends World {
@@ -57,7 +57,7 @@ index 0b4990a00..3e41c080d 100644
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
              return false;
          } else if (this.isUUIDTaken(entity)) {
-@@ -1099,7 +1108,24 @@ public class WorldServer extends World {
+@@ -1100,7 +1109,24 @@ public class WorldServer extends World {
                  }
              }
  
diff --git a/Spigot-Server-Patches/0260-EnderDragon-Events.patch b/Spigot-Server-Patches/0259-EnderDragon-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0260-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0259-EnderDragon-Events.patch
index eef716a32d..96ff553bfe 100644
--- a/Spigot-Server-Patches/0260-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0259-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From e572a4cfb10329466bb5f5fa0a7dc4c55c168796 Mon Sep 17 00:00:00 2001
+From 108337c59183688378c00abfe58000a7a696c8da 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 4ab310cd6..90f6d58dd 100644
+index 4ab310cd6b..90f6d58ddd 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 4ab310cd6..90f6d58dd 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 b46660576..bf15964e7 100644
+index b466605762..bf15964e78 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 b46660576..bf15964e7 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 239be99c5..2195b83ce 100644
+index 239be99c51..2195b83ce2 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/0261-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0260-PlayerElytraBoostEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0261-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0260-PlayerElytraBoostEvent.patch
index 9d6719051b..02a048ba3d 100644
--- a/Spigot-Server-Patches/0261-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0260-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From 142259f15f4baeeb62a3e50a16feeea0ab76f918 Mon Sep 17 00:00:00 2001
+From 80764b09615fb38e7b1977ba237bb6f18753ea44 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 aea46ffae..9e86ef4ce 100644
+index aea46ffae5..9e86ef4ce2 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/0262-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0261-PlayerLaunchProjectileEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0262-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0261-PlayerLaunchProjectileEvent.patch
index 6600b63d4e..cd62c5e2c8 100644
--- a/Spigot-Server-Patches/0262-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0261-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From 63edfb2b28cc8754bf733769d831ddcaec199744 Mon Sep 17 00:00:00 2001
+From 04b3d9dec3c5eb30471f59cf4d359d37f091b6b4 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 2bdb65bf8..f526af45f 100644
+index 2bdb65bf87..f526af45fb 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 2bdb65bf8..f526af45f 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 eb5f62dec..e8e52d726 100644
+index eb5f62dec2..e8e52d726e 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 eb5f62dec..e8e52d726 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 35f842ede..eb626a6f0 100644
+index 35f842ede5..eb626a6f05 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 35f842ede..eb626a6f0 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 e3683bdae..f3ad1cd6d 100644
+index e3683bdaef..f3ad1cd6d3 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 e3683bdae..f3ad1cd6d 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 624989dd7..c119785b7 100644
+index 624989dd7b..c119785b78 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 624989dd7..c119785b7 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index e267e43fe..fa6d627db 100644
+index e267e43fe5..fa6d627db4 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/0263-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0262-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0263-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0262-Speedup-BlockPos-by-fixing-inlining.patch
index 0347796a35..7879b0bedb 100644
--- a/Spigot-Server-Patches/0263-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0262-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 44546c450aad2cfac08a12d27bf967dd28e0eaba Mon Sep 17 00:00:00 2001
+From 51d077182e265920f39524ae740822964186c7b3 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 7cb46d7a9..e96428bb2 100644
+index 7cb46d7a9c..e96428bb2b 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 7cb46d7a9..e96428bb2 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 64700b97c..a5e5a4eba 100644
+index 64700b97c0..a5e5a4ebae 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/0264-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0263-Don-t-save-Proto-Chunks.patch
similarity index 85%
rename from Spigot-Server-Patches/0264-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0263-Don-t-save-Proto-Chunks.patch
index 0f762649c0..8a9d225a4d 100644
--- a/Spigot-Server-Patches/0264-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0263-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From 993e0fdb99639953f4e7e22f238212b333997dd0 Mon Sep 17 00:00:00 2001
+From bc37d872d3da190754fdab1a191a303396ee50cc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jul 2018 21:21:41 -0400
 Subject: [PATCH] Don't save Proto Chunks
@@ -8,10 +8,10 @@ the loadChunk method refuses to acknoledge they exists, and will restart
 a new chunk generation process to begin with, so saving them serves no benefit.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 7273323e36..184a42e149 100644
+index 99beb30093..bfcd57aa5f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -615,6 +615,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -589,6 +589,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
      }
  
      public void saveChunk(IChunkAccess ichunkaccess, boolean save) {
diff --git a/Spigot-Server-Patches/0265-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0264-Optimize-RegistryID.c.patch
similarity index 95%
rename from Spigot-Server-Patches/0265-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0264-Optimize-RegistryID.c.patch
index 580d8a50fa..d83da9c123 100644
--- a/Spigot-Server-Patches/0265-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0264-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 6d8bc880e02369cc0c7c8db23895c3c8c3e1459b Mon Sep 17 00:00:00 2001
+From 51cee059dd164af1fc657390517994fa7e885b8e 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 e15d28671..e8a48b9a4 100644
+index e15d286710..e8a48b9a4c 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/0266-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0265-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 96%
rename from Spigot-Server-Patches/0266-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0265-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 8749415b6b..003ccff3ed 100644
--- a/Spigot-Server-Patches/0266-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0265-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 932521b41119d68d1fb10b377dc4431c358fdc2f Mon Sep 17 00:00:00 2001
+From 4bc6d671027b704df778a365ae88a309305d922f 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/Spigot-Server-Patches/0267-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0266-Vanished-players-don-t-have-rights.patch
similarity index 95%
rename from Spigot-Server-Patches/0267-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0266-Vanished-players-don-t-have-rights.patch
index 1fbee20967..a10fe603b7 100644
--- a/Spigot-Server-Patches/0267-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0266-Vanished-players-don-t-have-rights.patch
@@ -1,14 +1,14 @@
-From 345aae7afaa998970bff80dbfd8d303ecbd001dd Mon Sep 17 00:00:00 2001
+From cf655db17ece1bd42693e41fc787aca3dd602f52 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 8dd589aaea..57a4481c50 100644
+index 56adea9cf4..3397604a8a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -94,7 +94,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private static double e = 1.0D;
      private final EntityTypes<?> f;
      private int id;
@@ -72,10 +72,10 @@ index 59b1e6ce2e..b90cc6652b 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index de081ca1c5..c09f7e7c40 100644
+index b570e2778b..b0f827594b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1106,6 +1106,14 @@ public class CraftEventFactory {
+@@ -1120,6 +1120,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/Spigot-Server-Patches/0268-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0267-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 89%
rename from Spigot-Server-Patches/0268-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0267-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index b765b4f6f6..bcb8e2fe24 100644
--- a/Spigot-Server-Patches/0268-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0267-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From d52c89665ad3ede7d515a1867fac19060394faf0 Mon Sep 17 00:00:00 2001
+From 6702adf4aaf939989fef82ae6899f3c2f7dabe69 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 54bb7f551..8b6a52d72 100644
+index 54bb7f5515..8b6a52d722 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -433,6 +433,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0269-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0268-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 93%
rename from Spigot-Server-Patches/0269-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0268-Add-some-Debug-to-Chunk-Entity-slices.patch
index 1cabc18cd9..1df85fe359 100644
--- a/Spigot-Server-Patches/0269-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0268-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 87f3b1ce9adadf99167c2b90c044ad1132b62f7b Mon Sep 17 00:00:00 2001
+From 427f7dcd47331bf8e6f66159c475b3ce6568ee22 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 8b6a52d72..0c8a2ac90 100644
+index 8b6a52d722..0c8a2ac902 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -425,6 +425,25 @@ public class Chunk implements IChunkAccess {
@@ -57,10 +57,10 @@ index 8b6a52d72..0c8a2ac90 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 57a4481c5..4648a93b0 100644
+index 3397604a8a..cbd7793c53 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -64,6 +64,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
          }
      };
diff --git a/Spigot-Server-Patches/0270-EntityTransformedEvent.patch b/Spigot-Server-Patches/0269-EntityTransformedEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0270-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0269-EntityTransformedEvent.patch
index 932d5faa79..89d3b96b84 100644
--- a/Spigot-Server-Patches/0270-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0269-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From 30a85186e41137da0b21abd0ec1bf5fd954cbb87 Mon Sep 17 00:00:00 2001
+From 198e144ce8e5bc7857f8d757383e556ec1b5e590 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 55048af34..ed990ddef 100644
+index 2b0ac15a8d..76712996fd 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -101,6 +101,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index 55048af34..ed990ddef 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 bc04086d7..d489a5a8c 100644
+index bc04086d79..d489a5a8c7 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -591,6 +591,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -29,7 +29,7 @@ index bc04086d7..d489a5a8c 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 d9d993860..92d1cd851 100644
+index c3ce3daca6..2f0fab469b 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index d9d993860..92d1cd851 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 042afd269..d7205a57e 100644
+index 042afd2691..d7205a57e6 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -159,6 +159,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
diff --git a/Spigot-Server-Patches/0271-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0270-SkeletonHorse-Additions.patch
similarity index 94%
rename from Spigot-Server-Patches/0271-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0270-SkeletonHorse-Additions.patch
index 893d65452b..8538b4e1af 100644
--- a/Spigot-Server-Patches/0271-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0270-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From f9adb3309cff56aa1b9a667cb3af9139a3ee520d Mon Sep 17 00:00:00 2001
+From 35cd744003a55450bba24f19436ad7bef00d7ff0 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 9ac34dfa8..b96726456 100644
+index 9ac34dfa8c..b967264562 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 9ac34dfa8..b96726456 100644
          if (flag != this.bK) {
              this.bK = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index 7b0a6f82f..f09374413 100644
+index 7b0a6f82fb..f093744136 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 7b0a6f82f..f09374413 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 e822c2200..2a7d1d4ec 100644
+index e822c2200d..2a7d1d4ec2 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/0272-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0271-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0272-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0271-Prevent-Saving-Bad-entities-to-chunks.patch
index ec9834c69b..0aecf9c1d5 100644
--- a/Spigot-Server-Patches/0272-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0271-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From de82f12fa592c1bfcfb3a948dfedf4f2dc54130e Mon Sep 17 00:00:00 2001
+From ef076ea837adf53c30c9e890133c866ac5c03288 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 0fed039f3..2e9686b43 100644
+index 0fed039f34..2e9686b432 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -304,6 +304,7 @@ public class ChunkRegionLoader {
diff --git a/Spigot-Server-Patches/0273-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0272-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 94%
rename from Spigot-Server-Patches/0273-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0272-Don-t-call-getItemMeta-on-hasItemMeta.patch
index a91ee25096..2701880a8b 100644
--- a/Spigot-Server-Patches/0273-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0272-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From f68a1e9331b68514649bda1dcddc06c8bd4017bc Mon Sep 17 00:00:00 2001
+From 7cb15e928a613c57fa2f9425562a424064462589 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
@@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 1a7849767..2f872b640 100644
+index 1609e6bbb6..8a6a135372 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -534,7 +534,7 @@ public final class CraftItemStack extends ItemStack {
+@@ -536,7 +536,7 @@ public final class CraftItemStack extends ItemStack {
  
      @Override
      public boolean hasItemMeta() {
@@ -24,7 +24,7 @@ index 1a7849767..2f872b640 100644
  
      static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 93c4e1239..2c9481042 100644
+index 2a0852675b..f30f743121 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.*;
@@ -35,7 +35,7 @@ index 93c4e1239..2c9481042 100644
  import java.util.List;
  import java.util.UUID;
  import com.destroystokyo.paper.inventory.meta.ArmorStandMeta; // Paper
-@@ -179,7 +180,47 @@ public class ItemMetaTest extends AbstractTestingBase {
+@@ -180,7 +181,47 @@ public class ItemMetaTest extends AbstractTestingBase {
  
          assertThat("noTag and enchanted stacks should not be similar", noTag.isSimilar(enchanted), is(false));
          assertThat("noTag and enchanted stacks should not be equal", noTag.equals(enchanted), is(false));
diff --git a/Spigot-Server-Patches/0274-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0273-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 91%
rename from Spigot-Server-Patches/0274-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0273-Ignore-Dead-Entities-in-entityList-iteration.patch
index fbb6d90253..c75c46fad2 100644
--- a/Spigot-Server-Patches/0274-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0273-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From f4f84a5fc9331648ef73054255e7b40b0eee2c48 Mon Sep 17 00:00:00 2001
+From 3018d73c74402f77573949a1a476cc8690029ceb 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,10 +51,10 @@ index 0c8a2ac902..21fae98c10 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 4648a93b0f..33b2dd3ff8 100644
+index cbd7793c53..a217cb0fe7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -123,6 +123,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public float D;
      public float E;
      public float F;
@@ -63,7 +63,7 @@ index 4648a93b0f..33b2dd3ff8 100644
      private float av;
      private float aw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ece9900aac..716f3b7db5 100644
+index 8515794059..c7e5d545c0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -843,6 +843,7 @@ public class WorldServer extends World {
@@ -74,7 +74,7 @@ index ece9900aac..716f3b7db5 100644
              // CraftBukkit start - Split out persistent check, don't apply it to special persistent mobs
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
-@@ -1136,6 +1137,7 @@ public class WorldServer extends World {
+@@ -1137,6 +1138,7 @@ public class WorldServer extends World {
                  entity.origin = entity.getBukkitEntity().getLocation();
              }
              // Paper end
@@ -82,7 +82,7 @@ index ece9900aac..716f3b7db5 100644
              new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
          }
  
-@@ -1150,6 +1152,7 @@ public class WorldServer extends World {
+@@ -1151,6 +1153,7 @@ public class WorldServer extends World {
              this.removeEntityFromChunk(entity);
              this.entitiesById.remove(entity.getId());
              this.unregisterEntity(entity);
@@ -91,10 +91,10 @@ index ece9900aac..716f3b7db5 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f8870f37bb..03148879f4 100644
+index 9a92d5b077..76cce69ed0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -805,6 +805,7 @@ public class CraftWorld implements World {
+@@ -858,6 +858,7 @@ public class CraftWorld implements World {
          for (Object o : world.entitiesById.values()) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -102,7 +102,7 @@ index f8870f37bb..03148879f4 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -823,6 +824,7 @@ public class CraftWorld implements World {
+@@ -877,6 +878,7 @@ public class CraftWorld implements World {
          for (Object o : world.entitiesById.values()) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -110,7 +110,7 @@ index f8870f37bb..03148879f4 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -847,6 +849,7 @@ public class CraftWorld implements World {
+@@ -903,6 +905,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entitiesById.values()) {
              if (entity instanceof net.minecraft.server.Entity) {
@@ -118,7 +118,7 @@ index f8870f37bb..03148879f4 100644
                  Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
  
                  if (bukkitEntity == null) {
-@@ -869,6 +872,7 @@ public class CraftWorld implements World {
+@@ -926,6 +929,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entitiesById.values()) {
              if (entity instanceof net.minecraft.server.Entity) {
diff --git a/Spigot-Server-Patches/0275-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0274-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 98%
rename from Spigot-Server-Patches/0275-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0274-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index 0eb1c91674..0afa94f603 100644
--- a/Spigot-Server-Patches/0275-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0274-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From d1a4bbe9d075d932918bfbf3c054ae1871cad606 Mon Sep 17 00:00:00 2001
+From 41c6a0d5f4270d4099eba24abf87a69ed2cdffc6 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 c8f9c45e5..52adc671e 100644
+index c8f9c45e5d..52adc671e5 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 c8f9c45e5..52adc671e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index c8573a8ee..1b12a1611 100644
+index c8573a8ee6..1b12a16113 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 c8573a8ee..1b12a1611 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 350ac42d6..eaae44686 100644
+index 350ac42d6b..eaae446861 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/0276-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0275-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 85%
rename from Spigot-Server-Patches/0276-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0275-MC-111480-Start-Entity-ID-s-at-1.patch
index c35672427a..21f54f195e 100644
--- a/Spigot-Server-Patches/0276-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0275-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From ec527b882e52d49e8a77a9bd1cbd0438bb2bed2f Mon Sep 17 00:00:00 2001
+From 7aabd2f484eead947cfa6a4167545ccfe36b5262 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,10 +7,10 @@ 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 99abf7f9c..2dfa7d251 100644
+index a217cb0fe7..9bfc725a2c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -89,7 +89,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      // CraftBukkit end
  
      protected static final Logger LOGGER = LogManager.getLogger();
diff --git a/Spigot-Server-Patches/0277-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0276-Implement-Expanded-ArmorStand-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0277-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0276-Implement-Expanded-ArmorStand-API.patch
index b378b6d8c1..c3bd2450a8 100644
--- a/Spigot-Server-Patches/0277-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0276-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 0d99d778d80601f15703e3b8ee3c48d17c20de5f Mon Sep 17 00:00:00 2001
+From d983ddb997ce71479037b942b8e8fbc38e45dfdb 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 f8cd62199..8fb3ce17a 100644
+index f8cd621993..8fb3ce17aa 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 f8cd62199..8fb3ce17a 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 124c3185b..9f5c3b92e 100644
+index 124c3185bc..9f5c3b92e3 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/0278-AnvilDamageEvent.patch b/Spigot-Server-Patches/0277-AnvilDamageEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0278-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0277-AnvilDamageEvent.patch
index 56b53c146c..9726d68154 100644
--- a/Spigot-Server-Patches/0278-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0277-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From 21a3ebeee5774fdadd523bed39f01798f46cda9c Mon Sep 17 00:00:00 2001
+From 3118518675cbffccd9f4bbad212eab9af81f67c9 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 ada5cf982..64a992152 100644
+index ada5cf982e..64a992152b 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/0279-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0278-Add-TNTPrimeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0279-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0278-Add-TNTPrimeEvent.patch
index b85138555c..e86e0662b4 100644
--- a/Spigot-Server-Patches/0279-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0278-Add-TNTPrimeEvent.patch
@@ -1,11 +1,11 @@
-From 5157854b464ebc1aed770cb2e9227a363fd2d45b Mon Sep 17 00:00:00 2001
+From 3878afe26abbcbc153c15da6aecda75ae2c436f4 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 73190ccba..4086d5ed2 100644
+index 73190ccbaa..4086d5ed2d 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;
@@ -40,7 +40,7 @@ index 73190ccba..4086d5ed2 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 8cb36ed3a..88d023871 100644
+index 8cb36ed3a4..88d0238718 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 8cb36ed3a..88d023871 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 3a6ae654c..3abf89b74 100644
+index 3a6ae654cc..3abf89b741 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/0280-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0279-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0280-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0279-Break-up-and-make-tab-spam-limits-configurable.patch
index a1194c29d7..8e3cbcc4c9 100644
--- a/Spigot-Server-Patches/0280-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0279-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From a2e3dece59e64c66222fca56cdae916c2636ae6c Mon Sep 17 00:00:00 2001
+From f157b265de11e1896f3c1b2030f2c505e9e9e585 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 52adc671e..ef567579e 100644
+index 52adc671e5..ef567579ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -308,4 +308,18 @@ public class PaperConfig {
@@ -45,10 +45,10 @@ index 52adc671e..ef567579e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a0f6addef..e59037211 100644
+index 87fc6b6f30..bc04400484 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -78,6 +78,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit start - multithreaded fields
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
@@ -56,7 +56,7 @@ index a0f6addef..e59037211 100644
      // CraftBukkit end
      private int j;
      private final Int2ShortMap k = new Int2ShortOpenHashMap();
-@@ -205,6 +206,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -203,6 +204,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          this.minecraftServer.getMethodProfiler().exit();
          // CraftBukkit start
          for (int spam; (spam = this.chatThrottle) > 0 && !chatSpamField.compareAndSet(this, spam, spam - 1); ) ;
@@ -64,7 +64,7 @@ index a0f6addef..e59037211 100644
          /* Use thread-safe field access instead
          if (this.chatThrottle > 0) {
              --this.chatThrottle;
-@@ -523,7 +525,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -521,7 +523,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
          // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
          // CraftBukkit start
diff --git a/Spigot-Server-Patches/0281-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0280-Add-hand-to-bucket-events.patch
similarity index 96%
rename from Spigot-Server-Patches/0281-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0280-Add-hand-to-bucket-events.patch
index fdc7e34602..1563a61fc8 100644
--- a/Spigot-Server-Patches/0281-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0280-Add-hand-to-bucket-events.patch
@@ -1,11 +1,11 @@
-From 95f79c464f9dc2f145b415c7372eb6995e30215b Mon Sep 17 00:00:00 2001
+From 4ee6301c818812345876e6c8ba08c084c7833320 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 a17738f9f..d2c2e3cc3 100644
+index a17738f9ff..d2c2e3cc33 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 a17738f9f..d2c2e3cc3 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 cb2891411..5dc967f8b 100644
+index cb28914118..5dc967f8ba 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 {
@@ -67,10 +67,10 @@ index cb2891411..5dc967f8b 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 c09f7e7c4..50444ed94 100644
+index b0f827594b..23c4b93466 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -340,6 +340,20 @@ public class CraftEventFactory {
+@@ -354,6 +354,20 @@ public class CraftEventFactory {
      }
  
      private static PlayerEvent getPlayerBucketEvent(boolean isFilling, EntityHuman who, int clickedX, int clickedY, int clickedZ, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {
@@ -91,7 +91,7 @@ index c09f7e7c4..50444ed94 100644
          Player player = (who == null) ? null : (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item);
          Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem());
-@@ -352,10 +366,10 @@ public class CraftEventFactory {
+@@ -366,10 +380,10 @@ public class CraftEventFactory {
  
          PlayerEvent event = null;
          if (isFilling) {
diff --git a/Spigot-Server-Patches/0282-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0281-MC-135506-Experience-should-save-as-Integers.patch
similarity index 92%
rename from Spigot-Server-Patches/0282-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0281-MC-135506-Experience-should-save-as-Integers.patch
index 075981c21b..5d92e75a2e 100644
--- a/Spigot-Server-Patches/0282-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0281-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From af3edfe66552207de44f381e2c44ee59d9bf75cb Mon Sep 17 00:00:00 2001
+From 06e9a549b0ad61d0792aefdecf0c4f45a05d49f5 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 64d71a9a2..65c996961 100644
+index 64d71a9a2a..65c9969613 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/0283-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0282-Fix-client-rendering-skulls-from-same-user.patch
similarity index 96%
rename from Spigot-Server-Patches/0283-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0282-Fix-client-rendering-skulls-from-same-user.patch
index fe8112b546..9621159055 100644
--- a/Spigot-Server-Patches/0283-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0282-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From ea5e6546dc45187eaec3b83d97971f36f49c301b Mon Sep 17 00:00:00 2001
+From 52423cb01f622562c809268b7cc4704cd762f04f 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 2acd02f2f..ca1bd0299 100644
+index 2acd02f2f4..ca1bd02995 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 2acd02f2f..ca1bd0299 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 0d67676f7..fa2d3ce8c 100644
+index 0d67676f7d..fa2d3ce8cb 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 0d67676f7..fa2d3ce8c 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 363ab5da1..d19a30ad8 100644
+index 363ab5da12..d19a30ad87 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 363ab5da1..d19a30ad8 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 e827d7605..4803b173a 100644
+index e827d76054..4803b173aa 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/0284-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0283-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 96%
rename from Spigot-Server-Patches/0284-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0283-Add-Early-Warning-Feature-to-WatchDog.patch
index 0e19becde5..ac046df4f9 100644
--- a/Spigot-Server-Patches/0284-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0283-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 0f6c50e8916f60aed820cc335e3346779445fcc2 Mon Sep 17 00:00:00 2001
+From dd43dfd024aa5640ce1d2b6ef234ac02be3f4b69 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 ef567579e..8062054ab 100644
+index ef567579ec..8062054abe 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,10 +36,10 @@ index ef567579e..8062054ab 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 359ce72fc..30952ade4 100644
+index d3620b18a0..afa6e6644e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -835,6 +835,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -848,6 +848,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  this.a(this.serverPing);
  
                  // Spigot start
@@ -48,7 +48,7 @@ index 359ce72fc..30952ade4 100644
                  long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 01ed56a2a..7b204d584 100644
+index 91c86e451f..985faf8e90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -753,6 +753,7 @@ public final class CraftServer implements Server {
@@ -68,7 +68,7 @@ index 01ed56a2a..7b204d584 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 062a24c3c..f06110d06 100644
+index 6c5430ff94..4b8581f0ed 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 062a24c3c..f06110d06 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 9532aada8..a1d93200e 100644
+index 9532aada82..a1d93200e6 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/0285-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0284-Make-EnderDragon-implement-Mob.patch
similarity index 93%
rename from Spigot-Server-Patches/0285-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0284-Make-EnderDragon-implement-Mob.patch
index 4b380af841..932f5f16ae 100644
--- a/Spigot-Server-Patches/0285-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0284-Make-EnderDragon-implement-Mob.patch
@@ -1,11 +1,11 @@
-From 51a8e9921c23a32e7e76fffd689166f572e772df Mon Sep 17 00:00:00 2001
+From 59f8114af15d34ac51cc390d99b11a0cd09d0313 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 cc115cc36..4947249da 100644
+index cc115cc368..4947249da2 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/0286-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0285-Detect-and-repair-corrupt-Region-Files.patch
similarity index 98%
rename from Spigot-Server-Patches/0286-Detect-and-repair-corrupt-Region-Files.patch
rename to Spigot-Server-Patches/0285-Detect-and-repair-corrupt-Region-Files.patch
index 92b02cf343..1662e3507e 100644
--- a/Spigot-Server-Patches/0286-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0285-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From d244977f87d982b0563cb1ab8a3c87141b808bbc Mon Sep 17 00:00:00 2001
+From f495f340021a9f5e104d1d0af06c140dfd9536e2 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 4e6288e8b..e68f90194 100644
+index 4e6288e8bb..e68f901943 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/0287-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0286-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 97%
rename from Spigot-Server-Patches/0287-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0286-Use-ConcurrentHashMap-in-JsonList.patch
index b3922545ab..d25f056517 100644
--- a/Spigot-Server-Patches/0287-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0286-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 726ccb6da79fd80fa6ac09f8cc41984960bbcc77 Mon Sep 17 00:00:00 2001
+From 541af4343884a34547ea09904010768d183671f5 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 04f98167d..c169d0176 100644
+index 04f98167d3..c169d01762 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/0288-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0287-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0288-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0287-Use-a-Queue-for-Queueing-Commands.patch
index 9b5c834d94..3560fdc551 100644
--- a/Spigot-Server-Patches/0288-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0287-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From f494013c45946ca64c7f307884d2b777738b3988 Mon Sep 17 00:00:00 2001
+From c552012914c805e71e6f89c8b33f56971e7298cd 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 c2c676e3b..3d452fe0e 100644
+index c2c676e3bb..3d452fe0e3 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -41,7 +41,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0289-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0288-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 79%
rename from Spigot-Server-Patches/0289-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0288-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index ce88fab0ba..b29e4ba6b5 100644
--- a/Spigot-Server-Patches/0289-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0288-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,27 +1,26 @@
-From 2c4cd6098df36181141f3e499fa650ce14057272 Mon Sep 17 00:00:00 2001
+From d60cad161dd929174196d60a61b3cc8964a9e0b4 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/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index b4fcf25d4..fa078eb0e 100644
+index 323f5bf289..f1db08c880 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -111,7 +111,12 @@ public class CraftChunk implements Chunk {
-         return entities;
-     }
+@@ -118,6 +118,11 @@ public class CraftChunk implements Chunk {
  
-+    // Paper start
+     @Override
      public BlockState[] getTileEntities() {
 +        return getTileEntities(true);
 +    }
++    @Override
 +    public BlockState[] getTileEntities(boolean useSnapshot) {
 +        // Paper end
          int index = 0;
          net.minecraft.server.Chunk chunk = getHandle();
  
-@@ -123,7 +128,7 @@ public class CraftChunk implements Chunk {
+@@ -129,7 +134,7 @@ public class CraftChunk implements Chunk {
              }
  
              BlockPosition position = (BlockPosition) obj;
diff --git a/Spigot-Server-Patches/0290-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0289-Allow-disabling-armour-stand-ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0290-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0289-Allow-disabling-armour-stand-ticking.patch
index 858548edbf..c06f7e582b 100644
--- a/Spigot-Server-Patches/0290-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0289-Allow-disabling-armour-stand-ticking.patch
@@ -1,11 +1,11 @@
-From 8063a9d72baee8dbc08e972997de092741caf10f Mon Sep 17 00:00:00 2001
+From ce474962c41099360ce1a18c3fa18921efcb2ee8 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 f06bb3ae1..a5b4f9990 100644
+index f06bb3ae19..a5b4f99901 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -391,4 +391,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index f06bb3ae1..a5b4f9990 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 8fb3ce17a..7031dd0e4 100644
+index 8fb3ce17aa..7031dd0e4c 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 8fb3ce17a..7031dd0e4 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 58bfe8c1c..2ed2960c5 100644
+index de0f9f57d2..f115686f4a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2259,52 +2259,7 @@ public abstract class EntityLiving extends Entity {
@@ -256,7 +256,7 @@ index 58bfe8c1c..2ed2960c5 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 9f5c3b92e..07ce93f17 100644
+index 9f5c3b92e3..07ce93f17c 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/0291-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0290-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0291-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0290-Optimize-BlockPosition-helper-methods.patch
index 03fa23e3e3..50b5bec387 100644
--- a/Spigot-Server-Patches/0291-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0290-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 613b7fbd67ec494dff0c01c3a7880e3e86102e43 Mon Sep 17 00:00:00 2001
+From 3a326c8f577ca50d98bc3260f06adec5ca76359d 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 a5e5a4eba..6ed584f8d 100644
+index a5e5a4ebae..6ed584f8dd 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/0292-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0291-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 90%
rename from Spigot-Server-Patches/0292-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0291-Send-nearby-packets-from-world-player-list-not-serve.patch
index 199fcad9d2..ad5885ebf4 100644
--- a/Spigot-Server-Patches/0292-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0291-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,14 +1,14 @@
-From 785f521dcc34233bfddbcdca33ad1c485330b1ab Mon Sep 17 00:00:00 2001
+From 1c722c8dbab66491dbfd6e1f09b410dd61ce3c33 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6d464a3dc2..8233292688 100644
+index 58bfafc6b2..97f4f7e1bd 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -919,8 +919,25 @@ public abstract class PlayerList {
+@@ -921,8 +921,25 @@ public abstract class PlayerList {
      }
  
      public void sendPacketNearby(@Nullable EntityHuman entityhuman, double d0, double d1, double d2, double d3, DimensionManager dimensionmanager, Packet<?> packet) {
@@ -36,7 +36,7 @@ index 6d464a3dc2..8233292688 100644
  
              // CraftBukkit start - Test if player receiving packet can see the source of the packet
              if (entityhuman != null && entityhuman instanceof EntityPlayer && !entityplayer.getBukkitEntity().canSee(((EntityPlayer) entityhuman).getBukkitEntity())) {
-@@ -928,7 +945,7 @@ public abstract class PlayerList {
+@@ -930,7 +947,7 @@ public abstract class PlayerList {
              }
              // CraftBukkit end
  
@@ -46,10 +46,10 @@ index 6d464a3dc2..8233292688 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 716f3b7db5..1c1a847e4f 100644
+index c7e5d545c0..281b11f010 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 {
+@@ -1189,7 +1189,7 @@ public class WorldServer extends World {
          }
          // CraftBukkit end
          this.globalEntityList.add(entitylightning);
@@ -58,7 +58,7 @@ index 716f3b7db5..1c1a847e4f 100644
      }
  
      @Override
-@@ -1323,8 +1323,8 @@ public class WorldServer extends World {
+@@ -1324,8 +1324,8 @@ public class WorldServer extends World {
              BlockActionData blockactiondata = (BlockActionData) this.J.removeFirst();
  
              if (this.a(blockactiondata)) {
@@ -70,10 +70,10 @@ index 716f3b7db5..1c1a847e4f 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 03148879f4..e336813bdc 100644
+index 76cce69ed0..244b087f4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1817,7 +1817,7 @@ public class CraftWorld implements World {
+@@ -1921,7 +1921,7 @@ public class CraftWorld implements World {
          double z = loc.getZ();
  
          PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);
@@ -81,7 +81,7 @@ index 03148879f4..e336813bdc 100644
 +        world.getMinecraftServer().getPlayerList().sendPacketNearby(null, x, y, z, volume > 1.0F ? 16.0F * volume : 16.0D, this.world, packet); // Paper - this.world.dimension -> this.world
      }
  
-     public String getGameRuleValue(String rule) {
+     @Override
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0293-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0292-Restore-vanlla-default-mob-spawn-range.patch
similarity index 81%
rename from Spigot-Server-Patches/0293-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0292-Restore-vanlla-default-mob-spawn-range.patch
index b2344f03bb..4044462e7f 100644
--- a/Spigot-Server-Patches/0293-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0292-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,14 +1,14 @@
-From 5e6d091aa073f466fb7020fd320b928740071302 Mon Sep 17 00:00:00 2001
+From 03205b4f5796f847bb314d09a718e08bbf9d92cb 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/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 222adb40c..5a0b9567f 100644
+index 9a51c0ef7a..c2bf481a60 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -136,7 +136,7 @@ public class SpigotWorldConfig
+@@ -152,7 +152,7 @@ public class SpigotWorldConfig
      public byte mobSpawnRange;
      private void mobSpawnRange()
      {
diff --git a/Spigot-Server-Patches/0294-Optimize-Hoppers.patch b/Spigot-Server-Patches/0293-Optimize-Hoppers.patch
similarity index 97%
rename from Spigot-Server-Patches/0294-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0293-Optimize-Hoppers.patch
index e7de1051c2..feb56c9702 100644
--- a/Spigot-Server-Patches/0294-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0293-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 565714b3d1a1ba66f02cf327fdbe09672969c2e3 Mon Sep 17 00:00:00 2001
+From 3d9f069b6db843b2879c91968994c4edd0cadae7 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 a5b4f9990..2b5402b00 100644
+index a5b4f99901..2b5402b009 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -360,6 +360,15 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index a5b4f9990..2b5402b00 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 ca1bd0299..2d83c9e79 100644
+index ca1bd02995..2d83c9e79c 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,10 +47,10 @@ index ca1bd0299..2d83c9e79 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 30952ade4..0cebf6f5a 100644
+index afa6e6644e..e5d96bf750 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1117,6 +1117,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1136,6 +1136,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          for (Iterator iterator = this.getWorlds().iterator(); iterator.hasNext();) {
              WorldServer worldserver = (WorldServer) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -59,10 +59,10 @@ index 30952ade4..0cebf6f5a 100644
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                  this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 4ac97a59c..6f63b2867 100644
+index b76f30dd24..b4beb2e326 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -53,6 +53,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -60,6 +60,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
      public void setCurrentChunk(Chunk chunk) {
          this.currentChunk = chunk != null ? new java.lang.ref.WeakReference<>(chunk) : null;
      }
@@ -70,7 +70,7 @@ index 4ac97a59c..6f63b2867 100644
      // Paper end
  
      @Nullable
-@@ -125,6 +126,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -143,6 +144,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
  
      public void update() {
          if (this.world != null) {
@@ -79,7 +79,7 @@ index 4ac97a59c..6f63b2867 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 0ecfbcb4b..dfe51fc6f 100644
+index 0ecfbcb4b8..dfe51fc6f4 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -191,6 +191,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
diff --git a/Spigot-Server-Patches/0295-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0294-Optimize-CraftBlockData-Creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0295-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0294-Optimize-CraftBlockData-Creation.patch
index c19aff5ed7..60f50a20e2 100644
--- a/Spigot-Server-Patches/0295-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0294-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From 4c59a577a70461ba86d4efef66915cee52fe4e7c Mon Sep 17 00:00:00 2001
+From 1da1eb88cdd0a4d34e5f242af381a678684c88f3 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/0296-Fix-MC-124320.patch b/Spigot-Server-Patches/0295-Fix-MC-124320.patch
similarity index 95%
rename from Spigot-Server-Patches/0296-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0295-Fix-MC-124320.patch
index 81d7695c2e..75822a1e53 100644
--- a/Spigot-Server-Patches/0296-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0295-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From b17b9f33e112e162732c793ab9b80c9866ef1574 Mon Sep 17 00:00:00 2001
+From 54f8c029bd7d04779e8892facb36d91dc1e6ea5d 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 69e65ea6c..549c50de7 100644
+index 69e65ea6c8..549c50de7d 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -160,6 +160,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index 69e65ea6c..549c50de7 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 a1033ce28..de2d99534 100644
+index a1033ce28b..de2d995349 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -325,8 +325,9 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0297-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0296-Slime-Pathfinder-Events.patch
similarity index 97%
rename from Spigot-Server-Patches/0297-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0296-Slime-Pathfinder-Events.patch
index ead1876532..cc4db754d2 100644
--- a/Spigot-Server-Patches/0297-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0296-Slime-Pathfinder-Events.patch
@@ -1,11 +1,11 @@
-From 1113a6d5a1c81e6041758825fb05bc029c6f6a1e Mon Sep 17 00:00:00 2001
+From fe5d3d514e9b8d8ecbd2802769432e137aef8429 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 8115b1e4e..d720d0fae 100644
+index 8115b1e4ec..d720d0fae1 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -2,6 +2,14 @@ package net.minecraft.server;
@@ -147,10 +147,10 @@ index 8115b1e4e..d720d0fae 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 00fbef360..6c11a5f8a 100644
+index ce6ed6e890..6e9f1b66df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-@@ -32,4 +32,14 @@ public class CraftSlime extends CraftMob implements Slime {
+@@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime {
      public EntityType getType() {
          return EntityType.SLIME;
      }
diff --git a/Spigot-Server-Patches/0298-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0297-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 96%
rename from Spigot-Server-Patches/0298-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0297-Configurable-speed-for-water-flowing-over-lava.patch
index 153a9a1996..78a15d1668 100644
--- a/Spigot-Server-Patches/0298-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0297-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,11 +1,11 @@
-From a1738861691ad2eccd94ca720625d5d9c0c2efa7 Mon Sep 17 00:00:00 2001
+From c7f951d53dc285a184ebd84ddc159e8d4d7ce459 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 2b5402b00..2c27be63e 100644
+index 2b5402b009..2c27be63ea 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -401,6 +401,12 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index 2b5402b00..2c27be63e 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 44e00339f..b4616f259 100644
+index 44e00339f2..b4616f259e 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/0299-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0298-Optimize-RegistryMaterials.patch
similarity index 94%
rename from Spigot-Server-Patches/0299-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0298-Optimize-RegistryMaterials.patch
index 91335bff65..23cc6ee381 100644
--- a/Spigot-Server-Patches/0299-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0298-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From 62c92278b563576a27b238c40e223565f39efeb7 Mon Sep 17 00:00:00 2001
+From c3e15a554560950932feab1f18402818cc3fcaf8 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 f291e05b2..860924f9b 100644
+index f291e05b26..860924f9b0 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/0300-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0299-Add-PhantomPreSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0300-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0299-Add-PhantomPreSpawnEvent.patch
index 60e61cdfc7..58d8535651 100644
--- a/Spigot-Server-Patches/0300-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0299-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From a4256b8bdf6b75d0545db4e1544496229224dea2 Mon Sep 17 00:00:00 2001
+From 3da416722a43f5a94a43cddcb902f30f2b29bc1f 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 e5ed5a3dc..e5d032d02 100644
+index e5ed5a3dcc..e5d032d02b 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 e5ed5a3dc..e5d032d02 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 9f64d81c6..11098cd13 100644
+index 9f64d81c64..11098cd13e 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 9f64d81c6..11098cd13 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 9f9ee9239..2b9731369 100644
+index 9f9ee92390..2b97313694 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/0301-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0300-Add-More-Creeper-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0301-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0300-Add-More-Creeper-API.patch
index 31ad1b63cc..ad76c8fe61 100644
--- a/Spigot-Server-Patches/0301-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0300-Add-More-Creeper-API.patch
@@ -1,11 +1,11 @@
-From 30ec7114a8cb387aee128127e7fd3ef6d3a37791 Mon Sep 17 00:00:00 2001
+From 22a75396ce1cda2d2c0ecf67d7162434431ed05e 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 29569805c..0c2c3c730 100644
+index 29569805cb..0c2c3c7308 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -13,7 +13,7 @@ public class EntityCreeper extends EntityMonster {
@@ -47,10 +47,10 @@ index 29569805c..0c2c3c730 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 2f2abb707..e54664661 100644
+index 796ee9e40d..2d38823c57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-@@ -75,4 +75,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {
+@@ -78,4 +78,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {
      public EntityType getType() {
          return EntityType.CREEPER;
      }
diff --git a/Spigot-Server-Patches/0302-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0301-Inventory-removeItemAnySlot.patch
similarity index 87%
rename from Spigot-Server-Patches/0302-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0301-Inventory-removeItemAnySlot.patch
index 981f4d0dbb..9866470095 100644
--- a/Spigot-Server-Patches/0302-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0301-Inventory-removeItemAnySlot.patch
@@ -1,14 +1,14 @@
-From 44a65351bac4ad22a15c48592f476a6d0898536d Mon Sep 17 00:00:00 2001
+From 6e8e4cc4a23eb58b2f6e536c04485d4b9874d97b 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 3a2b57ae7..fe52f87d3 100644
+index 9fbedcede8..b7e08b55f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -210,10 +210,16 @@ public class CraftInventory implements Inventory {
+@@ -224,10 +224,16 @@ public class CraftInventory implements Inventory {
      }
  
      private int first(ItemStack item, boolean withAmount) {
@@ -26,9 +26,9 @@ index 3a2b57ae7..fe52f87d3 100644
          for (int i = 0; i < inventory.length; i++) {
              if (inventory[i] == null) continue;
  
-@@ -328,6 +334,17 @@ public class CraftInventory implements Inventory {
-     }
+@@ -345,6 +351,17 @@ public class CraftInventory implements Inventory {
  
+     @Override
      public HashMap<Integer, ItemStack> removeItem(ItemStack... items) {
 +        // Paper start
 +        return removeItem(false, items);
@@ -44,7 +44,7 @@ index 3a2b57ae7..fe52f87d3 100644
          Validate.notNull(items, "Items cannot be null");
          HashMap<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
  
-@@ -338,7 +355,10 @@ public class CraftInventory implements Inventory {
+@@ -355,7 +372,10 @@ public class CraftInventory implements Inventory {
              int toDelete = item.getAmount();
  
              while (true) {
diff --git a/Spigot-Server-Patches/0303-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0302-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 84%
rename from Spigot-Server-Patches/0303-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0302-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index b8d5e39838..345a0e0dba 100644
--- a/Spigot-Server-Patches/0303-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0302-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 14359f3288febf452031977b00ddaabb87a29bfb Mon Sep 17 00:00:00 2001
+From 3f0880211dd6f9bf7bc19e34a44d535e26ebd92e 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
@@ -6,11 +6,11 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e336813bd..a6f6046c6 100644
+index 244b087f4e..3393347a1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -454,7 +454,7 @@ public class CraftWorld implements World {
- 
+@@ -472,7 +472,7 @@ public class CraftWorld implements World {
+     @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp( "chunk load"); // Spigot
 -        IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
diff --git a/Spigot-Server-Patches/0304-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0303-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 93%
rename from Spigot-Server-Patches/0304-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0303-Add-ray-tracing-methods-to-LivingEntity.patch
index de928b9c49..258010f9a6 100644
--- a/Spigot-Server-Patches/0304-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0303-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From ce85228f0e2bb0ef8542fe11b64fa5161ab34d1c Mon Sep 17 00:00:00 2001
+From 3c8e8c977b0c2ef612338ddd52872ae7931f4c70 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 8c3be17f7d..f86e7c9d4d 100644
+index f115686f4a..78b7ab59b9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3170,6 +3170,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,24 +33,27 @@ index 8c3be17f7d..f86e7c9d4d 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 412dd172fd..c91f6f5d22 100644
+index 00fae68408..4233ffe654 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -170,6 +170,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -179,6 +179,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return blocks.get(0);
      }
  
 +    // Paper start
++    @Override
 +    public Block getTargetBlock(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
 +        net.minecraft.server.MovingObjectPosition rayTrace = getHandle().getRayTrace(maxDistance, net.minecraft.server.MCUtil.getNMSFluidCollisionOption(fluidMode));
 +        return !(rayTrace instanceof net.minecraft.server.MovingObjectPositionBlock) ? null : org.bukkit.craftbukkit.block.CraftBlock.at(getHandle().world, ((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getBlockPosition());
 +    }
 +
++    @Override
 +    public org.bukkit.block.BlockFace getTargetBlockFace(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
 +        net.minecraft.server.MovingObjectPosition rayTrace = getHandle().getRayTrace(maxDistance, net.minecraft.server.MCUtil.getNMSFluidCollisionOption(fluidMode));
 +        return !(rayTrace instanceof net.minecraft.server.MovingObjectPositionBlock) ? null : net.minecraft.server.MCUtil.toBukkitBlockFace(((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getDirection());
 +    }
 +
++    @Override
 +    public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
 +        net.minecraft.server.MovingObjectPosition rayTrace = getHandle().getRayTrace(maxDistance, net.minecraft.server.MCUtil.getNMSFluidCollisionOption(fluidMode));
 +        return  !(rayTrace instanceof net.minecraft.server.MovingObjectPositionBlock) ? null :
@@ -59,9 +62,9 @@ index 412dd172fd..c91f6f5d22 100644
 +    }
 +    // Paper end
 +
+     @Override
      public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
          return getLineOfSight(transparent, maxDistance, 2);
-     }
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0305-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0304-Expose-attack-cooldown-methods-for-Player.patch
similarity index 90%
rename from Spigot-Server-Patches/0305-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0304-Expose-attack-cooldown-methods-for-Player.patch
index 4db8505b18..68a2911573 100644
--- a/Spigot-Server-Patches/0305-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0304-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From 52b041c2f84f505573c7c5f7d19195ec05b50d94 Mon Sep 17 00:00:00 2001
+From d4a5b7132868d3c664aae2007e096f136069db00 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 f665dc0eb..f17c1c54b 100644
+index f665dc0ebe..f17c1c54bf 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2003,14 +2003,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,10 +27,10 @@ index f665dc0eb..f17c1c54b 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 6ceb02200..d505af188 100644
+index 88398c3320..53d61790c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1907,6 +1907,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1909,6 +1909,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.resourcePackStatus = status;
      }
  
diff --git a/Spigot-Server-Patches/0306-Improve-death-events.patch b/Spigot-Server-Patches/0305-Improve-death-events.patch
similarity index 94%
rename from Spigot-Server-Patches/0306-Improve-death-events.patch
rename to Spigot-Server-Patches/0305-Improve-death-events.patch
index cac5733e00..5205d26f48 100644
--- a/Spigot-Server-Patches/0306-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0305-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 4d2ec687e93a4142a82ac66a97e2f90fee5604d8 Mon Sep 17 00:00:00 2001
+From 15d0b4b256c5e808396fa3e7a22f018386699b16 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -27,10 +27,10 @@ index 20db76abd7..a148cd437c 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 784520342e..ef7f0213b6 100644
+index 9bfc725a2c..b406dc5232 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1460,6 +1460,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1469,6 +1469,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -38,7 +38,7 @@ index 784520342e..ef7f0213b6 100644
      public void a(Entity entity, int i, DamageSource damagesource) {
          if (entity instanceof EntityPlayer) {
              CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
-@@ -2341,6 +2342,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2361,6 +2362,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fallDistance = 0.0F;
      }
  
@@ -61,18 +61,9 @@ index 7031dd0e4c..f6dc96434b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f86e7c9d4d..2ca490eedc 100644
+index 78b7ab59b9..4f7ebe3642 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -77,7 +77,7 @@ public abstract class EntityLiving extends Entity {
-     public float aN;
-     public float aO;
-     public EntityHuman killer;
--    protected int lastDamageByPlayerTime;
-+    public int lastDamageByPlayerTime; // Paper - public
-     protected boolean killed;
-     protected int ticksFarFromPlayer;
-     protected float aT;
 @@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity {
      protected float aV;
      protected float aW;
@@ -225,10 +216,10 @@ index f86e7c9d4d..2ca490eedc 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 634c30d93e..3325151284 100644
+index 870ef557a2..a3f5919fe8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -74,6 +74,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public int ping;
      public boolean viewingCredits;
      private int containerUpdateDelay; // Paper
@@ -239,7 +230,7 @@ index 634c30d93e..3325151284 100644
  
      // CraftBukkit start
      public String displayName;
-@@ -524,6 +528,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -525,6 +529,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          String deathmessage = defaultMessage.getString();
          org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
@@ -255,7 +246,7 @@ index 634c30d93e..3325151284 100644
  
          // SPIGOT-943 - only call if they have an inventory open
          if (this.activeContainer != this.defaultContainer) {
-@@ -677,8 +690,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -678,8 +691,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                          }
                      }
                  }
@@ -303,10 +294,10 @@ 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 d505af1883..5f752784d5 100644
+index 53d61790c5..6a390c1146 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1711,7 +1711,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1713,7 +1713,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void sendHealthUpdate() {
@@ -324,10 +315,10 @@ index d505af1883..5f752784d5 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 50444ed94d..55642b6bd6 100644
+index 23c4b93466..aafd71d65c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -706,9 +706,16 @@ public class CraftEventFactory {
+@@ -720,9 +720,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -344,7 +335,7 @@ index 50444ed94d..55642b6bd6 100644
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -724,8 +731,15 @@ public class CraftEventFactory {
+@@ -738,8 +745,15 @@ public class CraftEventFactory {
          CraftPlayer entity = victim.getBukkitEntity();
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
          event.setKeepInventory(keepInventory);
@@ -360,7 +351,7 @@ index 50444ed94d..55642b6bd6 100644
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -746,6 +760,31 @@ public class CraftEventFactory {
+@@ -760,6 +774,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0307-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0306-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 91%
rename from Spigot-Server-Patches/0307-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0306-Allow-chests-to-be-placed-with-NBT-data.patch
index 8f2a18329b..1559938539 100644
--- a/Spigot-Server-Patches/0307-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0306-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From d137ab38024fc169be984ba55ce7308b71b1c9e0 Mon Sep 17 00:00:00 2001
+From 8c7ec8d719a8d577762f490a48b35eb96f4d7839 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 2d83c9e79..dec589463 100644
+index 2d83c9e79c..dec5894637 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 2d83c9e79..dec589463 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 d606e2e4f..f9f9183da 100644
+index d606e2e4fd..f9f9183daa 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -308,7 +308,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
diff --git a/Spigot-Server-Patches/0308-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0307-Mob-Pathfinding-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0308-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0307-Mob-Pathfinding-API.patch
index b9d190f85c..c3e3f72a59 100644
--- a/Spigot-Server-Patches/0308-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0307-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 7d4f3b57d373db1da0661bd3b78e0a31a6d5d3f5 Mon Sep 17 00:00:00 2001
+From 8f2e9085a36026d92a1ed969d4ed198eb68e7b76 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 000000000..ed3d86ddd
+index 0000000000..ed3d86ddd3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,113 @@
@@ -125,7 +125,7 @@ index 000000000..ed3d86ddd
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 0586597e7..583f2c5ad 100644
+index 0586597e73..583f2c5ada 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,7 +69,7 @@ public abstract class NavigationAbstract {
@@ -172,7 +172,7 @@ index 0586597e7..583f2c5ad 100644
          this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
          this.c = null;
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index d1cb80208..ec6b3a292 100644
+index d1cb802087..ec6b3a292a 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
 @@ -5,11 +5,11 @@ import javax.annotation.Nullable;
@@ -209,7 +209,7 @@ index d1cb80208..ec6b3a292 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 0f6e8c51e..5d445e08a 100644
+index 0f6e8c51e4..5d445e08a8 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;
@@ -226,7 +226,7 @@ index 0f6e8c51e..5d445e08a 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 5bf1cd06f..53c2d154e 100644
+index 5bf1cd06fa..53c2d154ed 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/0309-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0308-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 97%
rename from Spigot-Server-Patches/0309-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0308-Prevent-chunk-loading-from-Fluid-Flowing.patch
index df524b3af9..41ba5d97f8 100644
--- a/Spigot-Server-Patches/0309-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0308-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From fb75e4cd5ba71bce95f55fa8dd92cc4daac2a5e3 Mon Sep 17 00:00:00 2001
+From 9ff0339e6bfb0455d7a943f26a148dd1f390cbea 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 c76fa0b4b..5f1514360 100644
+index c76fa0b4bf..5f15143603 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/0310-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0309-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 90%
rename from Spigot-Server-Patches/0310-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0309-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index d38e7d1673..d736d83d02 100644
--- a/Spigot-Server-Patches/0310-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0309-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,11 +1,11 @@
-From f3dcf97ec318940d16723ec6476c99c25cccc900 Mon Sep 17 00:00:00 2001
+From 0ec43fbb6597d1650482d20e25cdff0a3f7cd287 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/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
-index 3a215dea4..ea93452e6 100644
+index 3a215dea43..ea93452e6d 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
 @@ -43,7 +43,7 @@ public class ArgumentBlock {
@@ -32,10 +32,10 @@ index 3a215dea4..ea93452e6 100644
          this.s = this::l;
          if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 9435136cc..9ced2abbb 100644
+index 159037fc3e..9dcf2d20f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -83,6 +83,12 @@ import org.bukkit.inventory.meta.tags.CustomItemTagContainer;
+@@ -86,6 +86,12 @@ import org.bukkit.persistence.PersistentDataContainer;
  import static org.spigotmc.ValidateUtils.*;
  // Spigot end
  
@@ -48,7 +48,7 @@ index 9435136cc..9ced2abbb 100644
  /**
   * Children must include the following:
   *
-@@ -261,6 +267,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -266,6 +272,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      @Specific(Specific.To.NBT)
      static final ItemMetaKey BLOCK_DATA = new ItemMetaKey("BlockStateTag");
      static final ItemMetaKey BUKKIT_CUSTOM_TAG = new ItemMetaKey("PublicBukkitValues");
@@ -59,7 +59,7 @@ index 9435136cc..9ced2abbb 100644
  
      private IChatBaseComponent displayName;
      private IChatBaseComponent locName;
-@@ -273,6 +283,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -278,6 +288,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      private int hideFlag;
      private boolean unbreakable;
      private int damage;
@@ -69,8 +69,8 @@ index 9435136cc..9ced2abbb 100644
 +    // Paper end
  
      private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
-     private static final CraftCustomTagTypeRegistry TAG_TYPE_REGISTRY = new CraftCustomTagTypeRegistry();
-@@ -310,6 +324,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+     private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
+@@ -315,6 +329,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          this.hideFlag = meta.hideFlag;
          this.unbreakable = meta.unbreakable;
          this.damage = meta.damage;
@@ -84,10 +84,10 @@ index 9435136cc..9ced2abbb 100644
 +        }
 +        // Paper end
          this.unhandledTags.putAll(meta.unhandledTags);
-         this.publicItemTagContainer.putAll(meta.publicItemTagContainer.getRaw());
+         this.persistentDataContainer.putAll(meta.persistentDataContainer.getRaw());
  
-@@ -386,6 +409,31 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                 publicItemTagContainer.put(key, compound.get(key));
+@@ -391,6 +414,31 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+                 persistentDataContainer.put(key, compound.get(key));
              }
          }
 +        // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
@@ -118,7 +118,7 @@ index 9435136cc..9ced2abbb 100644
  
          Set<String> keys = tag.getKeys();
          for (String key : keys) {
-@@ -523,6 +571,34 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -528,6 +576,34 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              setDamage(damage);
          }
  
@@ -153,7 +153,7 @@ index 9435136cc..9ced2abbb 100644
          String internal = SerializableMeta.getString(map, "internal", true);
          if (internal != null) {
              ByteArrayInputStream buf = new ByteArrayInputStream(Base64.decodeBase64(internal));
-@@ -651,6 +727,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -656,6 +732,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          if (hasDamage()) {
              itemTag.setInt(DAMAGE.NBT, damage);
          }
@@ -177,7 +177,7 @@ index 9435136cc..9ced2abbb 100644
  
          for (Map.Entry<String, NBTBase> e : unhandledTags.entrySet()) {
              itemTag.set(e.getKey(), e.getValue());
-@@ -667,6 +760,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -672,6 +765,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -199,16 +199,16 @@ index 9435136cc..9ced2abbb 100644
      static NBTTagList createStringList(List<IChatBaseComponent> list) {
          if (list == null || list.isEmpty()) {
              return null;
-@@ -749,7 +857,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -754,7 +862,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Overridden
      boolean isEmpty() {
--        return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasCustomModelData() || hasBlockData() || hasRepairCost() || !unhandledTags.isEmpty() || !publicItemTagContainer.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers());
-+        return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasCustomModelData() || hasBlockData() || hasRepairCost() || !unhandledTags.isEmpty() || !publicItemTagContainer.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers() || hasPlaceableKeys() || hasDestroyableKeys()); // Paper - Implement an API for CanPlaceOn and CanDestroy NBT values
+-        return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasCustomModelData() || hasBlockData() || hasRepairCost() || !unhandledTags.isEmpty() || !persistentDataContainer.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers());
++        return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasCustomModelData() || hasBlockData() || hasRepairCost() || !unhandledTags.isEmpty() || !persistentDataContainer.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers() || hasPlaceableKeys() || hasDestroyableKeys()); // Paper - Implement an API for CanPlaceOn and CanDestroy NBT values
      }
  
-     public String getDisplayName() {
-@@ -1125,7 +1233,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+     @Override
+@@ -1151,7 +1259,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  && (this.hideFlag == that.hideFlag)
                  && (this.isUnbreakable() == that.isUnbreakable())
                  && (this.hasDamage() ? that.hasDamage() && this.damage == that.damage : !that.hasDamage())
@@ -221,7 +221,7 @@ index 9435136cc..9ced2abbb 100644
      }
  
      /**
-@@ -1160,6 +1272,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1186,6 +1298,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          hash = 61 * hash + (hasDamage() ? this.damage : 0);
          hash = 61 * hash + (hasAttributeModifiers() ? this.attributeModifiers.hashCode() : 0);
          hash = 61 * hash + version;
@@ -232,7 +232,7 @@ index 9435136cc..9ced2abbb 100644
          return hash;
      }
  
-@@ -1183,6 +1299,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1209,6 +1325,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              clone.unbreakable = this.unbreakable;
              clone.damage = this.damage;
              clone.version = this.version;
@@ -247,7 +247,7 @@ index 9435136cc..9ced2abbb 100644
              return clone;
          } catch (CloneNotSupportedException e) {
              throw new Error(e);
-@@ -1239,6 +1363,24 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1266,6 +1390,24 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              builder.put(DAMAGE.BUKKIT, damage);
          }
  
@@ -272,7 +272,7 @@ index 9435136cc..9ced2abbb 100644
          final Map<String, NBTBase> internalTags = new HashMap<String, NBTBase>(unhandledTags);
          serializeInternal(internalTags);
          if (!internalTags.isEmpty()) {
-@@ -1399,7 +1541,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1428,7 +1570,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                          CraftMetaArmorStand.NO_BASE_PLATE.NBT,
                          CraftMetaArmorStand.SHOW_ARMS.NBT,
                          CraftMetaArmorStand.SMALL.NBT,
@@ -283,7 +283,7 @@ index 9435136cc..9ced2abbb 100644
                          // Paper end
                  ));
              }
-@@ -1446,4 +1590,147 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1475,4 +1619,147 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return spigot;
      }
      // Spigot end
diff --git a/Spigot-Server-Patches/0311-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0310-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0311-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0310-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 2ae2bab676..e980fba819 100644
--- a/Spigot-Server-Patches/0311-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0310-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,4 +1,4 @@
-From 7f681a45cc0fadfba6ffc57b3130fd4bd4d11475 Mon Sep 17 00:00:00 2001
+From 995b2e22adbabdca35486f446fde38c87b21b975 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/Spigot-Server-Patches/0312-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0311-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0312-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0311-Prevent-mob-spawning-from-loading-generating-chunks.patch
index e66deb9279..19cac7356b 100644
--- a/Spigot-Server-Patches/0312-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0311-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 8501c67f7e74dbed972e7f0219a545e6651d9509 Mon Sep 17 00:00:00 2001
+From 5c669194f17f0493b20d717574ec42f8bcade315 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 e5695c760..696293132 100644
+index e5695c7604..6962931327 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/0313-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0312-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from Spigot-Server-Patches/0313-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0312-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 1c7f7d3699..319776151a 100644
--- a/Spigot-Server-Patches/0313-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0312-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 1140ca688cc8290a2019ce551b33f13406876102 Mon Sep 17 00:00:00 2001
+From a60afe4118bd4d7edbc0e6874aed7a411075e5e5 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 9a839d654..72eb669c5 100644
+index 9a839d6540..72eb669c50 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/0314-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0313-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0314-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0313-Implement-furnace-cook-speed-multiplier-API.patch
index bea7d33178..73bde557d6 100644
--- a/Spigot-Server-Patches/0314-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0313-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From f3bbdb4728c9e9042924d0de04503b83514dc1da Mon Sep 17 00:00:00 2001
+From 0540d8d3381619e35ab874c57db5f6b136a8b01b 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 be16fe9a9..b9f3a952e 100644
+index be16fe9a9e..b9f3a952e8 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 be16fe9a9..b9f3a952e 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 9cc67915c..1ce10ea04 100644
+index 9cc67915ca..1ce10ea049 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/0315-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0314-Support-Overriding-World-Seeds.patch
similarity index 91%
rename from Spigot-Server-Patches/0315-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0314-Support-Overriding-World-Seeds.patch
index 787ee7e14f..dc4215fdae 100644
--- a/Spigot-Server-Patches/0315-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0314-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From bf647b1da689c8a5771ff0a90a1c32df5786f8a5 Mon Sep 17 00:00:00 2001
+From 3118c4cf649446a48c210c0ca63633411951c87f 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 8062054ab..e1bbe142b 100644
+index 8062054abe..e1bbe142b0 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,10 +59,10 @@ index 8062054ab..e1bbe142b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0cebf6f5a..27af4398c 100644
+index e5d96bf750..f04d0530f5 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
+@@ -363,7 +363,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.convertWorld(name); // Run conversion now
  
              org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name);
@@ -72,7 +72,7 @@ index 0cebf6f5a..27af4398c 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 c69a32477..43a557eb4 100644
+index a794f040e5..ad78f28c42 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -116,7 +116,7 @@ public class WorldData {
@@ -85,12 +85,12 @@ index c69a32477..43a557eb4 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 7b204d584..cf657167d 100644
+index 985faf8e90..0d0d056cff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -983,7 +983,7 @@ public final class CraftServer implements Server {
-         WorldData worlddata = sdm.getWorldData();
-         WorldSettings worldSettings = null;
+@@ -984,7 +984,7 @@ public final class CraftServer implements Server {
+         WorldSettings worldSettings;
+         // See MinecraftServer.a(String, String, long, WorldType, JsonElement)
          if (worlddata == null) {
 -            worldSettings = new WorldSettings(creator.seed(), EnumGamemode.getById(getDefaultGameMode().getValue()), generateStructures, hardcore, type);
 +            worldSettings = new WorldSettings(com.destroystokyo.paper.PaperConfig.seedOverride.getOrDefault(name, creator.seed()), EnumGamemode.getById(getDefaultGameMode().getValue()), generateStructures, hardcore, type); // Paper
diff --git a/Spigot-Server-Patches/0316-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0315-Optimize-Server-World-Map.patch
similarity index 93%
rename from Spigot-Server-Patches/0316-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0315-Optimize-Server-World-Map.patch
index 221e2071fc..5c2af9f4ef 100644
--- a/Spigot-Server-Patches/0316-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0315-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 1a29717bd155df28147f7ac0406e490cef450fe6 Mon Sep 17 00:00:00 2001
+From aa2876d619e0b783f9821fbcbbf36c6ad968f3ed 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 000000000..af9e4455c
+index 0000000000..af9e4455c6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +1,191 @@
@@ -217,7 +217,7 @@ index 000000000..af9e4455c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 27af4398c..e6054dddb 100644
+index f04d0530f5..6c12240292 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
@@ -229,23 +229,23 @@ index 27af4398c..e6054dddb 100644
      private PlayerList playerList;
      private volatile boolean isRunning = true;
      private volatile boolean isRestarting = false; // Paper - flag to signify we're attempting to restart
-@@ -442,7 +442,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -443,7 +443,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              }
          }
          this.a(this.getDifficulty(), true);
 -        for (WorldServer worldserver : this.getWorlds()) {
 +        for (WorldServer worldserver : com.google.common.collect.Lists.newArrayList(this.getWorlds())) { // Paper - avoid como if 1 world triggers another world
              this.loadSpawn(worldserver.getChunkProvider().playerChunkMap.worldLoadListener, worldserver);
+             this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
- 
-@@ -582,7 +582,6 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         this.sleepForTick();
-         // CraftBukkit start
+@@ -591,7 +591,6 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+         // this.nextTick += 100L;
+         this.executeModerately();
          // Iterator iterator = DimensionManager.a().iterator();
 -
          if (true) {
              DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
-             // CraftBukkit end
+             ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks");
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0317-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0316-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0317-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0316-PreSpawnerSpawnEvent.patch
index 86b7b27743..5e16f16ac9 100644
--- a/Spigot-Server-Patches/0317-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0316-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From e0ee892fc74c4b2d4cfb5c5b4210fd886f6f43a4 Mon Sep 17 00:00:00 2001
+From 3e17e7cf08ae72ecb2f2f7a2cd72186188c71bb6 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 bca0e3a2e..96080b6c7 100644
+index bca0e3a2e2..96080b6c73 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -108,11 +108,11 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0318-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0317-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 93%
rename from Spigot-Server-Patches/0318-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0317-Catch-JsonParseException-in-Entity-and-TE-names.patch
index c2d25e97eb..d6566d3c35 100644
--- a/Spigot-Server-Patches/0318-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0317-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From 248b955d09eb8538778eeca3fea048b66cb5a272 Mon Sep 17 00:00:00 2001
+From 165bf7b900c559ab01d80ea169e175e417093290 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 4b7aefb7a..9e568d5d1 100644
+index 4b7aefb7a7..9e568d5d15 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 4b7aefb7a..9e568d5d1 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 ef7f0213b..b4fd3f0dc 100644
+index b406dc5232..c85cbe2af8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1639,7 +1639,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1653,7 +1653,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 ef7f0213b..b4fd3f0dc 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 0ef5ad116..f70f5899f 100644
+index d2019fb74c..8cf2602828 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 0ef5ad116..f70f5899f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 1f26d8a02..12264c4d0 100644
+index 1f26d8a022..12264c4d03 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 1f26d8a02..12264c4d0 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 3590b4e31..ea7d5a430 100644
+index 3590b4e317..ea7d5a430a 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/0319-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0318-Avoid-dimension-id-collisions.patch
similarity index 91%
rename from Spigot-Server-Patches/0319-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0318-Avoid-dimension-id-collisions.patch
index 93fe572571..bcb822b0fc 100644
--- a/Spigot-Server-Patches/0319-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0318-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 9da36883e7b0f7773037d03e6d88a7bdd48077de Mon Sep 17 00:00:00 2001
+From 153b5016a2198566e64fa7ee72e2b1dd557d020e 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 cf657167d..15756014a 100644
+index 0d0d056cff..1eb60b54b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -970,7 +970,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0320-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0319-Honor-EntityAgeable.ageLock.patch
similarity index 86%
rename from Spigot-Server-Patches/0320-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0319-Honor-EntityAgeable.ageLock.patch
index 248941a69f..6113ff996e 100644
--- a/Spigot-Server-Patches/0320-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0319-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From f854ee1020f64f5ff8421345164f046ae34515f7 Mon Sep 17 00:00:00 2001
+From d7a4c18a4e730e71f85846a7d53d3674c0b71f50 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 da9740a99..e87754ef3 100644
+index da9740a99e..e87754ef33 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/0321-Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/0320-Ignore-Dimension-NBT-field-in-Entity-data.patch
similarity index 88%
rename from Spigot-Server-Patches/0321-Ignore-Dimension-NBT-field-in-Entity-data.patch
rename to Spigot-Server-Patches/0320-Ignore-Dimension-NBT-field-in-Entity-data.patch
index cdb635f5c1..4aa6fedac9 100644
--- a/Spigot-Server-Patches/0321-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0320-Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -1,4 +1,4 @@
-From e30eb9d3a23f88e29d5b333c8d40e1b33af49a04 Mon Sep 17 00:00:00 2001
+From 3ae1dc7b8e3d26ec9aee3c24b1345eda01e6a14c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
@@ -14,10 +14,10 @@ DimensionManager set to the world it is being placed into.
 This fixes corrupt entities breaking chunk saving in custom worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b4fd3f0dc..57bc805cf 100644
+index c85cbe2af8..af26b4bffb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1624,7 +1624,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1638,7 +1638,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.setAirTicks(nbttagcompound.getShort("Air"));
              this.onGround = nbttagcompound.getBoolean("OnGround");
              if (nbttagcompound.hasKey("Dimension")) {
diff --git a/Spigot-Server-Patches/0322-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0321-Don-t-recheck-type-after-setting-a-block.patch
similarity index 92%
rename from Spigot-Server-Patches/0322-Don-t-recheck-type-after-setting-a-block.patch
rename to Spigot-Server-Patches/0321-Don-t-recheck-type-after-setting-a-block.patch
index 782aebe869..a6ac3439c1 100644
--- a/Spigot-Server-Patches/0322-Don-t-recheck-type-after-setting-a-block.patch
+++ b/Spigot-Server-Patches/0321-Don-t-recheck-type-after-setting-a-block.patch
@@ -1,4 +1,4 @@
-From 9ef48356f0243ca78e894883868a0d1110109814 Mon Sep 17 00:00:00 2001
+From 412513806cb6e6a36fdabcaef9f4d70e5db3d80b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 22:27:33 -0400
 Subject: [PATCH] Don't recheck type after setting a block
@@ -16,7 +16,7 @@ be having data corruption issues anyways.
 This provides a small boost to all setType calls.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 21fae98c1..98ca253bd 100644
+index 21fae98c10..98ca253bda 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -361,7 +361,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0323-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0322-Configurable-connection-throttle-kick-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0323-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0322-Configurable-connection-throttle-kick-message.patch
index 495ed0ded7..64fe470c2c 100644
--- a/Spigot-Server-Patches/0323-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0322-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From fb74e56df96985f7cfcac041d469ed6b5e772802 Mon Sep 17 00:00:00 2001
+From 47fa74532d3d36f7b2f74751de87242409ea2630 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 e1bbe142b..6a2eb12ba 100644
+index e1bbe142b0..6a2eb12bae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -272,6 +272,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index e1bbe142b..6a2eb12ba 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 da88978db..1dad79620 100644
+index da88978db7..1dad796206 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/0324-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0323-Hook-into-CB-plugin-rewrites.patch
similarity index 98%
rename from Spigot-Server-Patches/0324-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0323-Hook-into-CB-plugin-rewrites.patch
index db4dfedca8..467e2f529e 100644
--- a/Spigot-Server-Patches/0324-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0323-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 207fd4ba0653034af93915c508e005146da412d8 Mon Sep 17 00:00:00 2001
+From a40845d2056dc19c755700b856c7f18ec843d829 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 467b2d938..61f102355 100644
+index 467b2d9385..61f1023557 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/0325-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0324-Allow-setting-the-vex-s-summoner.patch
similarity index 90%
rename from Spigot-Server-Patches/0325-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0324-Allow-setting-the-vex-s-summoner.patch
index d7f6f89883..0aaa08538b 100644
--- a/Spigot-Server-Patches/0325-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0324-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From e634e12cf18446167d0fea0dca47a6e8454149b5 Mon Sep 17 00:00:00 2001
+From 7f07cbbf0ecb65b67ebb8e1f00f569aeb1d33807 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 83e022c91..c56933068 100644
+index 83e022c91b..c569330689 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 83e022c91..c56933068 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 169c951ec..2f7df3074 100644
+index 169c951ec3..2f7df3074f 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/0326-Add-sun-related-API.patch b/Spigot-Server-Patches/0325-Add-sun-related-API.patch
similarity index 88%
rename from Spigot-Server-Patches/0326-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0325-Add-sun-related-API.patch
index 4651205532..9b7ba6d8d1 100644
--- a/Spigot-Server-Patches/0326-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0325-Add-sun-related-API.patch
@@ -1,4 +1,4 @@
-From ee3e637cb9b74bef591aa8a4f237b3d4ba070bc2 Mon Sep 17 00:00:00 2001
+From b5b78d51120653d19df7753eb9bbf3bed2eceeee 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
@@ -29,32 +29,34 @@ index bebf5a6e19..136727c280 100644
          return this.d < 4;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a6f6046c6e..5e672ae2e4 100644
+index 3393347a1f..016ed471bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -699,6 +699,12 @@ public class CraftWorld implements World {
+@@ -734,6 +734,13 @@ public class CraftWorld implements World {
          }
      }
  
 +    // Paper start
++    @Override
 +    public boolean isDayTime() {
 +        return getHandle().isDayTime();
 +    }
 +    // Paper end
 +
+     @Override
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
-     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154ed..40a429942e 100644
+index 53c2d154ed..56c233872b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -68,4 +68,10 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
+@@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
      public long getSeed() {
          return getHandle().lootTableSeed;
      }
 +
 +    // Paper start
++    @Override
 +    public boolean isInDaylight() {
 +        return getHandle().isInDaylight();
 +    }
diff --git a/Spigot-Server-Patches/0327-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0326-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 93%
rename from Spigot-Server-Patches/0327-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0326-Check-Drowned-for-Villager-Aggression-Config.patch
index cc7c0e205f..8963cdce1c 100644
--- a/Spigot-Server-Patches/0327-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0326-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,11 +1,11 @@
-From b273ab1cacc5e16fe3018d2fd7f03472e47aad87 Mon Sep 17 00:00:00 2001
+From a658ab3ec9a81df868f7045a06ff30ddaca85079 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 10957c877..449fbee60 100644
+index 10957c8778..449fbee60f 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/0328-Here-s-Johnny.patch b/Spigot-Server-Patches/0327-Here-s-Johnny.patch
similarity index 92%
rename from Spigot-Server-Patches/0328-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0327-Here-s-Johnny.patch
index 43ffd573a9..7cdfe78c30 100644
--- a/Spigot-Server-Patches/0328-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0327-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 7f5c9f90530b54d5c0d40e8cc04fbf093d148d38 Mon Sep 17 00:00:00 2001
+From a267b66190a872c833e4c3a3472df0e9be69490d 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 45370ad5d..6b7712ec9 100644
+index b566e77869..106e7c5f56 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 45370ad5d..6b7712ec9 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 951d47929..5ff957ced 100644
+index 951d479298..5ff957ced7 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/0329-Turtle-API.patch b/Spigot-Server-Patches/0328-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0329-Turtle-API.patch
rename to Spigot-Server-Patches/0328-Turtle-API.patch
index 6c7212c077..5ca38d9cc1 100644
--- a/Spigot-Server-Patches/0329-Turtle-API.patch
+++ b/Spigot-Server-Patches/0328-Turtle-API.patch
@@ -1,11 +1,11 @@
-From 879fdf1d02a1a264a30f2e64493132cc94244fe6 Mon Sep 17 00:00:00 2001
+From a51ed1f531b83e655b0bcba4a2a1ed26a65ea39d 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 1b4933c07..b7929c5c4 100644
+index 1b4933c077..b7929c5c46 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -104,7 +104,7 @@ index 1b4933c07..b7929c5c4 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 123a2c75c..8edcf7af6 100644
+index 123a2c75ca..8edcf7af65 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/0330-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0329-Limit-lightning-strike-effect-distance.patch
similarity index 96%
rename from Spigot-Server-Patches/0330-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0329-Limit-lightning-strike-effect-distance.patch
index 7c5505b56f..9ea42292ef 100644
--- a/Spigot-Server-Patches/0330-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0329-Limit-lightning-strike-effect-distance.patch
@@ -1,4 +1,4 @@
-From 1af98558db80ae6bb1362e8f8446bff29736d4fd Mon Sep 17 00:00:00 2001
+From 4372354a6b40fe4e47682a1f4975a2fa335f7257 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
@@ -69,10 +69,10 @@ index adf68d1650..fbcda86b38 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1c1a847e4f..ef706f66e4 100644
+index 281b11f010..e60fc0d585 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 {
+@@ -1189,7 +1189,7 @@ public class WorldServer extends World {
          }
          // CraftBukkit end
          this.globalEntityList.add(entitylightning);
diff --git a/Spigot-Server-Patches/0331-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0330-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 94%
rename from Spigot-Server-Patches/0331-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0330-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index dffcbe8ec0..665dcf2d52 100644
--- a/Spigot-Server-Patches/0331-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0330-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From c966d1ff3fc64dbd44db9bbc6280fddc32a4971a Mon Sep 17 00:00:00 2001
+From 43fb23d86ba0eb613e10e15816af1b2abe597f67 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 c19828ed5..7deeaa083 100644
+index c19828ed56..7deeaa0834 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/0332-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0331-Call-player-spectator-target-events.patch
similarity index 93%
rename from Spigot-Server-Patches/0332-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0331-Call-player-spectator-target-events.patch
index a1280fddab..9a228dd224 100644
--- a/Spigot-Server-Patches/0332-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0331-Call-player-spectator-target-events.patch
@@ -1,14 +1,14 @@
-From e872f0f3b89447e464a32a3c6ade495d9bb38198 Mon Sep 17 00:00:00 2001
+From 3adc6542b773cb335338939d4517c7b63d283d92 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 be4df69e72..36084a87c8 100644
+index a3f5919fe8..9756109038 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -59,7 +59,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      private EnumChatVisibility ck;
      private boolean cl = true;
      private long cm = SystemUtils.getMonotonicMillis();
@@ -17,7 +17,7 @@ index be4df69e72..36084a87c8 100644
      public boolean worldChangeInvuln;
      private boolean cp; private void setHasSeenCredits(boolean has) { this.cp = has; } // Paper - OBFHELPER
      private final RecipeBookServer recipeBook;
-@@ -1548,15 +1548,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1566,15 +1566,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity);
      }
  
diff --git a/Spigot-Server-Patches/0333-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0332-Add-Velocity-IP-Forwarding-Support.patch
similarity index 97%
rename from Spigot-Server-Patches/0333-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0332-Add-Velocity-IP-Forwarding-Support.patch
index 7f26d32d03..8d93e4569f 100644
--- a/Spigot-Server-Patches/0333-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0332-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From 92c879398427489da077ff8c40ac1a0628e5b947 Mon Sep 17 00:00:00 2001
+From 439f43ee1ba0c30624f3368ae6573e4103e06cec 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 6a2eb12ba..ee282cb35 100644
+index 6a2eb12bae..ee282cb35c 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 6a2eb12ba..ee282cb35 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 000000000..fdd8708f9
+index 0000000000..fdd8708f97
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -127,7 +127,7 @@ index 000000000..fdd8708f9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index d4d752ddb..5d46a975e 100644
+index d4d752ddb4..5d46a975e3 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 d4d752ddb..5d46a975e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 6c5544807..38386d588 100644
+index 6c55448078..38386d5886 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 6c5544807..38386d588 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 fa2d3ce8c..dac560c63 100644
+index fa2d3ce8cb..dac560c63f 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 fa2d3ce8c..dac560c63 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 4d1f44139..c1ca6f950 100644
+index 4d1f441395..c1ca6f9501 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 4d1f44139..c1ca6f950 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index ae74dc9e1..7eb230f1b 100644
+index ae74dc9e18..7eb230f1b2 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
diff --git a/Spigot-Server-Patches/0334-Add-more-Witch-API.patch b/Spigot-Server-Patches/0333-Add-more-Witch-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0334-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0333-Add-more-Witch-API.patch
index 973447b285..c60803a135 100644
--- a/Spigot-Server-Patches/0334-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0333-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From cccc6bd2b7e841f7b834f73cfb56baee1fc143db Mon Sep 17 00:00:00 2001
+From de63395f1f3c11be3c9c2474811a6e3d4976ec31 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 ae9efb72c..3cbb34a0c 100644
+index ae9efb72c1..3cbb34a0ce 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 ae9efb72c..3cbb34a0c 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 49e0f2206..d157d195d 100644
+index bae107e76e..b43a2bbd5b 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 @@
@@ -120,7 +120,7 @@ index 49e0f2206..d157d195d 100644
      public CraftWitch(CraftServer server, EntityWitch entity) {
          super(server, entity);
      }
-@@ -24,4 +30,23 @@ public class CraftWitch extends CraftRaider implements Witch, CraftRangedEntity<
+@@ -25,4 +31,23 @@ public class CraftWitch extends CraftRaider implements Witch, CraftRangedEntity<
      public EntityType getType() {
          return EntityType.WITCH;
      }
diff --git a/Spigot-Server-Patches/0335-Fix-MC-93764.patch b/Spigot-Server-Patches/0334-Fix-MC-93764.patch
similarity index 86%
rename from Spigot-Server-Patches/0335-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0334-Fix-MC-93764.patch
index 93d6d0ff20..203272820f 100644
--- a/Spigot-Server-Patches/0335-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0334-Fix-MC-93764.patch
@@ -1,11 +1,11 @@
-From a352d17e29b7cbf6504af209a19d50056aae1c59 Mon Sep 17 00:00:00 2001
+From aedfff84f881068ca6b450ffb2bca37b4d6ed776 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 c25be1642..b323df98e 100644
+index c25be16423..b323df98e5 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/0336-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0335-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 92%
rename from Spigot-Server-Patches/0336-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0335-Add-option-to-prevent-players-from-moving-into-unloa.patch
index c9c45882c7..3fa297c883 100644
--- a/Spigot-Server-Patches/0336-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0335-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From aa5ca3c61f40bcade5ce13c3312c921dc374e0cb Mon Sep 17 00:00:00 2001
+From 6f34ebdd0dda7090edb962cf3d8951758d97999b 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 fb44fccc9..ad793ffa3 100644
+index fb44fccc92..ad793ffa38 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -434,4 +434,9 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index fb44fccc9..ad793ffa3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e59037211..16a7aba49 100644
+index bc04400484..b0fe05c26b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -348,6 +348,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -346,6 +346,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
                  speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
  
@@ -37,7 +37,7 @@ index e59037211..16a7aba49 100644
                  if (d10 - d9 > Math.max(100.0D, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isExemptPlayer()) {
                  // CraftBukkit end
                      PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), d6, d7, d8);
-@@ -889,9 +896,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -888,9 +895,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
                          double d1 = this.player.locY;
                          double d2 = this.player.locZ;
                          double d3 = this.player.locY;
@@ -49,7 +49,7 @@ index e59037211..16a7aba49 100644
                          float f = packetplayinflying.a(this.player.yaw);
                          float f1 = packetplayinflying.b(this.player.pitch);
                          double d7 = d4 - this.l;
-@@ -931,6 +938,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -930,6 +937,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                  speed = player.abilities.walkSpeed * 10f;
                              }
  
diff --git a/Spigot-Server-Patches/0337-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0336-Reset-players-airTicks-on-respawn.patch
similarity index 79%
rename from Spigot-Server-Patches/0337-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0336-Reset-players-airTicks-on-respawn.patch
index 4dace72db5..e561f4031c 100644
--- a/Spigot-Server-Patches/0337-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0336-Reset-players-airTicks-on-respawn.patch
@@ -1,14 +1,14 @@
-From 229310cfc9da6aa79f9555361e1c41dc60c9bcff Mon Sep 17 00:00:00 2001
+From 77d8f8c9c1b41b5c52323074c3803b580767cc0b 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 2727148801..399b310b1a 100644
+index af26b4bffb..7f4e18c991 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2254,7 +2254,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2274,7 +2274,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -18,10 +18,10 @@ index 2727148801..399b310b1a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 36084a87c8..1d42a69d53 100644
+index 9756109038..14710abe1a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1836,6 +1836,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1854,6 +1854,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.setHealth(this.getMaxHealth());
diff --git a/Spigot-Server-Patches/0338-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0337-Strip-private-area-unicode-characters-from-signs.patch
similarity index 97%
rename from Spigot-Server-Patches/0338-Strip-private-area-unicode-characters-from-signs.patch
rename to Spigot-Server-Patches/0337-Strip-private-area-unicode-characters-from-signs.patch
index 97710c0b93..240b3964d6 100644
--- a/Spigot-Server-Patches/0338-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0337-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From 33d57b2ea7d5b38da914eff9837b7f2e3a276334 Mon Sep 17 00:00:00 2001
+From 710758c98f59d5b99d69a98b5d3a6d3462d6581d 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 9de03a24c..4165c6d11 100644
+index 9de03a24cf..4165c6d11a 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/0339-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0338-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 94%
rename from Spigot-Server-Patches/0339-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0338-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index acd1a2ce29..296ebeae03 100644
--- a/Spigot-Server-Patches/0339-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0338-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 7fb8dc829440e11877869f2e78e8ee843607175a Mon Sep 17 00:00:00 2001
+From d14d577ae1dfbe2dc65b84621acea663c30a7469 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
@@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup
 
 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index 71e48e87b..23f1447cf 100644
+index 71e48e87b4..23f1447cfc 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
diff --git a/Spigot-Server-Patches/0340-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0339-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 92%
rename from Spigot-Server-Patches/0340-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0339-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 9dac8a7926..eea1af674d 100644
--- a/Spigot-Server-Patches/0340-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0339-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,4 +1,4 @@
-From 7c8038f69b3869f7cd7f9746c0e45720ef2164bf Mon Sep 17 00:00:00 2001
+From f11017165079dc57df28219b8d6cf2347e7a140f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
diff --git a/Spigot-Server-Patches/0341-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0340-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
similarity index 94%
rename from Spigot-Server-Patches/0341-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
rename to Spigot-Server-Patches/0340-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index 80c9a79ec9..d1fc5c3697 100644
--- a/Spigot-Server-Patches/0341-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0340-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From fe308dbb2344b42c892c40e55d65bd1aa537ab70 Mon Sep 17 00:00:00 2001
+From c79457837608a93dc4a9977a48002dc2808cd783 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 f692da609..5bc8bd7cd 100644
+index f692da609b..5bc8bd7cdc 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/0342-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0341-Optimize-World-Time-Updates.patch
similarity index 93%
rename from Spigot-Server-Patches/0342-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0341-Optimize-World-Time-Updates.patch
index d22182b3ed..c80fdf0eb9 100644
--- a/Spigot-Server-Patches/0342-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0341-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 2e1e98b95f70b8e125cdfe459d4796dab8b2d950 Mon Sep 17 00:00:00 2001
+From b92130813e027dbbc6b6aa6c07cf477b8a7b9026 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,10 +8,10 @@ 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 e6054dddb..e90cf0629 100644
+index 6c12240292..e612879495 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1101,12 +1101,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1120,12 +1120,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
          // Send time updates to everyone, it will get the right time from the world the player is in.
diff --git a/Spigot-Server-Patches/0343-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0342-Restore-custom-InventoryHolder-support.patch
similarity index 95%
rename from Spigot-Server-Patches/0343-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0342-Restore-custom-InventoryHolder-support.patch
index ffd985d8d5..be17c361af 100644
--- a/Spigot-Server-Patches/0343-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0342-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From 6408115b7e41e63baf5f0a1b72bca3c3fcbd1a6c Mon Sep 17 00:00:00 2001
+From 539dbb6c3beb7e970087c8eab09ba5b692f0cba0 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 9957ed040..ae280dd40 100644
+index 9957ed0402..ae280dd40b 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/0344-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0343-Use-Vanilla-Minecart-Speeds.patch
similarity index 91%
rename from Spigot-Server-Patches/0344-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0343-Use-Vanilla-Minecart-Speeds.patch
index f57abdc006..0d18b7d6e2 100644
--- a/Spigot-Server-Patches/0344-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0343-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From 9800d07ce1ef4276485eed6ba5ed000d67f9058b Mon Sep 17 00:00:00 2001
+From e04348ac3f0f84e0aa0b4f7b0ab2627f1d53179a 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 6fc332dbf..828a8711d 100644
+index 6fc332dbff..828a8711d1 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/0345-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0344-Fix-SpongeAbsortEvent-handling.patch
similarity index 93%
rename from Spigot-Server-Patches/0345-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0344-Fix-SpongeAbsortEvent-handling.patch
index 685fc9a245..76a420588c 100644
--- a/Spigot-Server-Patches/0345-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0344-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From 39f31e8ab75732c18c0be72b744d5bbd902fe932 Mon Sep 17 00:00:00 2001
+From fdd3a46f035dc1a66d6e2d01bbbe1c8afee794af 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 549c50de7..5e6609944 100644
+index 549c50de7d..5e66099443 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -465,7 +465,7 @@ public class Block implements IMaterial {
@@ -19,7 +19,7 @@ index 549c50de7..5e6609944 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 4e281ce6d..6a64af71b 100644
+index 4e281ce6dd..6a64af71b9 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/0346-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0345-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 86%
rename from Spigot-Server-Patches/0346-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0345-Don-t-allow-digging-into-unloaded-chunks.patch
index 6061bfabef..3aa71c8030 100644
--- a/Spigot-Server-Patches/0346-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0345-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,14 +1,14 @@
-From 2df9d2dca8a12ecf11165198feb54e96440157e2 Mon Sep 17 00:00:00 2001
+From a0660a9b6852d52368de4eaf9a42b73bd83684fa 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 16a7aba490..16f302a029 100644
+index b0fe05c26b..e7d3a5479b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1246,6 +1246,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1245,6 +1245,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
          case START_DESTROY_BLOCK:
          case ABORT_DESTROY_BLOCK:
          case STOP_DESTROY_BLOCK:
diff --git a/Spigot-Server-Patches/0347-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0346-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0347-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0346-Optimize-redstone-algorithm.patch
index c0da0f5d3b..3667f2e7d7 100644
--- a/Spigot-Server-Patches/0347-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0346-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From c688f13edec69f837b574ebf99ca0531222cbe93 Mon Sep 17 00:00:00 2001
+From 77b20bd34533d5f2af72bac439ba33a64339e565 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
diff --git a/Spigot-Server-Patches/0348-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0347-force-entity-dismount-during-teleportation.patch
similarity index 92%
rename from Spigot-Server-Patches/0348-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0347-force-entity-dismount-during-teleportation.patch
index c674018af0..d595e3686d 100644
--- a/Spigot-Server-Patches/0348-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0347-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From ac2af12b9a299eac6e3756f2f31491d538da2be8 Mon Sep 17 00:00:00 2001
+From 3bf62b0b605808c72f1bf7f47e5b6a1277813f56 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 0871e185e4..f945a2df48 100644
+index 7f4e18c991..5068511111 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1982,12 +1982,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1996,12 +1996,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -41,7 +41,7 @@ index 0871e185e4..f945a2df48 100644
          }
  
      }
-@@ -2038,7 +2041,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2052,7 +2055,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return true; // CraftBukkit
      }
  
@@ -53,7 +53,7 @@ index 0871e185e4..f945a2df48 100644
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2048,7 +2054,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2062,7 +2068,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 0871e185e4..f945a2df48 100644
                  );
                  Bukkit.getPluginManager().callEvent(event);
                  CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
-@@ -2059,7 +2065,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2073,7 +2079,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
              // Spigot start
@@ -91,7 +91,7 @@ index f17c1c54bf..e811a29175 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2ca490eedc..637141d760 100644
+index 4f7ebe3642..a9d7eea368 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2661,11 +2661,13 @@ public abstract class EntityLiving extends Entity {
@@ -112,10 +112,10 @@ index 2ca490eedc..637141d760 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 c71e4dfbea..71ad35f710 100644
+index 14710abe1a..d23178331e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -981,11 +981,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
      }
  
diff --git a/Spigot-Server-Patches/0349-Book-Size-Limits.patch b/Spigot-Server-Patches/0348-Book-Size-Limits.patch
similarity index 94%
rename from Spigot-Server-Patches/0349-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0348-Book-Size-Limits.patch
index c28ce08584..05a1b8c203 100644
--- a/Spigot-Server-Patches/0349-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0348-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 104054cefe0ffe5a3c723099267c090f39d42589 Mon Sep 17 00:00:00 2001
+From d1fb0018d8f42deb5b4a6f5ee596d121c5a1b8cf 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 ee282cb35..3d6101c4d 100644
+index ee282cb35c..3d6101c4db 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -372,4 +372,11 @@ public class PaperConfig {
@@ -22,7 +22,7 @@ index ee282cb35..3d6101c4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8d2b02894..15fb7ed60 100644
+index e7d3a5479b..6096f309bc 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;
@@ -33,7 +33,7 @@ index 8d2b02894..15fb7ed60 100644
  import org.apache.commons.lang3.StringUtils;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
-@@ -784,6 +785,42 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -783,6 +784,42 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInBEdit packetplayinbedit) {
diff --git a/Spigot-Server-Patches/0350-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0349-Make-the-default-permission-message-configurable.patch
similarity index 91%
rename from Spigot-Server-Patches/0350-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0349-Make-the-default-permission-message-configurable.patch
index ad9beb3c5f..63630e06dd 100644
--- a/Spigot-Server-Patches/0350-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0349-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From 8c8dbe613903b931880b53f484a8c2289bfb103f Mon Sep 17 00:00:00 2001
+From 9d75c3fda84b6fb4063b721d83e9da033007aff0 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 3d6101c4d..010d2a796 100644
+index 3d6101c4db..010d2a7961 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,10 +29,10 @@ index 3d6101c4d..010d2a796 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 15756014a..b05d7b0e8 100644
+index 1eb60b54b5..3fe37b3306 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2118,6 +2118,11 @@ public final class CraftServer implements Server {
+@@ -2122,6 +2122,11 @@ public final class CraftServer implements Server {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
  
diff --git a/Spigot-Server-Patches/0351-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0350-Add-more-Zombie-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0351-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0350-Add-more-Zombie-API.patch
index 08951216f8..7af68d1254 100644
--- a/Spigot-Server-Patches/0351-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0350-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 57c0ebf3ae124517042d272472fa6dde98d028c9 Mon Sep 17 00:00:00 2001
+From e5d7ff2ae47f20f992283f0f5c0a19efeee46944 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/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 92d1cd851..f8baaea03 100644
+index 2f0fab469b..dea1d2d4d2 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 {
@@ -79,10 +79,10 @@ index 92d1cd851..f8baaea03 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 c28ccd0d9..442befba8 100644
+index 0429cf020e..23041bd07b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-@@ -76,4 +76,26 @@ public class CraftZombie extends CraftMonster implements Zombie {
+@@ -80,4 +80,26 @@ public class CraftZombie extends CraftMonster implements Zombie {
              getHandle().startDrownedConversion(time);
          }
      }
diff --git a/Spigot-Server-Patches/0352-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0351-Prevent-rayTrace-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0352-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0351-Prevent-rayTrace-from-loading-chunks.patch
index 2ed8389829..34ee8bf377 100644
--- a/Spigot-Server-Patches/0352-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0351-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 67b1db61cc5bea13be0f5213aea5433dfbab958b Mon Sep 17 00:00:00 2001
+From 665d6fa6419fbe4df9cd3ff13a3eff4ea5ab815e 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
diff --git a/Spigot-Server-Patches/0353-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0352-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from Spigot-Server-Patches/0353-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0352-Handle-Large-Packets-disconnecting-client.patch
index 7f12c84f3b..1162a5d596 100644
--- a/Spigot-Server-Patches/0353-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0352-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From b04ba74419a14965aeb44f1762ee3a39ac70fdfa Mon Sep 17 00:00:00 2001
+From b33b43bb7ec8a77fd9a8a799b9eaed8fedbdb891 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
diff --git a/Spigot-Server-Patches/0354-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0353-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 90%
rename from Spigot-Server-Patches/0354-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0353-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 3429a4f3eb..7927aedace 100644
--- a/Spigot-Server-Patches/0354-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0353-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From a12c2a8d4e4888be3310169ad4332ec182f89868 Mon Sep 17 00:00:00 2001
+From 4c3684cafaafe3790c9823fa9b5c1452c0e90486 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 24b06a0b7e..294f3de00c 100644
+index 6a448c02ec..c1ef1c950d 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;
@@ -26,7 +26,7 @@ index 24b06a0b7e..294f3de00c 100644
  
      }
  
-@@ -167,8 +167,23 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -177,8 +177,23 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
          return hash;
      }
  
@@ -51,7 +51,7 @@ index 24b06a0b7e..294f3de00c 100644
      }
  
      private NBTTagCompound getBukkitData() {
-@@ -185,7 +200,7 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -195,7 +210,7 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
      }
  
      private File getDataFile() {
@@ -59,7 +59,7 @@ index 24b06a0b7e..294f3de00c 100644
 +        return new File(getStorageLazy().getPlayerDir(), getUniqueId() + ".dat");
      }
  
-     public long getFirstPlayed() {
+     @Override
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0355-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0354-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0355-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0354-Add-PlayerConnectionCloseEvent.patch
index 9f23817c16..a8f726ce43 100644
--- a/Spigot-Server-Patches/0355-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0354-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 1303e84091c20368a7a27403d046af1ec26ee6f8 Mon Sep 17 00:00:00 2001
+From cdba41a4878c3f4c05534bbf254b34f916411228 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
diff --git a/Spigot-Server-Patches/0356-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0355-Prevent-Enderman-from-loading-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0356-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0355-Prevent-Enderman-from-loading-chunks.patch
index 695795c493..9a4e933a92 100644
--- a/Spigot-Server-Patches/0356-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0355-Prevent-Enderman-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From dcb15c23a726d0a0bb92270430795b32282595e9 Mon Sep 17 00:00:00 2001
+From d7a0ae4e988e0cf5d0d5f1be7b5350ce2aa994e0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
diff --git a/Spigot-Server-Patches/0357-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0356-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 91%
rename from Spigot-Server-Patches/0357-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0356-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 3595af801b..4f7ab9ab4d 100644
--- a/Spigot-Server-Patches/0357-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0356-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 3addeaa55215900270a9eff5d4a17224047ffc70 Mon Sep 17 00:00:00 2001
+From c68da94e83b9233205d2f4306f1c351b7ea99d17 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,10 +16,10 @@ 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 71ad35f710..2341638617 100644
+index d23178331e..412b2e79ad 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -74,6 +74,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public int ping;
      public boolean viewingCredits;
      private int containerUpdateDelay; // Paper
@@ -28,7 +28,7 @@ index 71ad35f710..2341638617 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 8233292688..109c27b647 100644
+index 97f4f7e1bd..417465c0e7 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,10 +40,10 @@ index 8233292688..109c27b647 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 294f3de00c..a3c6032d48 100644
+index c1ef1c950d..3824180ee5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -243,6 +243,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
          return getData() != null;
      }
  
@@ -102,11 +102,11 @@ index 294f3de00c..a3c6032d48 100644
 +    }
 +    // Paper end
 +
+     @Override
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
-         if (data == null) return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5f752784d5..90e61097aa 100644
+index 6a390c1146..3b02b282e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -137,6 +137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -117,7 +117,7 @@ index 5f752784d5..90e61097aa 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1362,6 +1363,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1364,6 +1365,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index 5f752784d5..90e61097aa 100644
      public void readExtraData(NBTTagCompound nbttagcompound) {
          hasPlayedBefore = true;
          if (nbttagcompound.hasKey("bukkit")) {
-@@ -1384,6 +1397,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1386,6 +1399,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(NBTTagCompound nbttagcompound) {
@@ -145,7 +145,7 @@ index 5f752784d5..90e61097aa 100644
          if (!nbttagcompound.hasKey("bukkit")) {
              nbttagcompound.set("bukkit", new NBTTagCompound());
          }
-@@ -1398,6 +1413,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1400,6 +1415,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.setLong("firstPlayed", getFirstPlayed());
          data.setLong("lastPlayed", System.currentTimeMillis());
          data.setString("lastKnownName", handle.getName());
diff --git a/Spigot-Server-Patches/0358-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0357-Fix-PlayerEditBookEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0358-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0357-Fix-PlayerEditBookEvent.patch
index 161008a0d7..a6eaf89195 100644
--- a/Spigot-Server-Patches/0358-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0357-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From 93c6fab37a8de11d2718a077f6700fd172aa0271 Mon Sep 17 00:00:00 2001
+From 0570f27d30527beebf4a36fcb3fb584af5000215 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,10 +10,10 @@ 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 15fb7ed608..71d10f9b9c 100644
+index 6096f309bc..2fce176402 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -860,9 +860,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -859,9 +859,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
                          itemstack2.a("pages", (NBTBase) nbttaglist);
                          this.player.a(packetplayinbedit.d(), CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, itemstack2)); // CraftBukkit
                      } else {
diff --git a/Spigot-Server-Patches/0359-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0358-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 84%
rename from Spigot-Server-Patches/0359-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0358-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 5b60f34d3a..89c42d85e5 100644
--- a/Spigot-Server-Patches/0359-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0358-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,14 +1,14 @@
-From 3023afa4cb8746e5f07da44c0fa1597c8fba64af Mon Sep 17 00:00:00 2001
+From 167138169d5749d96e57cf3e36dc0aaac00abef9 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 2188b4a7ad..efc4fcb35c 100644
+index 412b2e79ad..a18afbcdde 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1261,6 +1261,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1277,6 +1277,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void n() {
          this.ct = true;
          this.ejectPassengers();
diff --git a/Spigot-Server-Patches/0360-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0359-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 97%
rename from Spigot-Server-Patches/0360-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0359-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index 80065e28a2..b6ca62694a 100644
--- a/Spigot-Server-Patches/0360-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0359-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From fd910a7bbba041768fa86c732b25481750bffeda Mon Sep 17 00:00:00 2001
+From 3fbbc13b8148e47fb1b31182153fca4269b5cdd3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
diff --git a/Spigot-Server-Patches/0361-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0360-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 89%
rename from Spigot-Server-Patches/0361-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0360-Block-Entity-remove-from-being-called-on-Players.patch
index c92922a9cb..d63798c3fc 100644
--- a/Spigot-Server-Patches/0361-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0360-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From f7a06ddae22fa03ac092cced2e46b70dad904428 Mon Sep 17 00:00:00 2001
+From e798ed0fcba4a65f89e072964e4eec5bdabae302 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,10 +12,10 @@ 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 90e61097aa..1412e68fee 100644
+index 3b02b282e3..3bc7a64fac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1952,6 +1952,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1954,6 +1954,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetCooldown();
      }
diff --git a/Spigot-Server-Patches/0362-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0361-Allow-Saving-of-Oversized-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0362-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0361-Allow-Saving-of-Oversized-Chunks.patch
index d2444078ee..153816b620 100644
--- a/Spigot-Server-Patches/0362-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0361-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 2e245eea41f1bb1a961a3c23ac0b696ec6ac3007 Mon Sep 17 00:00:00 2001
+From 46fb6cb816d0b057c8137c3e6795a4fb281fd52d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
diff --git a/Spigot-Server-Patches/0363-BlockDestroyEvent.patch b/Spigot-Server-Patches/0362-BlockDestroyEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0363-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0362-BlockDestroyEvent.patch
index 16855cdb2e..a63260186b 100644
--- a/Spigot-Server-Patches/0363-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0362-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 33d45dbc5bc35444a78c4e5935eefd193418f8d0 Mon Sep 17 00:00:00 2001
+From 65e72588f13ac58a34eb65b1ea5d2041a9831f89 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
diff --git a/Spigot-Server-Patches/0364-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0363-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 97%
rename from Spigot-Server-Patches/0364-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0363-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 826c96f6df..592d259b95 100644
--- a/Spigot-Server-Patches/0364-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0363-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From 08d251a0d010ca279be90e3ae24dceaf47fcc8ab Mon Sep 17 00:00:00 2001
+From 488aaf0d7001e17a95bf6cb1d5bbcbedc148cb17 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
diff --git a/Spigot-Server-Patches/0365-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0364-Fix-sign-edit-memory-leak.patch
similarity index 92%
rename from Spigot-Server-Patches/0365-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0364-Fix-sign-edit-memory-leak.patch
index 0caddafd57..c68ca09268 100644
--- a/Spigot-Server-Patches/0365-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0364-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From fc42c54ec144a4249cf2b4bfdbb668461311717a Mon Sep 17 00:00:00 2001
+From 88c7354bb25d2a8c9085bff32e142c78768c647e 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 71d10f9b9c..60f77ac3df 100644
+index 2fce176402..af3374e861 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2561,7 +2561,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2560,7 +2560,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
              TileEntitySign tileentitysign = (TileEntitySign) tileentity;
  
diff --git a/Spigot-Server-Patches/0366-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0365-Limit-Client-Sign-length-more.patch
similarity index 91%
rename from Spigot-Server-Patches/0366-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0365-Limit-Client-Sign-length-more.patch
index 7fe4ab9440..b3061d2531 100644
--- a/Spigot-Server-Patches/0366-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0365-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From fbbf174e314e753fdddd0453c194ab6bea60a62c Mon Sep 17 00:00:00 2001
+From 44ff22cec85f0a1938e0185294c7eded3c6542a8 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,10 +22,10 @@ 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 60f77ac3df..39a040a2a0 100644
+index af3374e861..b3193bc3fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -105,6 +105,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private int E;
      private int receivedMovePackets;
      private int processedMovePackets;
@@ -33,7 +33,7 @@ index 60f77ac3df..39a040a2a0 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) {
-@@ -2577,6 +2578,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2576,6 +2577,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/0367-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0366-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 95%
rename from Spigot-Server-Patches/0367-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0366-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index e2e01fbf6a..3c8d783ab6 100644
--- a/Spigot-Server-Patches/0367-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0366-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From fc7f6b655759cf7f6c66b79f2b114a30e14b1d9f Mon Sep 17 00:00:00 2001
+From 2ea5b15f3e2585b2f20ee9aad0c764a0f83e5ea8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
diff --git a/Spigot-Server-Patches/0368-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0367-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 98%
rename from Spigot-Server-Patches/0368-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0367-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index c614c90a0c..2f6636ad0e 100644
--- a/Spigot-Server-Patches/0368-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0367-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From 0fb0803c2d7490a52dfbf7e8260e9a314fb41bbb Mon Sep 17 00:00:00 2001
+From f20b9a893da351bcc50180f12c8705eef5bf6b7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of
diff --git a/Spigot-Server-Patches/0369-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0368-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 92%
rename from Spigot-Server-Patches/0369-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0368-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 0ed0eaec09..517b560306 100644
--- a/Spigot-Server-Patches/0369-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0368-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From ee42d19ac37a5088bd74c925800bc16f2ac69d62 Mon Sep 17 00:00:00 2001
+From 3275c0e9ab25bfdb58ea04478cb83b454885654c 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
@@ -23,7 +23,7 @@ index c169d01762..55bc4b265d 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 109c27b647..6939b5ce1e 100644
+index 417465c0e7..990aa330d7 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 {
@@ -35,7 +35,7 @@ index 109c27b647..6939b5ce1e 100644
      protected final int maxPlayers;
      private int s;
      private EnumGamemode t;
-@@ -896,9 +896,9 @@ public abstract class PlayerList {
+@@ -898,9 +898,9 @@ public abstract class PlayerList {
      }
      public boolean isWhitelisted(GameProfile gameprofile, org.bukkit.event.player.PlayerLoginEvent loginEvent) {
          boolean isOp = this.operators.d(gameprofile);
@@ -47,7 +47,7 @@ index 109c27b647..6939b5ce1e 100644
          event.callEvent();
          if (!event.isWhitelisted()) {
              if (loginEvent != null) {
-@@ -1027,11 +1027,11 @@ public abstract class PlayerList {
+@@ -1029,11 +1029,11 @@ public abstract class PlayerList {
      }
  
      public boolean getHasWhitelist() {
diff --git a/Spigot-Server-Patches/0370-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0369-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 89%
rename from Spigot-Server-Patches/0370-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0369-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 1a040bc18d..fcd6dbb0d3 100644
--- a/Spigot-Server-Patches/0370-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0369-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From f08cd8ab6e14fc8f98b58d311a7755e116dea6ed Mon Sep 17 00:00:00 2001
+From aa2603b2b859a8435d19c86f229a4f018c4e106e 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 f8baaea03e..bf93bb44ea 100644
+index dea1d2d4d2..b06235d46d 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/0371-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0370-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 79%
rename from Spigot-Server-Patches/0371-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0370-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 7f27d34964..030dfcac6f 100644
--- a/Spigot-Server-Patches/0371-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0370-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,14 +1,14 @@
-From 30a14f63c74cb2d16496273c5412369331a608c0 Mon Sep 17 00:00:00 2001
+From 363886a7827855bd064381b61f2d070253f7fc42 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 6939b5ce1e..7d93715424 100644
+index 990aa330d7..51272a51bb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1031,6 +1031,7 @@ public abstract class PlayerList {
+@@ -1033,6 +1033,7 @@ public abstract class PlayerList {
      }
  
      public void setHasWhitelist(boolean flag) {
diff --git a/Spigot-Server-Patches/0372-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0371-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 96%
rename from Spigot-Server-Patches/0372-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0371-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index 14fa53f36c..f2dae7e41c 100644
--- a/Spigot-Server-Patches/0372-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0371-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From cd0d812a87747584b7ecc356776b21a63dbb10e3 Mon Sep 17 00:00:00 2001
+From db1960b71a77920e4f9438ee72fe05d26eb106a9 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
diff --git a/Spigot-Server-Patches/0373-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0372-Entity-getEntitySpawnReason.patch
similarity index 89%
rename from Spigot-Server-Patches/0373-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0372-Entity-getEntitySpawnReason.patch
index b504137887..518661ed8b 100644
--- a/Spigot-Server-Patches/0373-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0372-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From e294e9bfa44c71ce198af03348d27b48949fb2c7 Mon Sep 17 00:00:00 2001
+From 856ac69a50a7c1cf74811d1898ffd113df4e23f2 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,10 +10,10 @@ 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 f945a2df48..cad8613a9b 100644
+index 5068511111..a1977a873b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -65,6 +65,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -68,6 +68,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          }
      };
      List<Entity> entitySlice = null;
@@ -21,8 +21,8 @@ index f945a2df48..cad8613a9b 100644
      // Paper end
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
-@@ -1579,6 +1580,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             if (origin != null) {
+@@ -1593,6 +1594,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()));
              }
 +            if (spawnReason != null) {
@@ -31,7 +31,7 @@ index f945a2df48..cad8613a9b 100644
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
-@@ -1712,6 +1716,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1726,6 +1730,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
  
              spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
@@ -59,10 +59,10 @@ index f945a2df48..cad8613a9b 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 7d93715424..3d1c910ccf 100644
+index 51272a51bb..4bc465ef47 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -248,7 +248,7 @@ public abstract class PlayerList {
+@@ -249,7 +249,7 @@ public abstract class PlayerList {
              // CraftBukkit start
              WorldServer finalWorldServer = worldserver;
              Entity entity = EntityTypes.a(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
@@ -72,7 +72,7 @@ index 7d93715424..3d1c910ccf 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ef706f66e4..a296b0c2c7 100644
+index e60fc0d585..20ccd154d1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -939,6 +939,7 @@ public class WorldServer extends World {
@@ -84,10 +84,10 @@ index ef706f66e4..a296b0c2c7 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 0119c96066..ed5217b4ee 100644
+index af0fc9bd71..f1938695d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -988,5 +988,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean fromMobSpawner() {
          return getHandle().spawnedViaMobSpawner;
      }
diff --git a/Spigot-Server-Patches/0374-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0373-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0374-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0373-Update-entity-Metadata-for-all-tracked-players.patch
index f67e68c50a..7bbeec99fe 100644
--- a/Spigot-Server-Patches/0374-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0373-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,4 +1,4 @@
-From f57005324591b029513cb16798ab6b0f20b967a5 Mon Sep 17 00:00:00 2001
+From 6bad33859781b603900177cd256111ad34a4dd48 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
@@ -22,10 +22,10 @@ index afd8748da8..17b6ab57c2 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 c6e61c133a..6db6a4eb37 100644
+index b3193bc3fa..3587f73e16 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2021,7 +2021,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2020,7 +2020,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/0375-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0374-Fire-event-on-GS4-query.patch
similarity index 99%
rename from Spigot-Server-Patches/0375-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0374-Fire-event-on-GS4-query.patch
index 7c46512a76..849f616348 100644
--- a/Spigot-Server-Patches/0375-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0374-Fire-event-on-GS4-query.patch
@@ -1,4 +1,4 @@
-From 44b80b979a350005ada09981da707d6ee687982f Mon Sep 17 00:00:00 2001
+From bb593022fce1020099405f57c50f010d7565654b 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/Spigot-Server-Patches/0376-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0375-Implement-PlayerPostRespawnEvent.patch
similarity index 83%
rename from Spigot-Server-Patches/0376-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0375-Implement-PlayerPostRespawnEvent.patch
index 974161e2bb..dec3a86b1a 100644
--- a/Spigot-Server-Patches/0376-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0375-Implement-PlayerPostRespawnEvent.patch
@@ -1,14 +1,14 @@
-From 796e45876e53d2dfa0ee09e384d37fd88c22d395 Mon Sep 17 00:00:00 2001
+From c0286fd277c8e601c3d63bda402548f6e4b7a058 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 3d1c910ccf..6c7289f037 100644
+index 4bc465ef47..67461cd2ac 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -635,9 +635,14 @@ public abstract class PlayerList {
+@@ -636,9 +636,14 @@ public abstract class PlayerList {
  
          // this.a(entityplayer1, entityplayer, worldserver); // CraftBukkit - removed
  
@@ -24,15 +24,15 @@ index 3d1c910ccf..6c7289f037 100644
              CraftWorld cworld = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
              if (cworld != null && blockposition != null) {
              Optional<Vec3D> optional = EntityHuman.getBed(cworld.getHandle(), blockposition, flag1);
-@@ -670,6 +675,7 @@ public abstract class PlayerList {
+@@ -671,6 +676,7 @@ public abstract class PlayerList {
  
              location = respawnEvent.getRespawnLocation();
-             entityplayer.reset();
+             if (!flag) entityplayer.reset(); // SPIGOT-4785
 +            isRespawn = true; // Paper
          } else {
              location.setWorld(server.getWorldServer(dimensionmanager).getWorld());
          }
-@@ -730,6 +736,13 @@ public abstract class PlayerList {
+@@ -732,6 +738,13 @@ public abstract class PlayerList {
          if (entityplayer.playerConnection.isDisconnected()) {
              this.savePlayerFile(entityplayer);
          }
diff --git a/Spigot-Server-Patches/0377-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0376-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 95%
rename from Spigot-Server-Patches/0377-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0376-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index fedf75fd30..d881e1e5e3 100644
--- a/Spigot-Server-Patches/0377-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0376-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From c1087e087ac5d0583ccb2c59fe01a6f7217acac7 Mon Sep 17 00:00:00 2001
+From 94c653b27e6e519f724247ca716f12e054c79e7e 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
diff --git a/Spigot-Server-Patches/0378-Server-Tick-Events.patch b/Spigot-Server-Patches/0377-Server-Tick-Events.patch
similarity index 86%
rename from Spigot-Server-Patches/0378-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0377-Server-Tick-Events.patch
index 781b301345..4ce1e9fdac 100644
--- a/Spigot-Server-Patches/0378-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0377-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 40e9a766256d4a35e40cd4b074191bb845c1f26b Mon Sep 17 00:00:00 2001
+From b1578a26215ab6b5bc1f0afc3bc121f7f06629bf 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,10 +6,10 @@ 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 e90cf0629a..b790472347 100644
+index e612879495..3fc232431a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1032,6 +1032,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1051,6 +1051,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
          this.slackActivityAccountant.tickStarted(); // Spigot
          long i = SystemUtils.getMonotonicNanos();
@@ -17,7 +17,7 @@ index e90cf0629a..b790472347 100644
  
          ++this.ticks;
          this.b(booleansupplier);
-@@ -1078,6 +1079,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1097,6 +1098,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.methodProfiler.exit();
          org.spigotmc.WatchdogThread.tick(); // Spigot
          this.slackActivityAccountant.tickEnded(l); // Spigot
diff --git a/Spigot-Server-Patches/0379-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0378-PlayerDeathEvent-getItemsToKeep.patch
similarity index 92%
rename from Spigot-Server-Patches/0379-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0378-PlayerDeathEvent-getItemsToKeep.patch
index 5c780b1e5b..0b135fdcad 100644
--- a/Spigot-Server-Patches/0379-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0378-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From b1762734105257af82e64accb7832138a6fdfb5e Mon Sep 17 00:00:00 2001
+From 97466287cd8da038a43e5433a1e6cae4e29d5307 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,10 +8,10 @@ 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 f4ee78efc6..84159cd7ee 100644
+index a18afbcdde..f17e799309 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -507,6 +507,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -508,6 +508,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          });
      }
  
@@ -58,7 +58,7 @@ index f4ee78efc6..84159cd7ee 100644
      @Override
      public void die(DamageSource damagesource) {
          boolean flag = this.world.getGameRules().getBoolean("showDeathMessages");
-@@ -585,7 +625,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -586,7 +626,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.releaseShoulderEntities();
          // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
          if (!event.getKeepInventory()) {
diff --git a/Spigot-Server-Patches/0380-Optimize-Persistent-Data-Loading.patch b/Spigot-Server-Patches/0379-Optimize-Persistent-Data-Loading.patch
similarity index 97%
rename from Spigot-Server-Patches/0380-Optimize-Persistent-Data-Loading.patch
rename to Spigot-Server-Patches/0379-Optimize-Persistent-Data-Loading.patch
index 1bc8a424b2..a2659bc73c 100644
--- a/Spigot-Server-Patches/0380-Optimize-Persistent-Data-Loading.patch
+++ b/Spigot-Server-Patches/0379-Optimize-Persistent-Data-Loading.patch
@@ -1,4 +1,4 @@
-From eff17eb73df9b06810623213fec383b54253b172 Mon Sep 17 00:00:00 2001
+From aca5c59694a9856f898aba40bad4729b36798ec3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Mar 2019 01:25:11 -0400
 Subject: [PATCH] Optimize Persistent Data Loading
diff --git a/Spigot-Server-Patches/0381-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0380-Allow-login-events-to-fire-only-after-the-server-plu.patch
similarity index 94%
rename from Spigot-Server-Patches/0381-Allow-login-events-to-fire-only-after-the-server-plu.patch
rename to Spigot-Server-Patches/0380-Allow-login-events-to-fire-only-after-the-server-plu.patch
index c90160e89e..7fa8e02983 100644
--- a/Spigot-Server-Patches/0381-Allow-login-events-to-fire-only-after-the-server-plu.patch
+++ b/Spigot-Server-Patches/0380-Allow-login-events-to-fire-only-after-the-server-plu.patch
@@ -1,4 +1,4 @@
-From 958395a3ff4635072301a6fc0fe288e5470421f9 Mon Sep 17 00:00:00 2001
+From ef816e0d08a4784078294c63b810c4ae6beca979 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
@@ -56,10 +56,10 @@ 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 b790472347..c28b0738dd 100644
+index 3fc232431a..93c014c399 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
+@@ -463,6 +463,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          // Paper end
  
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
diff --git a/Spigot-Server-Patches/0382-Make-region-files-more-reliable-to-write-to.patch b/Spigot-Server-Patches/0381-Make-region-files-more-reliable-to-write-to.patch
similarity index 99%
rename from Spigot-Server-Patches/0382-Make-region-files-more-reliable-to-write-to.patch
rename to Spigot-Server-Patches/0381-Make-region-files-more-reliable-to-write-to.patch
index 1901224716..cbae0b9583 100644
--- a/Spigot-Server-Patches/0382-Make-region-files-more-reliable-to-write-to.patch
+++ b/Spigot-Server-Patches/0381-Make-region-files-more-reliable-to-write-to.patch
@@ -1,4 +1,4 @@
-From a7c26e3b00bedfb07b30787eef408f9e491d47d4 Mon Sep 17 00:00:00 2001
+From 7e2000b337deb94d91db62d03496e2dfce9f12e5 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
diff --git a/Spigot-Server-Patches/0383-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0382-Optimize-GameRules-to-use-LinkedHashMap.patch
similarity index 98%
rename from Spigot-Server-Patches/0383-Optimize-GameRules-to-use-LinkedHashMap.patch
rename to Spigot-Server-Patches/0382-Optimize-GameRules-to-use-LinkedHashMap.patch
index fe4bcbca7d..eae4aee72a 100644
--- a/Spigot-Server-Patches/0383-Optimize-GameRules-to-use-LinkedHashMap.patch
+++ b/Spigot-Server-Patches/0382-Optimize-GameRules-to-use-LinkedHashMap.patch
@@ -1,4 +1,4 @@
-From c995a4c2c06c60db91d8ee6f13a7ffdd3033e832 Mon Sep 17 00:00:00 2001
+From 3891a02b65639d6f88b2ba5edac009af5fdecd94 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
diff --git a/Spigot-Server-Patches/0384-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0383-Optimize-Captured-TileEntity-Lookup.patch
similarity index 95%
rename from Spigot-Server-Patches/0384-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0383-Optimize-Captured-TileEntity-Lookup.patch
index 972c450477..9149c033d0 100644
--- a/Spigot-Server-Patches/0384-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0383-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 5245dca65c8041ba7ca720267f06f1a707443255 Mon Sep 17 00:00:00 2001
+From 927bc5edb691c1e5ce6ebe80a87ce80dcf457f87 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
diff --git a/Spigot-Server-Patches/0385-Add-Heightmap-API.patch b/Spigot-Server-Patches/0384-Add-Heightmap-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0385-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0384-Add-Heightmap-API.patch
index dd0aeed8f6..ecbd6d4ffb 100644
--- a/Spigot-Server-Patches/0385-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0384-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From 5ed504e3139da5671c3f602564391ff9776f6a80 Mon Sep 17 00:00:00 2001
+From 3725e2b0e67484a0c69c552ed24506a060f62e4b 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
@@ -20,10 +20,10 @@ index 1bec5beab4..9f4cf3f1b3 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5e672ae2e4..d8ea548383 100644
+index 016ed471bb..0cbca6870a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -308,6 +308,29 @@ public class CraftWorld implements World {
+@@ -311,6 +311,29 @@ public class CraftWorld implements World {
          return world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(x, 0, z)).getY();
      }
  
@@ -50,9 +50,9 @@ index 5e672ae2e4..d8ea548383 100644
 +    }
 +    // Paper end
 +
+     @Override
      public Location getSpawnLocation() {
          BlockPosition spawn = world.getSpawn();
-         return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ());
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0386-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0385-Handle-bad-chunks-more-gracefully.patch
similarity index 97%
rename from Spigot-Server-Patches/0386-Handle-bad-chunks-more-gracefully.patch
rename to Spigot-Server-Patches/0385-Handle-bad-chunks-more-gracefully.patch
index bb489886cb..628cccd37a 100644
--- a/Spigot-Server-Patches/0386-Handle-bad-chunks-more-gracefully.patch
+++ b/Spigot-Server-Patches/0385-Handle-bad-chunks-more-gracefully.patch
@@ -1,4 +1,4 @@
-From d0e791d2d75975b065d7cb468ccb299b565ee794 Mon Sep 17 00:00:00 2001
+From 30cf1dca5cb5299cef1d241c7bfe60d05bbbd988 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
diff --git a/Spigot-Server-Patches/0387-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0386-Mob-Spawner-API-Enhancements.patch
similarity index 98%
rename from Spigot-Server-Patches/0387-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0386-Mob-Spawner-API-Enhancements.patch
index 331ae3d8dd..cab2be50db 100644
--- a/Spigot-Server-Patches/0387-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0386-Mob-Spawner-API-Enhancements.patch
@@ -1,4 +1,4 @@
-From 07455d400728b847b024ababe1faa01081563fa3 Mon Sep 17 00:00:00 2001
+From 9bd01a1bf43bf841bbfb1ef50ed76b27d8eaf490 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/Spigot-Server-Patches/0388-don-t-NPE-on-dimensionmanager-toString.patch b/Spigot-Server-Patches/0387-don-t-NPE-on-dimensionmanager-toString.patch
similarity index 84%
rename from Spigot-Server-Patches/0388-don-t-NPE-on-dimensionmanager-toString.patch
rename to Spigot-Server-Patches/0387-don-t-NPE-on-dimensionmanager-toString.patch
index 16e26d4c91..d8b676786b 100644
--- a/Spigot-Server-Patches/0388-don-t-NPE-on-dimensionmanager-toString.patch
+++ b/Spigot-Server-Patches/0387-don-t-NPE-on-dimensionmanager-toString.patch
@@ -1,4 +1,4 @@
-From 73fa66d60a2fe81ffd58f1446678ebddb1786fae Mon Sep 17 00:00:00 2001
+From e51672c6ce2cae36211bfb8e8de57519b8dc53bf Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 22 Apr 2019 19:51:14 +0100
 Subject: [PATCH] don't NPE on dimensionmanager toString
@@ -14,11 +14,11 @@ this is not super elegant, but is the only route that promises not to
 break stuff.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b05d7b0e87..7cc0c7c162 100644
+index 3fe37b3306..c906479ac9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -993,7 +993,14 @@ public final class CraftServer implements Server {
-         worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
+@@ -996,7 +996,14 @@ public final class CraftServer implements Server {
+         }
  
          DimensionManager actualDimension = DimensionManager.a(creator.environment().getId());
 -        DimensionManager internalDimension = new DimensionManager(dimension, name, name, (w, manager) -> actualDimension.getWorldProvider(w), actualDimension.hasSkyLight());
diff --git a/work/Bukkit b/work/Bukkit
index 73c2356795..91b0487aed 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 73c235679573768d11aca47ce7e9bc4051004f19
+Subproject commit 91b0487aed3000a9db40120e8c7c5605c28d1d51
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 724ec10f33..0d76f8658d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 724ec10f3358924e348e96fe51dffe41c91780e5
+Subproject commit 0d76f8658d22fccee3741792a5cc7048cb6259eb
diff --git a/work/Spigot b/work/Spigot
index 066994b8ae..1eece4fcb4 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 066994b8aef9c7e7c0bf800e346eb30efa76835a
+Subproject commit 1eece4fcb49d23d9f09dd21e0e5462a5d3d81b83