From aad194a32ec20310e3ca1f22f4f94652161ba3b7 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 23 Jul 2018 09:39:55 +0100
Subject: [PATCH] Update B/CB/S

---
 ...y-disable-plugins-that-fail-to-load.patch} |  2 +-
 ...Made-EntityDismountEvent-Cancellable.patch | 47 -------------------
 ...ch => 0013-Expose-server-CommandMap.patch} |  4 +-
 ...ord-chat-API-from-spigot-subclasses.patch} |  4 +-
 ...0015-Player-Tab-List-and-Title-APIs.patch} |  2 +-
 ... 0016-Add-exception-reporting-event.patch} |  2 +-
 ...rverListPingEvent-flagging-as-Async.patch} |  2 +-
 ...-sendMessage-methods-to-CommandSend.patch} |  2 +-
 ...orking-with-arrows-stuck-in-living-.patch} |  2 +-
 ... => 0020-Complete-resource-pack-API.patch} |  2 +-
 ...=> 0021-Use-ASM-for-event-executors.patch} |  4 +-
 ... => 0022-Add-a-call-helper-to-Event.patch} |  2 +-
 ...er-name-to-commands.yml-replacement.patch} |  2 +-
 ...load-permissions.yml-and-require-co.patch} |  2 +-
 ...-Custom-replacement-for-eaten-items.patch} |  2 +-
 ... 0026-Access-items-by-EquipmentSlot.patch} |  2 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  2 +-
 ...t.patch => 0028-EntityPathfindEvent.patch} |  2 +-
 ...ynchronization-in-MetadataStoreBase.patch} |  2 +-
 ...-MetadataStoreBase.removeAll-Plugin.patch} |  2 +-
 ...031-Add-PlayerUseUnknownEntityEvent.patch} |  2 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |  2 +-
 ...patch => 0033-Arrow-pickup-rule-API.patch} |  2 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  2 +-
 ...ble-API.patch => 0035-LootTable-API.patch} |  2 +-
 ...nt.patch => 0036-Add-EntityZapEvent.patch} |  2 +-
 ...Misc-Utils.patch => 0037-Misc-Utils.patch} |  2 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  2 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  2 +-
 ... => 0040-Add-ProjectileCollideEvent.patch} |  2 +-
 ...041-Add-String-based-Action-Bar-API.patch} |  2 +-
 ...o-control-if-armour-stands-can-move.patch} |  2 +-
 ...nt.patch => 0043-IllegalPacketEvent.patch} |  2 +-
 ...API-s.patch => 0044-Fireworks-API-s.patch} |  2 +-
 ... 0045-PlayerTeleportEndGatewayEvent.patch} |  2 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  2 +-
 ...I-for-Reason-Source-Triggering-play.patch} |  2 +-
 ...rldBorder-isInBounds-Location-check.patch} |  2 +-
 ...-option-to-prevent-player-names-fro.patch} |  2 +-
 ...pstream-javadoc-warnings-and-errors.patch} |  4 +-
 ....patch => 0051-Item-canEntityPickup.patch} |  2 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  2 +-
 ...> 0053-PlayerAttemptPickupItemEvent.patch} |  2 +-
 ...tch => 0054-Add-UnknownCommandEvent.patch} |  2 +-
 ...tch => 0055-Basic-PlayerProfile-API.patch} |  2 +-
 ... 0056-Shoulder-Entities-Release-API.patch} |  2 +-
 ...patch => 0057-Profile-Lookup-Events.patch} |  4 +-
 ...patch => 0058-Entity-fromMobSpawner.patch} |  2 +-
 ...9-Improve-the-Saddle-API-for-Horses.patch} |  2 +-
 ...=> 0060-ensureServerConversions-API.patch} |  2 +-
 ... => 0061-Add-getI18NDisplayName-API.patch} |  2 +-
 ...=> 0062-ProfileWhitelistVerifyEvent.patch} |  2 +-
 ...0063-Make-plugins-list-alphabetical.patch} |  2 +-
 ...atch => 0064-LivingEntity-setKiller.patch} |  2 +-
 ...fixes-in-implementation-logging-con.patch} |  2 +-
 ...ow-plugins-to-use-SLF4J-for-logging.patch} |  4 +-
 ...r-plugins-modifying-the-parent-of-t.patch} |  2 +-
 ...t.patch => 0068-Add-PlayerJumpEvent.patch} |  2 +-
 ...t-protocol-version-and-virtual-host.patch} |  2 +-
 ... => 0070-Add-PlayerArmorChangeEvent.patch} |  2 +-
 ...get-a-BlockState-without-a-snapshot.patch} |  2 +-
 ...patch => 0072-AsyncTabCompleteEvent.patch} |  2 +-
 ...ay-warning-on-deprecated-recipe-API.patch} |  2 +-
 ...=> 0074-PlayerPickupExperienceEvent.patch} |  2 +-
 ...tch => 0075-ExperienceOrbMergeEvent.patch} |  2 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |  2 +-
 ...patch => 0077-PreCreatureSpawnEvent.patch} |  2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  2 +-
 ...-Add-SkullMeta.setPlayerProfile-API.patch} |  2 +-
 ...> 0080-Fill-Profile-Property-Events.patch} |  2 +-
 ...layerAdvancementCriterionGrantEvent.patch} |  2 +-
 ...ch => 0082-Add-ArmorStand-Item-Meta.patch} |  2 +-
 ...pers.patch => 0083-Optimize-Hoppers.patch} |  2 +-
 ... 0084-Tameable-getOwnerUniqueId-API.patch} |  2 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  2 +-
 ...d-extended-PaperServerListPingEvent.patch} |  2 +-
 ...=> 0087-Player.setPlayerProfile-API.patch} |  2 +-
 ...patch => 0088-getPlayerUniqueId-API.patch} |  4 +-
 ...support-to-PaperServerListPingEvent.patch} |  2 +-
 ...-method-to-open-already-placed-sign.patch} |  2 +-
 ...-version-history-to-version-command.patch} |  2 +-
 ...2-Add-Ban-Methods-to-Player-Objects.patch} |  2 +-
 ...t.patch => 0093-EndermanEscapeEvent.patch} |  2 +-
 ...h => 0094-Enderman.teleportRandomly.patch} |  2 +-
 ...ional-world.getNearbyEntities-API-s.patch} |  2 +-
 ... => 0096-Location.isChunkLoaded-API.patch} |  2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |  2 +-
 ...h => 0098-EndermanAttackPlayerEvent.patch} |  2 +-
 ...ose-Plugin-Class-Loaders-on-Disable.patch} |  2 +-
 ...tch => 0100-WitchConsumePotionEvent.patch} |  2 +-
 ...patch => 0101-WitchThrowPotionEvent.patch} |  2 +-
 ...on.toBlockLocation-toCenterLocation.patch} |  2 +-
 ... => 0103-PotionEffect-clone-methods.patch} |  2 +-
 ...patch => 0104-WitchReadyPotionEvent.patch} |  2 +-
 ...105-ItemStack-getMaxItemUseDuration.patch} |  2 +-
 ...6-Add-EntityTeleportEndGatewayEvent.patch} |  2 +-
 ...d-SentientNPC-Interface-to-Entities.patch} |  2 +-
 ...-shield-blocking-delay-configurable.patch} |  2 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  2 +-
 ...dd-getNearbyXXX-methods-to-Location.patch} |  2 +-
 ...patch => 0111-PlayerReadyArrowEvent.patch} |  2 +-
 ...12-Add-EntityKnockbackByEntityEvent.patch} |  2 +-
 ...patch => 0113-Expand-Explosions-API.patch} |  2 +-
 ...I-additions-for-quantity-flags-lore.patch} |  2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  2 +-
 ...-API.patch => 0116-RangedEntity-API.patch} |  2 +-
 ...eHitEvent-to-include-the-BlockFace-.patch} |  2 +-
 ...> 0118-Add-World.getEntity-UUID-API.patch} |  2 +-
 ...0119-InventoryCloseEvent-Reason-API.patch} |  2 +-
 ...I.patch => 0120-Entity-getChunk-API.patch} |  2 +-
 ...-API.patch => 0121-Vex-getOwner-API.patch} |  2 +-
 ...d-an-asterisk-to-legacy-API-plugins.patch} |  4 +-
 ...c-1.13-versioning-branch-build-name.patch} |  4 +-
 ...ch => 0124-Add-async-chunk-load-API.patch} |  2 +-
 Spigot-Server-Patches/0004-MC-Utils.patch     | 38 +++++++--------
 ...oreboards-for-non-players-by-default.patch |  8 ++--
 ...069-Handle-Item-Meta-Inconsistencies.patch | 30 ++++++------
 .../0079-Don-t-teleport-dead-entities.patch   |  6 +--
 ...nilla-per-world-scoreboard-coloring-.patch | 10 ++--
 ...0-Vehicle-Event-Cancellation-Changes.patch | 45 ------------------
 ...possibility-for-getServer-singleton.patch} |  4 +-
 ...tem-frames-performance-and-bug-fixe.patch} | 12 ++---
 ...API-Replenishable-Lootables-Feature.patch} | 32 ++++++-------
 ...-Do-not-load-chunks-for-pathfinding.patch} |  4 +-
 ...> 0114-Entity-Tracking-Improvements.patch} |  6 +--
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  6 +--
 ... 0116-Fix-Chunk-Unload-Queue-Issues.patch} |  6 +--
 ...em-property-for-disabling-watchdoge.patch} |  4 +-
 ...mize-EAR.patch => 0118-Optimize-EAR.patch} |  4 +-
 ...0119-Optimize-UserCache-Thread-Safe.patch} |  6 +--
 ...locking-on-Network-Manager-creation.patch} |  4 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} | 10 ++--
 ...-redstone-torch-rapid-clock-removal.patch} |  4 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |  6 +--
 ...h => 0124-Add-server-name-parameter.patch} |  4 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |  6 +--
 ...nk-Unloads-based-on-Player-Movement.patch} | 18 +++----
 ...=> 0127-Fix-Double-World-Add-issues.patch} |  6 +--
 ...tch => 0128-Fix-Old-Sign-Conversion.patch} | 10 ++--
 ...-profiles-that-have-no-UUID-and-no-.patch} |  4 +-
 ...ative-vehicle-moved-wrongly-message.patch} |  4 +-
 ...rs-that-dismount-from-other-players.patch} |  4 +-
 ...etting-for-proxy-online-mode-status.patch} |  8 ++--
 ...-BlockStateEnum-hashCode-and-equals.patch} |  4 +-
 ...0134-Disable-ticking-of-snow-blocks.patch} |  4 +-
 ...35-Fix-AIOOBE-in-inventory-handling.patch} |  4 +-
 ...nfigurable-packet-in-spam-threshold.patch} |  6 +--
 ...7-Configurable-flying-kick-messages.patch} |  6 +--
 ...atch => 0138-Auto-Save-Improvements.patch} | 18 +++----
 ...ch => 0139-Chunk-registration-fixes.patch} |  4 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  4 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |  4 +-
 ...ch => 0142-Disable-Vanilla-Chunk-GC.patch} |  4 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  6 +--
 ...nt.patch => 0144-Add-EntityZapEvent.patch} |  6 +--
 ...hunks-from-Hoppers-and-other-things.patch} |  4 +-
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} |  8 ++--
 ... 0147-Chunk-Save-Stats-Debug-Option.patch} |  6 +--
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  6 +--
 ...49-Cache-user-authenticator-threads.patch} |  4 +-
 ...atch => 0150-Optimize-Network-Queue.patch} |  4 +-
 ....patch => 0151-Optimise-removeQueue.patch} |  4 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  4 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  2 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  4 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |  6 +--
 ... => 0156-Add-ProjectileCollideEvent.patch} |  4 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |  6 +--
 ...Bound-Treasure-Maps-to-World-Border.patch} |  6 +--
 ...igurable-Cartographer-Treasure-Maps.patch} |  6 +--
 ... => 0160-Optimize-ItemStack.isEmpty.patch} |  4 +-
 ...o-control-if-armour-stands-can-move.patch} |  6 +--
 ...option-to-remove-invalid-statistics.patch} |  6 +--
 ...3-Properly-fix-item-duplication-bug.patch} |  6 +--
 ...=> 0164-String-based-Action-Bar-API.patch} |  6 +--
 ... 0165-Activation-Range-Improvements.patch} | 14 +++---
 ...-API-s.patch => 0166-Firework-API-s.patch} | 10 ++--
 ... 0167-PlayerTeleportEndGatewayEvent.patch} |  4 +-
 ... => 0168-ShulkerBox-Dupe-Prevention.patch} |  4 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  4 +-
 ...h => 0170-Enforce-Sync-Player-Saves.patch} |  4 +-
 ... => 0171-Enforce-Sync-Chunk-Unloads.patch} |  4 +-
 ...low-entities-to-ride-themselves-572.patch} |  4 +-
 ...atch => 0173-Fix-block-break-desync.patch} |  6 +--
 ...I-for-Reason-Source-Triggering-play.patch} | 26 +++++-----
 ...patch => 0175-Cap-Entity-Collisions.patch} |  8 ++--
 ...-CraftScheduler-Async-Task-Debugger.patch} |  6 +--
 ...g.patch => 0177-Shame-on-you-Mojang.patch} |  6 +--
 ...ore-aggressive-in-the-chunk-unload-.patch} |  4 +-
 ...> 0179-Do-not-let-armorstands-drown.patch} |  6 +--
 ...e-async-calls-to-restart-the-server.patch} |  8 ++--
 ...roperty-to-disable-book-size-limits.patch} |  6 +--
 ...e-parrots-stay-on-shoulders-despite.patch} |  8 ++--
 ...-option-to-prevent-player-names-fro.patch} |  6 +--
 ...leAppender-for-console-improvements.patch} | 28 +++++------
 ...rable-option-to-disable-creeper-lin.patch} |  6 +--
 ....patch => 0186-Item-canEntityPickup.patch} |  8 ++--
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  4 +-
 ...> 0188-PlayerAttemptPickupItemEvent.patch} |  4 +-
 ...tch => 0189-Add-UnknownCommandEvent.patch} |  4 +-
 ...tch => 0190-Basic-PlayerProfile-API.patch} | 20 ++++----
 ... 0191-Shoulder-Entities-Release-API.patch} |  6 +--
 ...patch => 0192-Profile-Lookup-Events.patch} |  4 +-
 ...layer-logins-during-server-shutdown.patch} |  4 +-
 ...patch => 0194-Entity-fromMobSpawner.patch} |  8 ++--
 ...0195-Fix-Anvil-Level-sync-to-client.patch} |  6 +--
 ...ages-for-getTileEntity-in-order-to-.patch} |  4 +-
 ...7-Improve-the-Saddle-API-for-Horses.patch} |  8 ++--
 ...plement-ensureServerConversions-API.patch} |  4 +-
 ...> 0199-Implement-getI18NDisplayName.patch} |  4 +-
 ...ving-disabled-before-unloading-all-.patch} |  4 +-
 ...=> 0201-ProfileWhitelistVerifyEvent.patch} |  4 +-
 ...ch => 0202-Fix-this-stupid-bullshit.patch} |  4 +-
 ...wns-should-honor-nametags-and-leash.patch} |  4 +-
 ...mer-when-spawner-event-is-cancelled.patch} |  4 +-
 ...5-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  4 +-
 ...a-custom-authentication-servers-dow.patch} |  6 +--
 ...atch => 0207-LivingEntity-setKiller.patch} |  4 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |  6 +--
 ...-prefixes-using-Log4J-configuration.patch} |  8 ++--
 ...Include-Log4J2-SLF4J-implementation.patch} |  4 +-
 ...efix-for-various-plugins-bypassing-.patch} |  4 +-
 ...t.patch => 0212-Add-PlayerJumpEvent.patch} |  6 +--
 ...-handle-PacketPlayInKeepAlive-async.patch} |  4 +-
 ...t-protocol-version-and-virtual-host.patch} | 12 ++---
 ...t-serverside-behavior-of-keepalives.patch} |  4 +-
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |  4 +-
 ...Effects-only-to-players-who-can-see.patch} |  6 +--
 ...maximum-exp-value-when-merging-orbs.patch} |  6 +--
 ... => 0219-Add-PlayerArmorChangeEvent.patch} |  6 +--
 ...om-being-processed-when-the-player-.patch} |  4 +-
 ...-implementations-for-captured-block.patch} |  4 +-
 ...get-a-BlockState-without-a-snapshot.patch} | 10 ++--
 ...patch => 0223-AsyncTabCompleteEvent.patch} | 14 +++---
 ...24-Avoid-NPE-in-PathfinderGoalTempt.patch} |  4 +-
 ...=> 0225-PlayerPickupExperienceEvent.patch} |  4 +-
 ...tch => 0226-ExperienceOrbMergeEvent.patch} |  4 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} | 10 ++--
 ...rable-Chunks-Sends-per-Tick-setting.patch} |  6 +--
 ...onfigurable-Max-Chunk-Gens-per-Tick.patch} | 12 ++---
 ...max-squid-spawn-height-configurable.patch} |  6 +--
 ...patch => 0231-PreCreatureSpawnEvent.patch} |  6 +--
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  4 +-
 ...-Add-SkullMeta.setPlayerProfile-API.patch} |  4 +-
 ...> 0234-Fill-Profile-Property-Events.patch} |  4 +-
 ...layerAdvancementCriterionGrantEvent.patch} |  4 +-
 ...ch => 0236-Add-ArmorStand-Item-Meta.patch} | 16 +++----
 ...Extend-Player-Interact-cancellation.patch} |  4 +-
 ... 0238-Tameable-getOwnerUniqueId-API.patch} |  6 +--
 ...-crits-helps-mitigate-hacked-client.patch} |  6 +--
 ...ing-location-from-InventoryEnderChe.patch} |  4 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  4 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |  4 +-
 ...t-extended-PaperServerListPingEvent.patch} | 16 +++----
 ... 0244-Improved-Async-Task-Scheduler.patch} |  6 +--
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  4 +-
 ...-PortalCreateEvent-for-exit-portals.patch} |  4 +-
 ...=> 0247-Player.setPlayerProfile-API.patch} |  8 ++--
 ...h => 0248-Fix-Dragon-Server-Crashes.patch} |  4 +-
 ...patch => 0249-getPlayerUniqueId-API.patch} |  4 +-
 ...ake-player-data-saving-configurable.patch} |  6 +--
 ...e-legacy-ping-handler-more-reliable.patch} |  4 +-
 ...erverListPingEvent-for-legacy-pings.patch} |  6 +--
 ...3-Flag-to-disable-the-channel-limit.patch} |  4 +-
 ...-method-to-open-already-placed-sign.patch} |  4 +-
 ...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 => 0258-EndermanEscapeEvent.patch} |  4 +-
 ...h => 0259-Enderman.teleportRandomly.patch} |  6 +--
 ...260-Block-Enderpearl-Travel-Exploit.patch} |  6 +--
 ...d.spawnParticle-API-and-add-Builder.patch} |  6 +--
 ...h => 0262-EndermanAttackPlayerEvent.patch} |  4 +-
 ...tch => 0263-WitchConsumePotionEvent.patch} |  4 +-
 ...patch => 0264-WitchThrowPotionEvent.patch} |  4 +-
 ...tem-entities-with-World.spawnEntity.patch} |  4 +-
 ...oad-chunks-for-villager-door-checks.patch} |  4 +-
 ...patch => 0267-WitchReadyPotionEvent.patch} |  4 +-
 ...268-ItemStack-getMaxItemUseDuration.patch} |  8 ++--
 ...ement-EntityTeleportEndGatewayEvent.patch} |  4 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  4 +-
 ...move-entities-on-dimension-teleport.patch} |  8 ++--
 ...ch => 0272-Fix-CraftEntity-hashCode.patch} |  4 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |  6 +--
 ...ls-when-failing-to-save-player-data.patch} |  4 +-
 ...-shield-blocking-delay-configurable.patch} |  8 ++--
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |  4 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  8 ++--
 ...patch => 0278-PlayerReadyArrowEvent.patch} |  4 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |  4 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |  4 +-
 ...patch => 0281-Expand-Explosions-API.patch} |  4 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  6 +--
 ...-API.patch => 0283-RangedEntity-API.patch} | 18 +++----
 ...d-SentientNPC-Interface-to-Entities.patch} | 14 +++---
 ...eHitEvent-to-include-the-BlockFace-.patch} |  4 +-
 ...o-disable-ender-dragon-legacy-check.patch} |  6 +--
 ...-Implement-World.getEntity-UUID-API.patch} |  4 +-
 ...0288-InventoryCloseEvent-Reason-API.patch} | 20 ++++----
 ...ps-for-Entity-TileEntity-Current-Ch.patch} |  6 +--
 ...0290-Configurable-Bed-Search-Radius.patch} |  6 +--
 ...-API.patch => 0291-Vex-getOwner-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 +-
 ...pawn-if-entity-is-in-a-chunk-schedu.patch} |  4 +-
 ...-if-stack-size-above-max-stack-size.patch} |  4 +-
 ...97-Use-asynchronous-Log4j-2-loggers.patch} |  6 +--
 ...more-information-to-Entity.toString.patch} |  6 +--
 ...es-option-to-debug-dupe-uuid-issues.patch} |  6 +--
 ...300-Additional-Paper-Config-options.patch} |  6 +--
 ... 0301-Duplicate-UUID-Resolve-Option.patch} | 12 ++---
 ...ch => 0302-Add-async-chunk-load-API.patch} |  4 +-
 ...llowance-of-Permanent-Chunk-Loaders.patch} |  6 +--
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  6 +--
 ...pers.patch => 0305-Optimize-Hoppers.patch} | 10 ++--
 ...tch => 0306-Don-t-save-Proto-Chunks.patch} |  6 +--
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 320 files changed, 790 insertions(+), 882 deletions(-)
 rename Spigot-API-Patches/{0013-Automatically-disable-plugins-that-fail-to-load.patch => 0012-Automatically-disable-plugins-that-fail-to-load.patch} (94%)
 delete mode 100644 Spigot-API-Patches/0012-Made-EntityDismountEvent-Cancellable.patch
 rename Spigot-API-Patches/{0014-Expose-server-CommandMap.patch => 0013-Expose-server-CommandMap.patch} (95%)
 rename Spigot-API-Patches/{0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch => 0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch} (97%)
 rename Spigot-API-Patches/{0016-Player-Tab-List-and-Title-APIs.patch => 0015-Player-Tab-List-and-Title-APIs.patch} (99%)
 rename Spigot-API-Patches/{0017-Add-exception-reporting-event.patch => 0016-Add-exception-reporting-event.patch} (99%)
 rename Spigot-API-Patches/{0018-Fix-ServerListPingEvent-flagging-as-Async.patch => 0017-Fix-ServerListPingEvent-flagging-as-Async.patch} (97%)
 rename Spigot-API-Patches/{0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch => 0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch} (97%)
 rename Spigot-API-Patches/{0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (93%)
 rename Spigot-API-Patches/{0021-Complete-resource-pack-API.patch => 0020-Complete-resource-pack-API.patch} (98%)
 rename Spigot-API-Patches/{0022-Use-ASM-for-event-executors.patch => 0021-Use-ASM-for-event-executors.patch} (99%)
 rename Spigot-API-Patches/{0023-Add-a-call-helper-to-Event.patch => 0022-Add-a-call-helper-to-Event.patch} (94%)
 rename Spigot-API-Patches/{0024-Add-sender-name-to-commands.yml-replacement.patch => 0023-Add-sender-name-to-commands.yml-replacement.patch} (96%)
 rename Spigot-API-Patches/{0025-Add-command-to-reload-permissions.yml-and-require-co.patch => 0024-Add-command-to-reload-permissions.yml-and-require-co.patch} (98%)
 rename Spigot-API-Patches/{0026-Custom-replacement-for-eaten-items.patch => 0025-Custom-replacement-for-eaten-items.patch} (97%)
 rename Spigot-API-Patches/{0027-Access-items-by-EquipmentSlot.patch => 0026-Access-items-by-EquipmentSlot.patch} (94%)
 rename Spigot-API-Patches/{0028-Entity-AddTo-RemoveFrom-World-Events.patch => 0027-Entity-AddTo-RemoveFrom-World-Events.patch} (97%)
 rename Spigot-API-Patches/{0029-EntityPathfindEvent.patch => 0028-EntityPathfindEvent.patch} (97%)
 rename Spigot-API-Patches/{0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch => 0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch} (98%)
 rename Spigot-API-Patches/{0031-Add-MetadataStoreBase.removeAll-Plugin.patch => 0030-Add-MetadataStoreBase.removeAll-Plugin.patch} (95%)
 rename Spigot-API-Patches/{0032-Add-PlayerUseUnknownEntityEvent.patch => 0031-Add-PlayerUseUnknownEntityEvent.patch} (96%)
 rename Spigot-API-Patches/{0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (99%)
 rename Spigot-API-Patches/{0034-Arrow-pickup-rule-API.patch => 0033-Arrow-pickup-rule-API.patch} (96%)
 rename Spigot-API-Patches/{0035-EntityRegainHealthEvent-isFastRegen-API.patch => 0034-EntityRegainHealthEvent-isFastRegen-API.patch} (96%)
 rename Spigot-API-Patches/{0036-LootTable-API.patch => 0035-LootTable-API.patch} (99%)
 rename Spigot-API-Patches/{0037-Add-EntityZapEvent.patch => 0036-Add-EntityZapEvent.patch} (98%)
 rename Spigot-API-Patches/{0038-Misc-Utils.patch => 0037-Misc-Utils.patch} (94%)
 rename Spigot-API-Patches/{0039-Allow-Reloading-of-Command-Aliases.patch => 0038-Allow-Reloading-of-Command-Aliases.patch} (98%)
 rename Spigot-API-Patches/{0040-Add-source-to-PlayerExpChangeEvent.patch => 0039-Add-source-to-PlayerExpChangeEvent.patch} (96%)
 rename Spigot-API-Patches/{0041-Add-ProjectileCollideEvent.patch => 0040-Add-ProjectileCollideEvent.patch} (97%)
 rename Spigot-API-Patches/{0042-Add-String-based-Action-Bar-API.patch => 0041-Add-String-based-Action-Bar-API.patch} (98%)
 rename Spigot-API-Patches/{0043-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0042-Add-API-methods-to-control-if-armour-stands-can-move.patch} (94%)
 rename Spigot-API-Patches/{0044-IllegalPacketEvent.patch => 0043-IllegalPacketEvent.patch} (97%)
 rename Spigot-API-Patches/{0045-Fireworks-API-s.patch => 0044-Fireworks-API-s.patch} (93%)
 rename Spigot-API-Patches/{0046-PlayerTeleportEndGatewayEvent.patch => 0045-PlayerTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-API-Patches/{0047-Provide-E-TE-Chunk-count-stat-methods.patch => 0046-Provide-E-TE-Chunk-count-stat-methods.patch} (95%)
 rename Spigot-API-Patches/{0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (98%)
 rename Spigot-API-Patches/{0049-Expose-WorldBorder-isInBounds-Location-check.patch => 0048-Expose-WorldBorder-isInBounds-Location-check.patch} (94%)
 rename Spigot-API-Patches/{0050-Add-configuration-option-to-prevent-player-names-fro.patch => 0049-Add-configuration-option-to-prevent-player-names-fro.patch} (97%)
 rename Spigot-API-Patches/{0051-Fix-upstream-javadoc-warnings-and-errors.patch => 0050-Fix-upstream-javadoc-warnings-and-errors.patch} (99%)
 rename Spigot-API-Patches/{0052-Item-canEntityPickup.patch => 0051-Item-canEntityPickup.patch} (93%)
 rename Spigot-API-Patches/{0053-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0052-PlayerPickupItemEvent-setFlyAtPlayer.patch} (96%)
 rename Spigot-API-Patches/{0054-PlayerAttemptPickupItemEvent.patch => 0053-PlayerAttemptPickupItemEvent.patch} (97%)
 rename Spigot-API-Patches/{0055-Add-UnknownCommandEvent.patch => 0054-Add-UnknownCommandEvent.patch} (97%)
 rename Spigot-API-Patches/{0056-Basic-PlayerProfile-API.patch => 0055-Basic-PlayerProfile-API.patch} (99%)
 rename Spigot-API-Patches/{0057-Shoulder-Entities-Release-API.patch => 0056-Shoulder-Entities-Release-API.patch} (95%)
 rename Spigot-API-Patches/{0058-Profile-Lookup-Events.patch => 0057-Profile-Lookup-Events.patch} (98%)
 rename Spigot-API-Patches/{0059-Entity-fromMobSpawner.patch => 0058-Entity-fromMobSpawner.patch} (92%)
 rename Spigot-API-Patches/{0060-Improve-the-Saddle-API-for-Horses.patch => 0059-Improve-the-Saddle-API-for-Horses.patch} (97%)
 rename Spigot-API-Patches/{0061-ensureServerConversions-API.patch => 0060-ensureServerConversions-API.patch} (97%)
 rename Spigot-API-Patches/{0062-Add-getI18NDisplayName-API.patch => 0061-Add-getI18NDisplayName-API.patch} (96%)
 rename Spigot-API-Patches/{0063-ProfileWhitelistVerifyEvent.patch => 0062-ProfileWhitelistVerifyEvent.patch} (98%)
 rename Spigot-API-Patches/{0064-Make-plugins-list-alphabetical.patch => 0063-Make-plugins-list-alphabetical.patch} (96%)
 rename Spigot-API-Patches/{0065-LivingEntity-setKiller.patch => 0064-LivingEntity-setKiller.patch} (94%)
 rename Spigot-API-Patches/{0066-Handle-plugin-prefixes-in-implementation-logging-con.patch => 0065-Handle-plugin-prefixes-in-implementation-logging-con.patch} (96%)
 rename Spigot-API-Patches/{0067-Allow-plugins-to-use-SLF4J-for-logging.patch => 0066-Allow-plugins-to-use-SLF4J-for-logging.patch} (94%)
 rename Spigot-API-Patches/{0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch => 0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch} (98%)
 rename Spigot-API-Patches/{0069-Add-PlayerJumpEvent.patch => 0068-Add-PlayerJumpEvent.patch} (98%)
 rename Spigot-API-Patches/{0070-Expose-client-protocol-version-and-virtual-host.patch => 0069-Expose-client-protocol-version-and-virtual-host.patch} (97%)
 rename Spigot-API-Patches/{0071-Add-PlayerArmorChangeEvent.patch => 0070-Add-PlayerArmorChangeEvent.patch} (98%)
 rename Spigot-API-Patches/{0072-API-to-get-a-BlockState-without-a-snapshot.patch => 0071-API-to-get-a-BlockState-without-a-snapshot.patch} (94%)
 rename Spigot-API-Patches/{0073-AsyncTabCompleteEvent.patch => 0072-AsyncTabCompleteEvent.patch} (99%)
 rename Spigot-API-Patches/{0074-Display-warning-on-deprecated-recipe-API.patch => 0073-Display-warning-on-deprecated-recipe-API.patch} (97%)
 rename Spigot-API-Patches/{0075-PlayerPickupExperienceEvent.patch => 0074-PlayerPickupExperienceEvent.patch} (98%)
 rename Spigot-API-Patches/{0076-ExperienceOrbMergeEvent.patch => 0075-ExperienceOrbMergeEvent.patch} (98%)
 rename Spigot-API-Patches/{0077-Ability-to-apply-mending-to-XP-API.patch => 0076-Ability-to-apply-mending-to-XP-API.patch} (96%)
 rename Spigot-API-Patches/{0078-PreCreatureSpawnEvent.patch => 0077-PreCreatureSpawnEvent.patch} (98%)
 rename Spigot-API-Patches/{0079-PlayerNaturallySpawnCreaturesEvent.patch => 0078-PlayerNaturallySpawnCreaturesEvent.patch} (97%)
 rename Spigot-API-Patches/{0080-Add-SkullMeta.setPlayerProfile-API.patch => 0079-Add-SkullMeta.setPlayerProfile-API.patch} (95%)
 rename Spigot-API-Patches/{0081-Fill-Profile-Property-Events.patch => 0080-Fill-Profile-Property-Events.patch} (98%)
 rename Spigot-API-Patches/{0082-PlayerAdvancementCriterionGrantEvent.patch => 0081-PlayerAdvancementCriterionGrantEvent.patch} (97%)
 rename Spigot-API-Patches/{0083-Add-ArmorStand-Item-Meta.patch => 0082-Add-ArmorStand-Item-Meta.patch} (97%)
 rename Spigot-API-Patches/{0084-Optimize-Hoppers.patch => 0083-Optimize-Hoppers.patch} (96%)
 rename Spigot-API-Patches/{0085-Tameable-getOwnerUniqueId-API.patch => 0084-Tameable-getOwnerUniqueId-API.patch} (94%)
 rename Spigot-API-Patches/{0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (96%)
 rename Spigot-API-Patches/{0087-Add-extended-PaperServerListPingEvent.patch => 0086-Add-extended-PaperServerListPingEvent.patch} (99%)
 rename Spigot-API-Patches/{0088-Player.setPlayerProfile-API.patch => 0087-Player.setPlayerProfile-API.patch} (95%)
 rename Spigot-API-Patches/{0089-getPlayerUniqueId-API.patch => 0088-getPlayerUniqueId-API.patch} (95%)
 rename Spigot-API-Patches/{0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch => 0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch} (94%)
 rename Spigot-API-Patches/{0091-Add-method-to-open-already-placed-sign.patch => 0090-Add-method-to-open-already-placed-sign.patch} (92%)
 rename Spigot-API-Patches/{0092-Add-version-history-to-version-command.patch => 0091-Add-version-history-to-version-command.patch} (99%)
 rename Spigot-API-Patches/{0093-Add-Ban-Methods-to-Player-Objects.patch => 0092-Add-Ban-Methods-to-Player-Objects.patch} (99%)
 rename Spigot-API-Patches/{0094-EndermanEscapeEvent.patch => 0093-EndermanEscapeEvent.patch} (97%)
 rename Spigot-API-Patches/{0095-Enderman.teleportRandomly.patch => 0094-Enderman.teleportRandomly.patch} (93%)
 rename Spigot-API-Patches/{0096-Additional-world.getNearbyEntities-API-s.patch => 0095-Additional-world.getNearbyEntities-API-s.patch} (99%)
 rename Spigot-API-Patches/{0097-Location.isChunkLoaded-API.patch => 0096-Location.isChunkLoaded-API.patch} (91%)
 rename Spigot-API-Patches/{0098-Expand-World.spawnParticle-API-and-add-Builder.patch => 0097-Expand-World.spawnParticle-API-and-add-Builder.patch} (99%)
 rename Spigot-API-Patches/{0099-EndermanAttackPlayerEvent.patch => 0098-EndermanAttackPlayerEvent.patch} (98%)
 rename Spigot-API-Patches/{0100-Close-Plugin-Class-Loaders-on-Disable.patch => 0099-Close-Plugin-Class-Loaders-on-Disable.patch} (99%)
 rename Spigot-API-Patches/{0101-WitchConsumePotionEvent.patch => 0100-WitchConsumePotionEvent.patch} (98%)
 rename Spigot-API-Patches/{0102-WitchThrowPotionEvent.patch => 0101-WitchThrowPotionEvent.patch} (97%)
 rename Spigot-API-Patches/{0103-Location.toBlockLocation-toCenterLocation.patch => 0102-Location.toBlockLocation-toCenterLocation.patch} (95%)
 rename Spigot-API-Patches/{0104-PotionEffect-clone-methods.patch => 0103-PotionEffect-clone-methods.patch} (96%)
 rename Spigot-API-Patches/{0105-WitchReadyPotionEvent.patch => 0104-WitchReadyPotionEvent.patch} (97%)
 rename Spigot-API-Patches/{0106-ItemStack-getMaxItemUseDuration.patch => 0105-ItemStack-getMaxItemUseDuration.patch} (93%)
 rename Spigot-API-Patches/{0107-Add-EntityTeleportEndGatewayEvent.patch => 0106-Add-EntityTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-API-Patches/{0108-Add-SentientNPC-Interface-to-Entities.patch => 0107-Add-SentientNPC-Interface-to-Entities.patch} (99%)
 rename Spigot-API-Patches/{0109-Make-shield-blocking-delay-configurable.patch => 0108-Make-shield-blocking-delay-configurable.patch} (94%)
 rename Spigot-API-Patches/{0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (96%)
 rename Spigot-API-Patches/{0111-Add-getNearbyXXX-methods-to-Location.patch => 0110-Add-getNearbyXXX-methods-to-Location.patch} (99%)
 rename Spigot-API-Patches/{0112-PlayerReadyArrowEvent.patch => 0111-PlayerReadyArrowEvent.patch} (98%)
 rename Spigot-API-Patches/{0113-Add-EntityKnockbackByEntityEvent.patch => 0112-Add-EntityKnockbackByEntityEvent.patch} (97%)
 rename Spigot-API-Patches/{0114-Expand-Explosions-API.patch => 0113-Expand-Explosions-API.patch} (99%)
 rename Spigot-API-Patches/{0115-ItemStack-API-additions-for-quantity-flags-lore.patch => 0114-ItemStack-API-additions-for-quantity-flags-lore.patch} (98%)
 rename Spigot-API-Patches/{0116-LivingEntity-Hand-Raised-Item-Use-API.patch => 0115-LivingEntity-Hand-Raised-Item-Use-API.patch} (96%)
 rename Spigot-API-Patches/{0117-RangedEntity-API.patch => 0116-RangedEntity-API.patch} (98%)
 rename Spigot-API-Patches/{0118-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch => 0117-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch} (96%)
 rename Spigot-API-Patches/{0119-Add-World.getEntity-UUID-API.patch => 0118-Add-World.getEntity-UUID-API.patch} (93%)
 rename Spigot-API-Patches/{0120-InventoryCloseEvent-Reason-API.patch => 0119-InventoryCloseEvent-Reason-API.patch} (97%)
 rename Spigot-API-Patches/{0121-Entity-getChunk-API.patch => 0120-Entity-getChunk-API.patch} (93%)
 rename Spigot-API-Patches/{0122-Vex-getOwner-API.patch => 0121-Vex-getOwner-API.patch} (92%)
 rename Spigot-API-Patches/{0123-Add-an-asterisk-to-legacy-API-plugins.patch => 0122-Add-an-asterisk-to-legacy-API-plugins.patch} (97%)
 rename Spigot-API-Patches/{0124-Use-specific-1.13-versioning-branch-build-name.patch => 0123-Use-specific-1.13-versioning-branch-build-name.patch} (97%)
 rename Spigot-API-Patches/{0125-Add-async-chunk-load-API.patch => 0124-Add-async-chunk-load-API.patch} (98%)
 delete mode 100644 Spigot-Server-Patches/0110-Vehicle-Event-Cancellation-Changes.patch
 rename Spigot-Server-Patches/{0111-remove-null-possibility-for-getServer-singleton.patch => 0110-remove-null-possibility-for-getServer-singleton.patch} (95%)
 rename Spigot-Server-Patches/{0112-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0111-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (96%)
 rename Spigot-Server-Patches/{0113-LootTable-API-Replenishable-Lootables-Feature.patch => 0112-LootTable-API-Replenishable-Lootables-Feature.patch} (98%)
 rename Spigot-Server-Patches/{0114-Do-not-load-chunks-for-pathfinding.patch => 0113-Do-not-load-chunks-for-pathfinding.patch} (87%)
 rename Spigot-Server-Patches/{0115-Entity-Tracking-Improvements.patch => 0114-Entity-Tracking-Improvements.patch} (96%)
 rename Spigot-Server-Patches/{0116-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0115-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (92%)
 rename Spigot-Server-Patches/{0117-Fix-Chunk-Unload-Queue-Issues.patch => 0116-Fix-Chunk-Unload-Queue-Issues.patch} (92%)
 rename Spigot-Server-Patches/{0118-System-property-for-disabling-watchdoge.patch => 0117-System-property-for-disabling-watchdoge.patch} (90%)
 rename Spigot-Server-Patches/{0119-Optimize-EAR.patch => 0118-Optimize-EAR.patch} (96%)
 rename Spigot-Server-Patches/{0120-Optimize-UserCache-Thread-Safe.patch => 0119-Optimize-UserCache-Thread-Safe.patch} (96%)
 rename Spigot-Server-Patches/{0121-Avoid-blocking-on-Network-Manager-creation.patch => 0120-Avoid-blocking-on-Network-Manager-creation.patch} (96%)
 rename Spigot-Server-Patches/{0122-Optional-TNT-doesn-t-move-in-water.patch => 0121-Optional-TNT-doesn-t-move-in-water.patch} (94%)
 rename Spigot-Server-Patches/{0123-Faster-redstone-torch-rapid-clock-removal.patch => 0122-Faster-redstone-torch-rapid-clock-removal.patch} (94%)
 rename Spigot-Server-Patches/{0124-Ensure-Chunks-never-ever-load-async.patch => 0123-Ensure-Chunks-never-ever-load-async.patch} (95%)
 rename Spigot-Server-Patches/{0125-Add-server-name-parameter.patch => 0124-Add-server-name-parameter.patch} (90%)
 rename Spigot-Server-Patches/{0126-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0125-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (95%)
 rename Spigot-Server-Patches/{0127-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (96%)
 rename Spigot-Server-Patches/{0128-Fix-Double-World-Add-issues.patch => 0127-Fix-Double-World-Add-issues.patch} (93%)
 rename Spigot-Server-Patches/{0129-Fix-Old-Sign-Conversion.patch => 0128-Fix-Old-Sign-Conversion.patch} (95%)
 rename Spigot-Server-Patches/{0130-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0129-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (90%)
 rename Spigot-Server-Patches/{0131-More-informative-vehicle-moved-wrongly-message.patch => 0130-More-informative-vehicle-moved-wrongly-message.patch} (90%)
 rename Spigot-Server-Patches/{0132-Re-track-players-that-dismount-from-other-players.patch => 0131-Re-track-players-that-dismount-from-other-players.patch} (91%)
 rename Spigot-Server-Patches/{0133-Add-setting-for-proxy-online-mode-status.patch => 0132-Add-setting-for-proxy-online-mode-status.patch} (93%)
 rename Spigot-Server-Patches/{0134-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0133-Optimise-BlockStateEnum-hashCode-and-equals.patch} (96%)
 rename Spigot-Server-Patches/{0135-Disable-ticking-of-snow-blocks.patch => 0134-Disable-ticking-of-snow-blocks.patch} (89%)
 rename Spigot-Server-Patches/{0136-Fix-AIOOBE-in-inventory-handling.patch => 0135-Fix-AIOOBE-in-inventory-handling.patch} (91%)
 rename Spigot-Server-Patches/{0137-Configurable-packet-in-spam-threshold.patch => 0136-Configurable-packet-in-spam-threshold.patch} (94%)
 rename Spigot-Server-Patches/{0138-Configurable-flying-kick-messages.patch => 0137-Configurable-flying-kick-messages.patch} (94%)
 rename Spigot-Server-Patches/{0139-Auto-Save-Improvements.patch => 0138-Auto-Save-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0140-Chunk-registration-fixes.patch => 0139-Chunk-registration-fixes.patch} (90%)
 rename Spigot-Server-Patches/{0141-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0140-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (89%)
 rename Spigot-Server-Patches/{0142-Auto-fix-bad-Y-levels-on-player-login.patch => 0141-Auto-fix-bad-Y-levels-on-player-login.patch} (90%)
 rename Spigot-Server-Patches/{0143-Disable-Vanilla-Chunk-GC.patch => 0142-Disable-Vanilla-Chunk-GC.patch} (92%)
 rename Spigot-Server-Patches/{0144-Option-to-remove-corrupt-tile-entities.patch => 0143-Option-to-remove-corrupt-tile-entities.patch} (93%)
 rename Spigot-Server-Patches/{0145-Add-EntityZapEvent.patch => 0144-Add-EntityZapEvent.patch} (96%)
 rename Spigot-Server-Patches/{0146-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0145-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (94%)
 rename Spigot-Server-Patches/{0147-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (94%)
 rename Spigot-Server-Patches/{0148-Chunk-Save-Stats-Debug-Option.patch => 0147-Chunk-Save-Stats-Debug-Option.patch} (97%)
 rename Spigot-Server-Patches/{0149-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0148-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (94%)
 rename Spigot-Server-Patches/{0150-Cache-user-authenticator-threads.patch => 0149-Cache-user-authenticator-threads.patch} (96%)
 rename Spigot-Server-Patches/{0151-Optimize-Network-Queue.patch => 0150-Optimize-Network-Queue.patch} (90%)
 rename Spigot-Server-Patches/{0152-Optimise-removeQueue.patch => 0151-Optimise-removeQueue.patch} (96%)
 rename Spigot-Server-Patches/{0153-Allow-Reloading-of-Command-Aliases.patch => 0152-Allow-Reloading-of-Command-Aliases.patch} (93%)
 rename Spigot-Server-Patches/{0154-Add-source-to-PlayerExpChangeEvent.patch => 0153-Add-source-to-PlayerExpChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0155-Optimize-World.isLoaded-BlockPosition-Z.patch => 0154-Optimize-World.isLoaded-BlockPosition-Z.patch} (90%)
 rename Spigot-Server-Patches/{0156-Don-t-let-fishinghooks-use-portals.patch => 0155-Don-t-let-fishinghooks-use-portals.patch} (91%)
 rename Spigot-Server-Patches/{0157-Add-ProjectileCollideEvent.patch => 0156-Add-ProjectileCollideEvent.patch} (98%)
 rename Spigot-Server-Patches/{0158-Prevent-Pathfinding-out-of-World-Border.patch => 0157-Prevent-Pathfinding-out-of-World-Border.patch} (93%)
 rename Spigot-Server-Patches/{0159-Bound-Treasure-Maps-to-World-Border.patch => 0158-Bound-Treasure-Maps-to-World-Border.patch} (95%)
 rename Spigot-Server-Patches/{0160-Configurable-Cartographer-Treasure-Maps.patch => 0159-Configurable-Cartographer-Treasure-Maps.patch} (93%)
 rename Spigot-Server-Patches/{0161-Optimize-ItemStack.isEmpty.patch => 0160-Optimize-ItemStack.isEmpty.patch} (89%)
 rename Spigot-Server-Patches/{0162-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0161-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%)
 rename Spigot-Server-Patches/{0163-Add-option-to-remove-invalid-statistics.patch => 0162-Add-option-to-remove-invalid-statistics.patch} (94%)
 rename Spigot-Server-Patches/{0164-Properly-fix-item-duplication-bug.patch => 0163-Properly-fix-item-duplication-bug.patch} (91%)
 rename Spigot-Server-Patches/{0165-String-based-Action-Bar-API.patch => 0164-String-based-Action-Bar-API.patch} (95%)
 rename Spigot-Server-Patches/{0166-Activation-Range-Improvements.patch => 0165-Activation-Range-Improvements.patch} (96%)
 rename Spigot-Server-Patches/{0167-Firework-API-s.patch => 0166-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0168-PlayerTeleportEndGatewayEvent.patch => 0167-PlayerTeleportEndGatewayEvent.patch} (92%)
 rename Spigot-Server-Patches/{0169-ShulkerBox-Dupe-Prevention.patch => 0168-ShulkerBox-Dupe-Prevention.patch} (90%)
 rename Spigot-Server-Patches/{0170-Provide-E-TE-Chunk-count-stat-methods.patch => 0169-Provide-E-TE-Chunk-count-stat-methods.patch} (93%)
 rename Spigot-Server-Patches/{0171-Enforce-Sync-Player-Saves.patch => 0170-Enforce-Sync-Player-Saves.patch} (91%)
 rename Spigot-Server-Patches/{0172-Enforce-Sync-Chunk-Unloads.patch => 0171-Enforce-Sync-Chunk-Unloads.patch} (92%)
 rename Spigot-Server-Patches/{0173-Don-t-allow-entities-to-ride-themselves-572.patch => 0172-Don-t-allow-entities-to-ride-themselves-572.patch} (89%)
 rename Spigot-Server-Patches/{0174-Fix-block-break-desync.patch => 0173-Fix-block-break-desync.patch} (90%)
 rename Spigot-Server-Patches/{0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (96%)
 rename Spigot-Server-Patches/{0176-Cap-Entity-Collisions.patch => 0175-Cap-Entity-Collisions.patch} (93%)
 rename Spigot-Server-Patches/{0177-Remove-CraftScheduler-Async-Task-Debugger.patch => 0176-Remove-CraftScheduler-Async-Task-Debugger.patch} (96%)
 rename Spigot-Server-Patches/{0178-Shame-on-you-Mojang.patch => 0177-Shame-on-you-Mojang.patch} (91%)
 rename Spigot-Server-Patches/{0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (91%)
 rename Spigot-Server-Patches/{0180-Do-not-let-armorstands-drown.patch => 0179-Do-not-let-armorstands-drown.patch} (93%)
 rename Spigot-Server-Patches/{0181-Properly-handle-async-calls-to-restart-the-server.patch => 0180-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename Spigot-Server-Patches/{0182-Add-system-property-to-disable-book-size-limits.patch => 0181-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0183-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0182-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (94%)
 rename Spigot-Server-Patches/{0184-Add-configuration-option-to-prevent-player-names-fro.patch => 0183-Add-configuration-option-to-prevent-player-names-fro.patch} (91%)
 rename Spigot-Server-Patches/{0185-Use-TerminalConsoleAppender-for-console-improvements.patch => 0184-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0186-provide-a-configurable-option-to-disable-creeper-lin.patch => 0185-provide-a-configurable-option-to-disable-creeper-lin.patch} (92%)
 rename Spigot-Server-Patches/{0187-Item-canEntityPickup.patch => 0186-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0188-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0187-PlayerPickupItemEvent-setFlyAtPlayer.patch} (95%)
 rename Spigot-Server-Patches/{0189-PlayerAttemptPickupItemEvent.patch => 0188-PlayerAttemptPickupItemEvent.patch} (94%)
 rename Spigot-Server-Patches/{0190-Add-UnknownCommandEvent.patch => 0189-Add-UnknownCommandEvent.patch} (93%)
 rename Spigot-Server-Patches/{0191-Basic-PlayerProfile-API.patch => 0190-Basic-PlayerProfile-API.patch} (98%)
 rename Spigot-Server-Patches/{0192-Shoulder-Entities-Release-API.patch => 0191-Shoulder-Entities-Release-API.patch} (96%)
 rename Spigot-Server-Patches/{0193-Profile-Lookup-Events.patch => 0192-Profile-Lookup-Events.patch} (97%)
 rename Spigot-Server-Patches/{0194-Block-player-logins-during-server-shutdown.patch => 0193-Block-player-logins-during-server-shutdown.patch} (90%)
 rename Spigot-Server-Patches/{0195-Entity-fromMobSpawner.patch => 0194-Entity-fromMobSpawner.patch} (95%)
 rename Spigot-Server-Patches/{0196-Fix-Anvil-Level-sync-to-client.patch => 0195-Fix-Anvil-Level-sync-to-client.patch} (93%)
 rename Spigot-Server-Patches/{0197-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0196-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (90%)
 rename Spigot-Server-Patches/{0198-Improve-the-Saddle-API-for-Horses.patch => 0197-Improve-the-Saddle-API-for-Horses.patch} (94%)
 rename Spigot-Server-Patches/{0199-Implement-ensureServerConversions-API.patch => 0198-Implement-ensureServerConversions-API.patch} (91%)
 rename Spigot-Server-Patches/{0200-Implement-getI18NDisplayName.patch => 0199-Implement-getI18NDisplayName.patch} (92%)
 rename Spigot-Server-Patches/{0201-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0200-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (91%)
 rename Spigot-Server-Patches/{0202-ProfileWhitelistVerifyEvent.patch => 0201-ProfileWhitelistVerifyEvent.patch} (96%)
 rename Spigot-Server-Patches/{0203-Fix-this-stupid-bullshit.patch => 0202-Fix-this-stupid-bullshit.patch} (94%)
 rename Spigot-Server-Patches/{0204-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0203-Ocelot-despawns-should-honor-nametags-and-leash.patch} (89%)
 rename Spigot-Server-Patches/{0205-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0204-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (92%)
 rename Spigot-Server-Patches/{0206-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0205-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (92%)
 rename Spigot-Server-Patches/{0207-Allow-specifying-a-custom-authentication-servers-dow.patch => 0206-Allow-specifying-a-custom-authentication-servers-dow.patch} (94%)
 rename Spigot-Server-Patches/{0208-LivingEntity-setKiller.patch => 0207-LivingEntity-setKiller.patch} (92%)
 rename Spigot-Server-Patches/{0209-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0208-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0210-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0209-Handle-plugin-prefixes-using-Log4J-configuration.patch} (95%)
 rename Spigot-Server-Patches/{0211-Include-Log4J2-SLF4J-implementation.patch => 0210-Include-Log4J2-SLF4J-implementation.patch} (87%)
 rename Spigot-Server-Patches/{0212-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0211-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (95%)
 rename Spigot-Server-Patches/{0213-Add-PlayerJumpEvent.patch => 0212-Add-PlayerJumpEvent.patch} (96%)
 rename Spigot-Server-Patches/{0214-handle-PacketPlayInKeepAlive-async.patch => 0213-handle-PacketPlayInKeepAlive-async.patch} (95%)
 rename Spigot-Server-Patches/{0215-Expose-client-protocol-version-and-virtual-host.patch => 0214-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename Spigot-Server-Patches/{0216-revert-serverside-behavior-of-keepalives.patch => 0215-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0217-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0216-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (92%)
 rename Spigot-Server-Patches/{0218-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0217-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (97%)
 rename Spigot-Server-Patches/{0219-Option-for-maximum-exp-value-when-merging-orbs.patch => 0218-Option-for-maximum-exp-value-when-merging-orbs.patch} (95%)
 rename Spigot-Server-Patches/{0220-Add-PlayerArmorChangeEvent.patch => 0219-Add-PlayerArmorChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0221-Prevent-logins-from-being-processed-when-the-player-.patch => 0220-Prevent-logins-from-being-processed-when-the-player-.patch} (91%)
 rename Spigot-Server-Patches/{0222-use-CB-BlockState-implementations-for-captured-block.patch => 0221-use-CB-BlockState-implementations-for-captured-block.patch} (94%)
 rename Spigot-Server-Patches/{0223-API-to-get-a-BlockState-without-a-snapshot.patch => 0222-API-to-get-a-BlockState-without-a-snapshot.patch} (96%)
 rename Spigot-Server-Patches/{0224-AsyncTabCompleteEvent.patch => 0223-AsyncTabCompleteEvent.patch} (96%)
 rename Spigot-Server-Patches/{0225-Avoid-NPE-in-PathfinderGoalTempt.patch => 0224-Avoid-NPE-in-PathfinderGoalTempt.patch} (89%)
 rename Spigot-Server-Patches/{0226-PlayerPickupExperienceEvent.patch => 0225-PlayerPickupExperienceEvent.patch} (91%)
 rename Spigot-Server-Patches/{0227-ExperienceOrbMergeEvent.patch => 0226-ExperienceOrbMergeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0228-Ability-to-apply-mending-to-XP-API.patch => 0227-Ability-to-apply-mending-to-XP-API.patch} (95%)
 rename Spigot-Server-Patches/{0229-Configurable-Chunks-Sends-per-Tick-setting.patch => 0228-Configurable-Chunks-Sends-per-Tick-setting.patch} (92%)
 rename Spigot-Server-Patches/{0230-Configurable-Max-Chunk-Gens-per-Tick.patch => 0229-Configurable-Max-Chunk-Gens-per-Tick.patch} (95%)
 rename Spigot-Server-Patches/{0231-Make-max-squid-spawn-height-configurable.patch => 0230-Make-max-squid-spawn-height-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0232-PreCreatureSpawnEvent.patch => 0231-PreCreatureSpawnEvent.patch} (97%)
 rename Spigot-Server-Patches/{0233-PlayerNaturallySpawnCreaturesEvent.patch => 0232-PlayerNaturallySpawnCreaturesEvent.patch} (93%)
 rename Spigot-Server-Patches/{0234-Add-SkullMeta.setPlayerProfile-API.patch => 0233-Add-SkullMeta.setPlayerProfile-API.patch} (94%)
 rename Spigot-Server-Patches/{0235-Fill-Profile-Property-Events.patch => 0234-Fill-Profile-Property-Events.patch} (94%)
 rename Spigot-Server-Patches/{0236-PlayerAdvancementCriterionGrantEvent.patch => 0235-PlayerAdvancementCriterionGrantEvent.patch} (90%)
 rename Spigot-Server-Patches/{0237-Add-ArmorStand-Item-Meta.patch => 0236-Add-ArmorStand-Item-Meta.patch} (97%)
 rename Spigot-Server-Patches/{0238-Extend-Player-Interact-cancellation.patch => 0237-Extend-Player-Interact-cancellation.patch} (98%)
 rename Spigot-Server-Patches/{0239-Tameable-getOwnerUniqueId-API.patch => 0238-Tameable-getOwnerUniqueId-API.patch} (91%)
 rename Spigot-Server-Patches/{0240-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (92%)
 rename Spigot-Server-Patches/{0241-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (92%)
 rename Spigot-Server-Patches/{0242-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0243-Disable-Explicit-Network-Manager-Flushing.patch => 0242-Disable-Explicit-Network-Manager-Flushing.patch} (94%)
 rename Spigot-Server-Patches/{0244-Implement-extended-PaperServerListPingEvent.patch => 0243-Implement-extended-PaperServerListPingEvent.patch} (97%)
 rename Spigot-Server-Patches/{0245-Improved-Async-Task-Scheduler.patch => 0244-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0246-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (96%)
 rename Spigot-Server-Patches/{0247-Call-PortalCreateEvent-for-exit-portals.patch => 0246-Call-PortalCreateEvent-for-exit-portals.patch} (98%)
 rename Spigot-Server-Patches/{0248-Player.setPlayerProfile-API.patch => 0247-Player.setPlayerProfile-API.patch} (97%)
 rename Spigot-Server-Patches/{0249-Fix-Dragon-Server-Crashes.patch => 0248-Fix-Dragon-Server-Crashes.patch} (92%)
 rename Spigot-Server-Patches/{0250-getPlayerUniqueId-API.patch => 0249-getPlayerUniqueId-API.patch} (94%)
 rename Spigot-Server-Patches/{0251-Make-player-data-saving-configurable.patch => 0250-Make-player-data-saving-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0252-Make-legacy-ping-handler-more-reliable.patch => 0251-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0253-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0252-Call-PaperServerListPingEvent-for-legacy-pings.patch} (98%)
 rename Spigot-Server-Patches/{0254-Flag-to-disable-the-channel-limit.patch => 0253-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0255-Add-method-to-open-already-placed-sign.patch => 0254-Add-method-to-open-already-placed-sign.patch} (92%)
 rename Spigot-Server-Patches/{0256-Load-version-history-at-server-start.patch => 0255-Load-version-history-at-server-start.patch} (89%)
 rename Spigot-Server-Patches/{0257-Configurable-sprint-interruption-on-attack.patch => 0256-Configurable-sprint-interruption-on-attack.patch} (92%)
 rename Spigot-Server-Patches/{0258-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (86%)
 rename Spigot-Server-Patches/{0259-EndermanEscapeEvent.patch => 0258-EndermanEscapeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0260-Enderman.teleportRandomly.patch => 0259-Enderman.teleportRandomly.patch} (91%)
 rename Spigot-Server-Patches/{0261-Block-Enderpearl-Travel-Exploit.patch => 0260-Block-Enderpearl-Travel-Exploit.patch} (93%)
 rename Spigot-Server-Patches/{0262-Expand-World.spawnParticle-API-and-add-Builder.patch => 0261-Expand-World.spawnParticle-API-and-add-Builder.patch} (96%)
 rename Spigot-Server-Patches/{0263-EndermanAttackPlayerEvent.patch => 0262-EndermanAttackPlayerEvent.patch} (93%)
 rename Spigot-Server-Patches/{0264-WitchConsumePotionEvent.patch => 0263-WitchConsumePotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0265-WitchThrowPotionEvent.patch => 0264-WitchThrowPotionEvent.patch} (94%)
 rename Spigot-Server-Patches/{0266-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (92%)
 rename Spigot-Server-Patches/{0267-Don-t-load-chunks-for-villager-door-checks.patch => 0266-Don-t-load-chunks-for-villager-door-checks.patch} (90%)
 rename Spigot-Server-Patches/{0268-WitchReadyPotionEvent.patch => 0267-WitchReadyPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0269-ItemStack-getMaxItemUseDuration.patch => 0268-ItemStack-getMaxItemUseDuration.patch} (88%)
 rename Spigot-Server-Patches/{0270-Implement-EntityTeleportEndGatewayEvent.patch => 0269-Implement-EntityTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-Server-Patches/{0271-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (93%)
 rename Spigot-Server-Patches/{0272-Properly-remove-entities-on-dimension-teleport.patch => 0271-Properly-remove-entities-on-dimension-teleport.patch} (91%)
 rename Spigot-Server-Patches/{0273-Fix-CraftEntity-hashCode.patch => 0272-Fix-CraftEntity-hashCode.patch} (94%)
 rename Spigot-Server-Patches/{0274-Configurable-Alternative-LootPool-Luck-Formula.patch => 0273-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename Spigot-Server-Patches/{0275-Print-Error-details-when-failing-to-save-player-data.patch => 0274-Print-Error-details-when-failing-to-save-player-data.patch} (89%)
 rename Spigot-Server-Patches/{0276-Make-shield-blocking-delay-configurable.patch => 0275-Make-shield-blocking-delay-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0277-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (93%)
 rename Spigot-Server-Patches/{0278-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (96%)
 rename Spigot-Server-Patches/{0279-PlayerReadyArrowEvent.patch => 0278-PlayerReadyArrowEvent.patch} (97%)
 rename Spigot-Server-Patches/{0280-Fire-EntityShootBowEvent-for-Illusioner.patch => 0279-Fire-EntityShootBowEvent-for-Illusioner.patch} (93%)
 rename Spigot-Server-Patches/{0281-Implement-EntityKnockbackByEntityEvent.patch => 0280-Implement-EntityKnockbackByEntityEvent.patch} (94%)
 rename Spigot-Server-Patches/{0282-Expand-Explosions-API.patch => 0281-Expand-Explosions-API.patch} (92%)
 rename Spigot-Server-Patches/{0283-LivingEntity-Hand-Raised-Item-Use-API.patch => 0282-LivingEntity-Hand-Raised-Item-Use-API.patch} (94%)
 rename Spigot-Server-Patches/{0284-RangedEntity-API.patch => 0283-RangedEntity-API.patch} (95%)
 rename Spigot-Server-Patches/{0285-Add-SentientNPC-Interface-to-Entities.patch => 0284-Add-SentientNPC-Interface-to-Entities.patch} (96%)
 rename Spigot-Server-Patches/{0286-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch => 0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch} (92%)
 rename Spigot-Server-Patches/{0287-Add-config-to-disable-ender-dragon-legacy-check.patch => 0286-Add-config-to-disable-ender-dragon-legacy-check.patch} (94%)
 rename Spigot-Server-Patches/{0288-Implement-World.getEntity-UUID-API.patch => 0287-Implement-World.getEntity-UUID-API.patch} (89%)
 rename Spigot-Server-Patches/{0289-InventoryCloseEvent-Reason-API.patch => 0288-InventoryCloseEvent-Reason-API.patch} (95%)
 rename Spigot-Server-Patches/{0290-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (96%)
 rename Spigot-Server-Patches/{0291-Configurable-Bed-Search-Radius.patch => 0290-Configurable-Bed-Search-Radius.patch} (96%)
 rename Spigot-Server-Patches/{0292-Vex-getOwner-API.patch => 0291-Vex-getOwner-API.patch} (92%)
 rename Spigot-Server-Patches/{0293-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (88%)
 rename Spigot-Server-Patches/{0294-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0293-Don-t-change-the-Entity-Random-seed-for-squids.patch} (88%)
 rename Spigot-Server-Patches/{0295-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0294-Re-add-vanilla-entity-warnings-for-duplicates.patch} (94%)
 rename Spigot-Server-Patches/{0296-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch => 0295-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch} (92%)
 rename Spigot-Server-Patches/{0297-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0296-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (90%)
 rename Spigot-Server-Patches/{0298-Use-asynchronous-Log4j-2-loggers.patch => 0297-Use-asynchronous-Log4j-2-loggers.patch} (87%)
 rename Spigot-Server-Patches/{0299-add-more-information-to-Entity.toString.patch => 0298-add-more-information-to-Entity.toString.patch} (89%)
 rename Spigot-Server-Patches/{0300-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0301-Additional-Paper-Config-options.patch => 0300-Additional-Paper-Config-options.patch} (90%)
 rename Spigot-Server-Patches/{0302-Duplicate-UUID-Resolve-Option.patch => 0301-Duplicate-UUID-Resolve-Option.patch} (97%)
 rename Spigot-Server-Patches/{0303-Add-async-chunk-load-API.patch => 0302-Add-async-chunk-load-API.patch} (93%)
 rename Spigot-Server-Patches/{0304-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch => 0303-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch} (92%)
 rename Spigot-Server-Patches/{0305-Speedup-BlockPos-by-fixing-inlining.patch => 0304-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0306-Optimize-Hoppers.patch => 0305-Optimize-Hoppers.patch} (98%)
 rename Spigot-Server-Patches/{0307-Don-t-save-Proto-Chunks.patch => 0306-Don-t-save-Proto-Chunks.patch} (93%)

diff --git a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0012-Automatically-disable-plugins-that-fail-to-load.patch
similarity index 94%
rename from Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
rename to Spigot-API-Patches/0012-Automatically-disable-plugins-that-fail-to-load.patch
index eef236b0a7..bd4ae59d0a 100644
--- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/Spigot-API-Patches/0012-Automatically-disable-plugins-that-fail-to-load.patch
@@ -1,4 +1,4 @@
-From 283da38a9b2ea8a978ea570e8446f487caaf6f10 Mon Sep 17 00:00:00 2001
+From 9a230e904d502c69610fe0507d3bbaabc19cd059 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/Spigot-API-Patches/0012-Made-EntityDismountEvent-Cancellable.patch b/Spigot-API-Patches/0012-Made-EntityDismountEvent-Cancellable.patch
deleted file mode 100644
index 3b8d8a99cd..0000000000
--- a/Spigot-API-Patches/0012-Made-EntityDismountEvent-Cancellable.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8afe8ac5e2901bf492b1465e4a5ec43117bebdc2 Mon Sep 17 00:00:00 2001
-From: Nik Gil <nikmanG@users.noreply.github.com>
-Date: Mon, 29 Feb 2016 19:42:10 -0600
-Subject: [PATCH] Made EntityDismountEvent Cancellable
-
-
-diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index 24d4942a..ce989bb1 100644
---- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-@@ -1,6 +1,7 @@
- package org.spigotmc.event.entity;
- 
- import org.bukkit.entity.Entity;
-+import org.bukkit.event.Cancellable;
- import org.bukkit.event.HandlerList;
- import org.bukkit.event.entity.EntityEvent;
- 
-@@ -8,7 +9,7 @@ import org.bukkit.event.entity.EntityEvent;
-  * Called when an entity stops riding another entity.
-  *
-  */
--public class EntityDismountEvent extends EntityEvent
-+public class EntityDismountEvent extends EntityEvent implements Cancellable // Paper - implement Cancellable
- {
- 
-     private static final HandlerList handlers = new HandlerList();
-@@ -36,4 +37,16 @@ public class EntityDismountEvent extends EntityEvent
-     {
-         return handlers;
-     }
-+
-+    // Paper start - Implement cancellable methods
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancelled) {
-+        this.cancelled = cancelled;
-+    }
-+    // Paper end
- }
--- 
-2.18.0
-
diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0013-Expose-server-CommandMap.patch
similarity index 95%
rename from Spigot-API-Patches/0014-Expose-server-CommandMap.patch
rename to Spigot-API-Patches/0013-Expose-server-CommandMap.patch
index 1294089752..defa706f76 100644
--- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0013-Expose-server-CommandMap.patch
@@ -1,4 +1,4 @@
-From d7b3294ee2ca409a7de9da69d863974ee1823872 Mon Sep 17 00:00:00 2001
+From ab362d03af4b94722a764c5c06fe197fbda4d2d3 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap
@@ -39,7 +39,7 @@ index f3252e20..a291ebd6 100644
      {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index eb98c600..2b43ac1f 100644
+index e6a5cd2a..901199e3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 97%
rename from Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 7786d2feda..c7a3edc612 100644
--- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From 3b0d21ce147ba8825a3e5b64923a11d1a81fdbbf Mon Sep 17 00:00:00 2001
+From 25d86246284e115f6bc1aa65fc26dac0e77de5fa 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
@@ -37,7 +37,7 @@ index a291ebd6..0844862c 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/Server.java b/src/main/java/org/bukkit/Server.java
-index 2b43ac1f..d8ce8173 100644
+index 901199e3..1ad2cba4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -228,6 +228,26 @@ public interface Server extends PluginMessageRecipient {
diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch
similarity index 99%
rename from Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch
index ae28c173df..f2677979c5 100644
--- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From e5ee86a01a83c6c38f2ad58a4e534af73d54847c Mon Sep 17 00:00:00 2001
+From d9b9cd6fb36cdf689bbe3760147795092a6b111f 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
diff --git a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch b/Spigot-API-Patches/0016-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-API-Patches/0017-Add-exception-reporting-event.patch
rename to Spigot-API-Patches/0016-Add-exception-reporting-event.patch
index 55e970ab15..d299a68aed 100644
--- a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0016-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From ec5c5dcdcd3e5a6dd7a4d5620c73274f94071b80 Mon Sep 17 00:00:00 2001
+From 487fd736664c77fdc1da6257aadc398d7e9cdac3 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
diff --git a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0017-Fix-ServerListPingEvent-flagging-as-Async.patch
similarity index 97%
rename from Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
rename to Spigot-API-Patches/0017-Fix-ServerListPingEvent-flagging-as-Async.patch
index c2d3275ff6..9f65d69461 100644
--- a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/Spigot-API-Patches/0017-Fix-ServerListPingEvent-flagging-as-Async.patch
@@ -1,4 +1,4 @@
-From 8f1e66f25039c51d7e83c9c9ffae25ac434acb2b Mon Sep 17 00:00:00 2001
+From cb1afe86f6ab48949d4e19d3549a4669b1ceae28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 20:26:39 -0600
 Subject: [PATCH] Fix ServerListPingEvent flagging as Async
diff --git a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
similarity index 97%
rename from Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
rename to Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 35f5789451..2d11be49c5 100644
--- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@@ -1,4 +1,4 @@
-From 4d1f4491596b61d5a58c4446d1a58954e53b1f1d Mon Sep 17 00:00:00 2001
+From 5c6c0d9b5742c5c31017b1951334b325b04faac0 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 13:05:59 -0800
 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 93%
rename from Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index a29ca0659d..d63328d35c 100644
--- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From 70a25e1acdf0f9edfdde947fdb97aef644535ee3 Mon Sep 17 00:00:00 2001
+From a2e517e59ee21c1ce489f3917b75bcb8a94d1bea 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/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
similarity index 98%
rename from Spigot-API-Patches/0021-Complete-resource-pack-API.patch
rename to Spigot-API-Patches/0020-Complete-resource-pack-API.patch
index e01f783736..e58e189801 100644
--- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From 1d993cf07f29d709b5cae8a3e04528675d7e7aea Mon Sep 17 00:00:00 2001
+From b2c4a432b883c52071cb4b538f1f117ea62d7a2e 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/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch
similarity index 99%
rename from Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
rename to Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch
index 278d0a07b6..2c77abb150 100644
--- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch
@@ -1,4 +1,4 @@
-From 1469b97863ed5e841689d1347d6183189fef27cb Mon Sep 17 00:00:00 2001
+From cf7ba1c723ee537f7bbc7cc8d339d6357e5f0694 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 5e2024ca..bd9146dd 100644
+index a8a87820..a58d4424 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -127,6 +127,17 @@
diff --git a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch b/Spigot-API-Patches/0022-Add-a-call-helper-to-Event.patch
similarity index 94%
rename from Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
rename to Spigot-API-Patches/0022-Add-a-call-helper-to-Event.patch
index 0224e527a2..5c9f4f75c3 100644
--- a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
+++ b/Spigot-API-Patches/0022-Add-a-call-helper-to-Event.patch
@@ -1,4 +1,4 @@
-From e9cc1e95622f2b2f51b02a3a0b32911c3c760613 Mon Sep 17 00:00:00 2001
+From b6c1b5a967f036414fecc13493846b18a6c60ffe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 May 2013 20:36:58 -0400
 Subject: [PATCH] Add a call helper to Event
diff --git a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0023-Add-sender-name-to-commands.yml-replacement.patch
similarity index 96%
rename from Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
rename to Spigot-API-Patches/0023-Add-sender-name-to-commands.yml-replacement.patch
index 0323eec35a..23e445bc80 100644
--- a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
+++ b/Spigot-API-Patches/0023-Add-sender-name-to-commands.yml-replacement.patch
@@ -1,4 +1,4 @@
-From b5c4f4748f637c8ddccffbcdef249b4abe7f4401 Mon Sep 17 00:00:00 2001
+From 77a78428fcc16fb82c0a2e0d2173db22a1476266 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 22 Jul 2015 18:50:41 -0400
 Subject: [PATCH] Add sender name to commands.yml replacement
diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch
similarity index 98%
rename from Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
rename to Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch
index 674b989cfb..8ce76a62e4 100644
--- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From 1a2b3bc3c46affceeb6ae0f93d166778eabba78b Mon Sep 17 00:00:00 2001
+From 665f0cb22362dab461d1939b4aabbcf6a553907f 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
diff --git a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0025-Custom-replacement-for-eaten-items.patch
similarity index 97%
rename from Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
rename to Spigot-API-Patches/0025-Custom-replacement-for-eaten-items.patch
index ad908ee6fc..aa5d96f386 100644
--- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/0025-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From c92da34fc23a3a8c4bd298cf1e752b43ce81a88a Mon Sep 17 00:00:00 2001
+From 9b4d4b26e75b1e6467c11da7432ba08453689686 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/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0026-Access-items-by-EquipmentSlot.patch
similarity index 94%
rename from Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
rename to Spigot-API-Patches/0026-Access-items-by-EquipmentSlot.patch
index d2e3318656..1cee62c3ed 100644
--- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/0026-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From ad5444f104e8943b5cd8fe2110dfa6e74c47ab0c Mon Sep 17 00:00:00 2001
+From a4f2ef92d3cb775e916cbf50f2613f901b0e07e3 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/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 97%
rename from Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch
index 5312eab728..3ad2bfe7b3 100644
--- a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From d66b6b3d8cf42eee8c7d432bfeeb8618eb1c3125 Mon Sep 17 00:00:00 2001
+From db294a56ff3cbb40493caea0ce0506dc6261de4d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:26:34 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/Spigot-API-Patches/0029-EntityPathfindEvent.patch b/Spigot-API-Patches/0028-EntityPathfindEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0029-EntityPathfindEvent.patch
rename to Spigot-API-Patches/0028-EntityPathfindEvent.patch
index d2ca317f0a..efa6f26612 100644
--- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch
+++ b/Spigot-API-Patches/0028-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From e3f57f03c3b0a7dfb8399bc60c9854d7c5369397 Mon Sep 17 00:00:00 2001
+From 0f4f69d6a81d66c4906f1c05cac664bbdb129cf7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:15:34 -0400
 Subject: [PATCH] EntityPathfindEvent
diff --git a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch
similarity index 98%
rename from Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
rename to Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch
index 7700b6e156..73c734e753 100644
--- a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch
@@ -1,4 +1,4 @@
-From c0a5945074128db7e77a353aa9035b7d0f01acb7 Mon Sep 17 00:00:00 2001
+From 9cd7b0f5a8832c7d1b3db973c9f65db555013762 Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Sat, 1 Jun 2013 13:52:30 -0600
 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
diff --git a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0030-Add-MetadataStoreBase.removeAll-Plugin.patch
similarity index 95%
rename from Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
rename to Spigot-API-Patches/0030-Add-MetadataStoreBase.removeAll-Plugin.patch
index 446d41d4a3..10497f7511 100644
--- a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/0030-Add-MetadataStoreBase.removeAll-Plugin.patch
@@ -1,4 +1,4 @@
-From ff8d88096d58f9f801a4d6b49ef0eede65667989 Mon Sep 17 00:00:00 2001
+From 9a9ae4bff73c2649084dc753efa60f86ac91c2dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 16 Jul 2013 21:26:50 -0400
 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
diff --git a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch
similarity index 96%
rename from Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch
index e6eaf9ebaf..f922ed959b 100644
--- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 97a35e82ddb729fd74ce6d252a2c928a24b39d55 Mon Sep 17 00:00:00 2001
+From 57f2ba957f3cf3753fdf4f51697cda7e52daefc7 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:08:36 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
diff --git a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 99%
rename from Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 872f0177d0..d9c2c29f90 100644
--- a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 7c3fcd8ee8df766361c426d25955b626eac60d88 Mon Sep 17 00:00:00 2001
+From 4e0abf8c461a8e517fa30a281d90f8c60bd5686a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:20:18 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch
similarity index 96%
rename from Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
rename to Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch
index 55b5f46885..905c0a4777 100644
--- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch
@@ -1,4 +1,4 @@
-From 19fcaea4b23887be2eaa4d5e5bded0fa3ceca3ab Mon Sep 17 00:00:00 2001
+From 57f8f2e8bfc9419a07a28ad20fb52c13ee3e5562 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/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 96%
rename from Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch
index e1661cae07..4201deae25 100644
--- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 49a798ea1efd88482f5860292339b3229ebbf877 Mon Sep 17 00:00:00 2001
+From 8121678797e7b682fc53643ab34992d1aeacba8d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0035-LootTable-API.patch
similarity index 99%
rename from Spigot-API-Patches/0036-LootTable-API.patch
rename to Spigot-API-Patches/0035-LootTable-API.patch
index 467e51b016..d2d95fd7f9 100644
--- a/Spigot-API-Patches/0036-LootTable-API.patch
+++ b/Spigot-API-Patches/0035-LootTable-API.patch
@@ -1,4 +1,4 @@
-From 47d3999f281a9271cec4bdec2cc226b05d3ebf40 Mon Sep 17 00:00:00 2001
+From 4f1dc63c147f7ba3ae36ad4c04f55c852ae84dd7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 15:19:49 -0400
 Subject: [PATCH] LootTable API
diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0036-Add-EntityZapEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0037-Add-EntityZapEvent.patch
rename to Spigot-API-Patches/0036-Add-EntityZapEvent.patch
index bba41a875d..7e3cf3e72b 100644
--- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/0036-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From fa59003d856eb5f54a4a9bf0a26b7e55ae3a0713 Mon Sep 17 00:00:00 2001
+From 8cfb250c7604959047200370c281919b0ae0c420 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
diff --git a/Spigot-API-Patches/0038-Misc-Utils.patch b/Spigot-API-Patches/0037-Misc-Utils.patch
similarity index 94%
rename from Spigot-API-Patches/0038-Misc-Utils.patch
rename to Spigot-API-Patches/0037-Misc-Utils.patch
index d18b1edcb5..3dd8d2ab46 100644
--- a/Spigot-API-Patches/0038-Misc-Utils.patch
+++ b/Spigot-API-Patches/0037-Misc-Utils.patch
@@ -1,4 +1,4 @@
-From ae850cec0afe270d11a66245c0d9e46a16339283 Mon Sep 17 00:00:00 2001
+From f3a8ebcad45891f6cb7d243095d3739c1f1980d2 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:53:43 -0500
 Subject: [PATCH] Misc Utils
diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
similarity index 98%
rename from Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
index 5ac111f001..98aadba608 100644
--- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 5573a13dbba10bfedcf8610d255a13293bda79bd Mon Sep 17 00:00:00 2001
+From 03ea3274fc02f71bb86eed95ab422f493a544873 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
diff --git a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0039-Add-source-to-PlayerExpChangeEvent.patch
similarity index 96%
rename from Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-API-Patches/0039-Add-source-to-PlayerExpChangeEvent.patch
index 6263fac243..969451283b 100644
--- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-API-Patches/0039-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From e08937fe0886d2dbce1bdb74980b7cdbc778e628 Mon Sep 17 00:00:00 2001
+From 47a6be4ee58f0b7650ee3f74933311d0e0dbab0e Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:47:08 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
diff --git a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
rename to Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch
index 83205aeec3..e59beae1c8 100644
--- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
+++ b/Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From da74019f26ab71c97991b2cf3474bc40a2c63bce Mon Sep 17 00:00:00 2001
+From 4eac0975455ab0ef81f5dac6bf83d475951f9a81 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/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
similarity index 98%
rename from Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
rename to Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
index 0d2d159fce..4f330d38ee 100644
--- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
@@ -1,4 +1,4 @@
-From d1c10cb8d00c3b6e9c8612bc30e9e7a715dd1ecf Mon Sep 17 00:00:00 2001
+From 12f234e11bae353a39c478f79e9d4c640b004c0e 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/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 94%
rename from Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 061c3f1db3..e2a1751e9c 100644
--- a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,4 +1,4 @@
-From 3c437859f9ef78609aac37e3afe173588ae67ee9 Mon Sep 17 00:00:00 2001
+From 718a96c9c13faf9b22291e81c70b0170fd4a0501 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
diff --git a/Spigot-API-Patches/0044-IllegalPacketEvent.patch b/Spigot-API-Patches/0043-IllegalPacketEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0044-IllegalPacketEvent.patch
rename to Spigot-API-Patches/0043-IllegalPacketEvent.patch
index 5ebf8914fb..6d4e261d55 100644
--- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch
+++ b/Spigot-API-Patches/0043-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From dea71c291e5e4139c86b7570e6eed8897bde2e94 Mon Sep 17 00:00:00 2001
+From 0f595a2260083d3940ed487003e0351bb75aa1a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 4 Dec 2016 01:19:14 -0500
 Subject: [PATCH] IllegalPacketEvent
diff --git a/Spigot-API-Patches/0045-Fireworks-API-s.patch b/Spigot-API-Patches/0044-Fireworks-API-s.patch
similarity index 93%
rename from Spigot-API-Patches/0045-Fireworks-API-s.patch
rename to Spigot-API-Patches/0044-Fireworks-API-s.patch
index 2c02d41dd5..432fb38209 100644
--- a/Spigot-API-Patches/0045-Fireworks-API-s.patch
+++ b/Spigot-API-Patches/0044-Fireworks-API-s.patch
@@ -1,4 +1,4 @@
-From 6705469275b33dd3cbb08048e0226fbca6c8599d Mon Sep 17 00:00:00 2001
+From 8e86bdb38a51cea9f5b62c820732617366fce895 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:55 -0500
 Subject: [PATCH] Fireworks API's
diff --git a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch
index c69e7cb9b2..cec5a5f63e 100644
--- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From f0f71311d0761cfb9c8ba1c5901f3e29223994ad Mon Sep 17 00:00:00 2001
+From 718717b647158518a34c36bb8e5623d838e88e29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 20:29:33 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
diff --git a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 95%
rename from Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch
index 39e8776cd4..78ae86dc02 100644
--- a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 33b64ea35d49023c95c359e7c8664335e202f7c0 Mon Sep 17 00:00:00 2001
+From 9e7f9915a3c7e0c57d407ff884ef4262aea8568b 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
diff --git a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 98%
rename from Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 1d8537586c..105a7b0b99 100644
--- a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 0e3f92f938875e2030ff8e1b7f559ecddca777f7 Mon Sep 17 00:00:00 2001
+From a5987f0c76258d3d57fe1611b8355438ebbcc058 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:28:32 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
diff --git a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch
similarity index 94%
rename from Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
rename to Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch
index 133dc7c0b2..4ff719941c 100644
--- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch
@@ -1,4 +1,4 @@
-From 0187592c026f6b460628219f3f2c4e48e9413bfc Mon Sep 17 00:00:00 2001
+From 2938561e612928e665b3e9db9f50e44d5284970e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 21 Jan 2017 17:03:10 -0600
 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 97%
rename from Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
index 15c4eacaca..a09454f313 100644
--- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From bb52f66da14375368ceff766b8cf92decd2caada Mon Sep 17 00:00:00 2001
+From 6f46820d7b4ee0f41a22f79597a5371439d6521d 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
diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
similarity index 99%
rename from Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
rename to Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
index 438ba4bd5a..7031f0ffb1 100644
--- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -1,4 +1,4 @@
-From 95cc7e013040f4cc243d1d421ec2d8a62dacbfa2 Mon Sep 17 00:00:00 2001
+From 6bd3a5ad8d74d0174b70ec10216020d6f7c1206d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 1ed8f7e4..bd5238ce 100644
+index 43239f84..fe8d3468 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -38,8 +38,8 @@ public final class NamespacedKey {
diff --git a/Spigot-API-Patches/0052-Item-canEntityPickup.patch b/Spigot-API-Patches/0051-Item-canEntityPickup.patch
similarity index 93%
rename from Spigot-API-Patches/0052-Item-canEntityPickup.patch
rename to Spigot-API-Patches/0051-Item-canEntityPickup.patch
index 08748d15b3..e6f929fdd1 100644
--- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch
+++ b/Spigot-API-Patches/0051-Item-canEntityPickup.patch
@@ -1,4 +1,4 @@
-From dc66c4f09cb93dc94893badd5da732ed2178aa45 Mon Sep 17 00:00:00 2001
+From 360118be75c9c955ddc56da1a41976f2238136af Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:08 -0500
 Subject: [PATCH] Item#canEntityPickup
diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 96%
rename from Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 3bbe8f5d9e..e9ae025b3f 100644
--- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,4 +1,4 @@
-From d9917e835f1e81e0b7d84ffc7ea4b60ca08eb3c4 Mon Sep 17 00:00:00 2001
+From 158701799346c25d8daf92beb3fb9c59922c3aec 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/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
rename to Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch
index 97de3e04a3..0e7d9f3740 100644
--- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From 1f46a8b98f035e8a17ccef525526dc0d02b7acbb Mon Sep 17 00:00:00 2001
+From b989dc1168c035e24f94e0ff25514d579e52f6f7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:37 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
diff --git a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
rename to Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch
index 67133ccd70..358ff4d94b 100644
--- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
+++ b/Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch
@@ -1,4 +1,4 @@
-From d8cb5d408bac83ef3e7e83da92cc90904d4cd379 Mon Sep 17 00:00:00 2001
+From 170f61cabc9f329e6a4159b4a9dc9db4a5d76836 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:06 -0400
 Subject: [PATCH] Add UnknownCommandEvent
diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
similarity index 99%
rename from Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
rename to Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
index 94761dcae0..1274924626 100644
--- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
+++ b/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 2a6044898ccb64c5c3bd65f556ec5e93834917b2 Mon Sep 17 00:00:00 2001
+From e2c8fd3966e4d7bbf8825d9b7e22b527d2304811 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
similarity index 95%
rename from Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
rename to Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
index 8f92ff7868..a873817a51 100644
--- a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
@@ -1,4 +1,4 @@
-From 495ea88275a4d9b96efb1db20a52c4566f3458e5 Mon Sep 17 00:00:00 2001
+From cde8228c35b12307dc50eb03eb3550aa2f41c485 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/Spigot-API-Patches/0058-Profile-Lookup-Events.patch b/Spigot-API-Patches/0057-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-API-Patches/0058-Profile-Lookup-Events.patch
rename to Spigot-API-Patches/0057-Profile-Lookup-Events.patch
index e35ead083f..503fd02c5d 100644
--- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch
+++ b/Spigot-API-Patches/0057-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From c836087cd8822e93732c4f292489a13b77223a89 Mon Sep 17 00:00:00 2001
+From 960d92e62001a815ee391c27085ed77ac367020f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 16:30:44 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/pom.xml b/pom.xml
-index bd9146dd..44a8b2a5 100644
+index a58d4424..bfe580f1 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,6 +61,13 @@
diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
similarity index 92%
rename from Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
rename to Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
index d31fd8b335..616565bd80 100644
--- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
@@ -1,4 +1,4 @@
-From 0a3125353c085b5a16edb538480d5f712a6afde3 Mon Sep 17 00:00:00 2001
+From d12b4647862ab81272f1030da1a9fbeb2e7d30b1 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/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch b/Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch
similarity index 97%
rename from Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch
index f8848466ce..e6b76fee94 100644
--- a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 233f6d000f7fa14bd2de6d6c5ba88cd4b9dc4170 Mon Sep 17 00:00:00 2001
+From 93347de85dca36fb232ea77c2c767563e1e40ada Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:12:48 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0060-ensureServerConversions-API.patch
similarity index 97%
rename from Spigot-API-Patches/0061-ensureServerConversions-API.patch
rename to Spigot-API-Patches/0060-ensureServerConversions-API.patch
index fb4d2dd571..c0c4d13b42 100644
--- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch
+++ b/Spigot-API-Patches/0060-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 4f36318d8921ffa44333a86eac125200caad51d5 Mon Sep 17 00:00:00 2001
+From b02d5605bac4c8543b6f9fb6935a997cb2fe4149 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
diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch
similarity index 96%
rename from Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
rename to Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch
index 773172c197..23dcaf83bc 100644
--- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
+++ b/Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch
@@ -1,4 +1,4 @@
-From c1dbeb3ae74907b1336b1d68f76279b883bb35e3 Mon Sep 17 00:00:00 2001
+From 5576e3c1a73f5a51ee3e041d001a827252a8d724 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
diff --git a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
rename to Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch
index 082630f5e6..07f2172257 100644
--- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch
@@ -1,4 +1,4 @@
-From 285c68e987f4db6db40f653a723754b5793dc6e8 Mon Sep 17 00:00:00 2001
+From 71beda67b3983f467674f9b2b65a54e9199fda7a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:34 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
diff --git a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch
similarity index 96%
rename from Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
rename to Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch
index f21470f756..e2f99c63fa 100644
--- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
+++ b/Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch
@@ -1,4 +1,4 @@
-From 03867368971fb3bfad36b8ebe68d5948fd20ce0a Mon Sep 17 00:00:00 2001
+From 37638b5c57bc22517f707779b8c216d3cd24c131 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 02:08:55 -0500
 Subject: [PATCH] Make /plugins list alphabetical
diff --git a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch
similarity index 94%
rename from Spigot-API-Patches/0065-LivingEntity-setKiller.patch
rename to Spigot-API-Patches/0064-LivingEntity-setKiller.patch
index 0302725a89..73d2e4d02a 100644
--- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
+++ b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch
@@ -1,4 +1,4 @@
-From 054913afc1358179ae54b96956bce518334591ae Mon Sep 17 00:00:00 2001
+From bed7ac830a6ec1ab5b4b4e19a6c4abe47a2ba813 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:43 -0500
 Subject: [PATCH] LivingEntity#setKiller
diff --git a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch
similarity index 96%
rename from Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
rename to Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch
index 79ffabc76f..2faa23a84e 100644
--- a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch
@@ -1,4 +1,4 @@
-From ffdbb97e00e44a8d86086aee473e45fa54e0b281 Mon Sep 17 00:00:00 2001
+From daf70a992ec9bf7b009aeda61cca417d7930e989 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:13 +0200
 Subject: [PATCH] Handle plugin prefixes in implementation logging
diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch
similarity index 94%
rename from Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
rename to Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch
index 167db2a6ea..6acef6979d 100644
--- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -1,4 +1,4 @@
-From f9af8335c02b21624aeee8ac4cb1909d31bbff56 Mon Sep 17 00:00:00 2001
+From 8e55e6baef53dcb9a217b5e3f0169b57a5835bac Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:12 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index 44a8b2a5..c176dd7b 100644
+index bfe580f1..5167f5b9 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -121,6 +121,14 @@
diff --git a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
similarity index 98%
rename from Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
rename to Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index dd2b7d9194..b418a93c8b 100644
--- a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@@ -1,4 +1,4 @@
-From df23e00168bf3e3ff97132c082e03cc7c1728649 Mon Sep 17 00:00:00 2001
+From f0c22fcef9d528f8b773dbef3bb56968db826396 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 19:41:20 +0200
 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
rename to Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch
index a8659d45fd..86bba03d78 100644
--- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
+++ b/Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From 9f1f05d5857e0ce2cd806931ce4db9230c379989 Mon Sep 17 00:00:00 2001
+From 8e15888fcc667e68e2cb6f6d2b2febe36a7b3acd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:32 -0400
 Subject: [PATCH] Add PlayerJumpEvent
diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
similarity index 97%
rename from Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
index 602c3789c0..3ab65581b8 100644
--- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 4a4df5cf1adcaa8a25be2876c550c2ff2a517a67 Mon Sep 17 00:00:00 2001
+From 7505bac8503213c06c401a6196dd1c870060ae75 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
rename to Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch
index 30fe3ec790..87882fba9b 100644
--- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch
@@ -1,4 +1,4 @@
-From e7a01ce105a27097d7f08442b7db2aad136bcd7f Mon Sep 17 00:00:00 2001
+From 4ceb745753f3bb90b932daacc58c3fc104e8a795 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:45:59 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
diff --git a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 94%
rename from Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch
index cefb98c0fa..59cc90d4f2 100644
--- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 1cb04b32f151759c17629a384fa8547a255334a6 Mon Sep 17 00:00:00 2001
+From 9833fee48ce1a110ee78003439deafc84f689c55 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:10:01 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch
similarity index 99%
rename from Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
rename to Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch
index 7713ebb31f..2e07b73b37 100644
--- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
+++ b/Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From c98afebdb0e60908d750e33e33c06ad612ac6434 Mon Sep 17 00:00:00 2001
+From edc4698e52433d90bcaaf7007245e7acad4d52f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:17:09 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
diff --git a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch
similarity index 97%
rename from Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
rename to Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch
index 046b029460..8fcff4c8b8 100644
--- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch
@@ -1,4 +1,4 @@
-From 120a11417f9d48ca7ae42393b88e4751583391ef Mon Sep 17 00:00:00 2001
+From 4fc07207023b06376573d258a25b0fde0dae728e 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
diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
rename to Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch
index f04a712c73..580f36fcb6 100644
--- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
+++ b/Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 7583b7eef0eb813aa2a79d214dea15eaab1b6dc7 Mon Sep 17 00:00:00 2001
+From 82123411c5381dec16732f3e729b996f3bfd6baa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:00:41 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
rename to Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch
index be8b56e8aa..127f53b8d7 100644
--- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
+++ b/Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From ac086d03f6617bcc272e6d9d7547ed7d1e94c808 Mon Sep 17 00:00:00 2001
+From 690ed111958090f2e13c9a53e6f3296820662330 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:56:24 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
similarity index 96%
rename from Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
index 5e006a0631..51128039ee 100644
--- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From a4490dff8b9cf87a9efbc8bbe807b629de2df02b Mon Sep 17 00:00:00 2001
+From 1dce855cf72b840b3c8ca68eef03f47850ea3169 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
diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
rename to Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch
index c05dfa30a5..2c1a5b4898 100644
--- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
+++ b/Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From d96e899da4fd2b553148ba115ac5b68ee27952ad Mon Sep 17 00:00:00 2001
+From ed685ade98b7c91a16ea129ed517a8739cdb63d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 16:59:43 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch
index 81743e5478..d624f1f0d9 100644
--- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From c5154039ff463f366dae9a072e0c014f92eabedb Mon Sep 17 00:00:00 2001
+From eda3592be1d17598e7261a86c55c4377289c2721 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:31:37 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
diff --git a/Spigot-API-Patches/0080-Add-SkullMeta.setPlayerProfile-API.patch b/Spigot-API-Patches/0079-Add-SkullMeta.setPlayerProfile-API.patch
similarity index 95%
rename from Spigot-API-Patches/0080-Add-SkullMeta.setPlayerProfile-API.patch
rename to Spigot-API-Patches/0079-Add-SkullMeta.setPlayerProfile-API.patch
index c50c7a0b61..8692bf1192 100644
--- a/Spigot-API-Patches/0080-Add-SkullMeta.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0079-Add-SkullMeta.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 956b151ae68497ff34ebf1f4dc540cc88754f276 Mon Sep 17 00:00:00 2001
+From 0a29a32a10268a1478ad045924aa706d7da5685a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:29:28 -0500
 Subject: [PATCH] Add SkullMeta.setPlayerProfile API
diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch
similarity index 98%
rename from Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
rename to Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch
index c5cf7243f1..559cf7d516 100644
--- a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
+++ b/Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From c3ae932f11c94cfa5b46fc5b11b04a283260708f Mon Sep 17 00:00:00 2001
+From d6ace9b5fd0e4dc637739347aefb6bcac808120c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:08 -0500
 Subject: [PATCH] Fill Profile Property Events
diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch
index 5c6f84294f..3fa960b358 100644
--- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From c74290391d661bac5694c965fdd19e56cb6c9e42 Mon Sep 17 00:00:00 2001
+From 37b0fe3449844988fdd20179130e820106c703c7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:14 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch
similarity index 97%
rename from Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
rename to Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch
index dc184d0c03..49d6ce7d99 100644
--- a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From d49f8976711a2afe8d57cf0a546332f8c95df6ad Mon Sep 17 00:00:00 2001
+From c8dfb1c1ac5047c3989ed89c48a202c8e565f4d3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:06:24 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0083-Optimize-Hoppers.patch
similarity index 96%
rename from Spigot-API-Patches/0084-Optimize-Hoppers.patch
rename to Spigot-API-Patches/0083-Optimize-Hoppers.patch
index bbc05ec122..5c84eddf95 100644
--- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch
+++ b/Spigot-API-Patches/0083-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From ad00ddb857bd631a9ae93eaabe76c044436f51d1 Mon Sep 17 00:00:00 2001
+From 6c67c5ba8e8ce89bfdd90a1d6264d14ba6a9037b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 18 Jan 2018 01:00:27 -0500
 Subject: [PATCH] Optimize Hoppers
diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch
similarity index 94%
rename from Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch
index 2b73ed654b..af75200bbd 100644
--- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 49e9ab9b0b462f724ac9f77fbf6dd7c0c319225d Mon Sep 17 00:00:00 2001
+From ba8f331145982701fc0e9dc323c75e54fb5130d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 00:55:52 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
diff --git a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 96%
rename from Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 29a6bbac14..43c1e2acf8 100644
--- a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 03d67fdc4e326c291edce8d26e66146c8d1dd111 Mon Sep 17 00:00:00 2001
+From 320c3d77f68b7b02d88d293898e91681cac3c90e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:43:30 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
rename to Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch
index 1dbc2dc12d..7649b3a2d4 100644
--- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From e983285e16c5833593ce8aaa6f806219cc08a641 Mon Sep 17 00:00:00 2001
+From 49a9d5dd768670e0cf6bb85313727ad57bc8428e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:55:38 +0200
 Subject: [PATCH] Add extended PaperServerListPingEvent
diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
similarity index 95%
rename from Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
rename to Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
index 966aa8d13b..228fb1610a 100644
--- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From f2bc9bc75a61d71a627a18f57f66a965ba99f1c3 Mon Sep 17 00:00:00 2001
+From c2dcfe42c36ad71eafe754ab961333e503857c34 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
diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0088-getPlayerUniqueId-API.patch
similarity index 95%
rename from Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
rename to Spigot-API-Patches/0088-getPlayerUniqueId-API.patch
index d6c19d057a..82f837055a 100644
--- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
+++ b/Spigot-API-Patches/0088-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 4f4d3dad507842141ff628337284fdd59deb9ab8 Mon Sep 17 00:00:00 2001
+From c4f01447191d4f50f00aa4e4975f70ddc174cf34 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:39:28 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -34,7 +34,7 @@ index 01a226d9..b389677a 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e7aab4bb..17ac4241 100644
+index 6c96fc14..f5aee1c5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient {
diff --git a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
similarity index 94%
rename from Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
rename to Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
index b480566aff..af5d9d3ee2 100644
--- a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 1a2033967ffb93634c6d4cd0af4e9d27d5d27b6e Mon Sep 17 00:00:00 2001
+From e730e57eded25def56fa85f4d51aa44cbcc5a135 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:20 +0200
 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent
diff --git a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
similarity index 92%
rename from Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
rename to Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
index 41e083f71c..a98088897d 100644
--- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
@@ -1,4 +1,4 @@
-From 82828abda963ddcea2a0df4c15a8f0d3bb2f20c8 Mon Sep 17 00:00:00 2001
+From b8fbba03fc7abd8c77f063e41fc16537c4117102 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/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch b/Spigot-API-Patches/0091-Add-version-history-to-version-command.patch
similarity index 99%
rename from Spigot-API-Patches/0092-Add-version-history-to-version-command.patch
rename to Spigot-API-Patches/0091-Add-version-history-to-version-command.patch
index a85be8779b..4077b0b100 100644
--- a/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch
+++ b/Spigot-API-Patches/0091-Add-version-history-to-version-command.patch
@@ -1,4 +1,4 @@
-From f4043d993253dd4c573166dd6cc91347bf85bbcf Mon Sep 17 00:00:00 2001
+From ec7ab0fda0b8db766c75b88b151228cd8a7f99e6 Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:37:52 -0600
 Subject: [PATCH] Add version history to version command
diff --git a/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
similarity index 99%
rename from Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
rename to Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
index 4d98eb9bef..2c16c9e32e 100644
--- a/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
@@ -1,4 +1,4 @@
-From 6514d05e7994ca64d84829f5ea5f08881d896143 Mon Sep 17 00:00:00 2001
+From 4b6fe9261d73d066a8b0a10b1205c3a8db3f4e25 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
diff --git a/Spigot-API-Patches/0094-EndermanEscapeEvent.patch b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0094-EndermanEscapeEvent.patch
rename to Spigot-API-Patches/0093-EndermanEscapeEvent.patch
index ed8c92b565..9248bc08d0 100644
--- a/Spigot-API-Patches/0094-EndermanEscapeEvent.patch
+++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From f6de564e86fa93c0f80a7f13fea4c725fde220a7 Mon Sep 17 00:00:00 2001
+From e6e2f854d47264daa82dac76e0e9b50e1d048112 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:14:30 -0400
 Subject: [PATCH] EndermanEscapeEvent
diff --git a/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
similarity index 93%
rename from Spigot-API-Patches/0095-Enderman.teleportRandomly.patch
rename to Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
index 66ffe6baaa..16e901302f 100644
--- a/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch
+++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 1ec75ba436761bb918589563fcd3b71d19846ce0 Mon Sep 17 00:00:00 2001
+From d39ff6984ee7da570e62149453cc739c70608e7d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:15 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
diff --git a/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
similarity index 99%
rename from Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
rename to Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
index 25ba151fa2..b23470b827 100644
--- a/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
@@ -1,4 +1,4 @@
-From 684b4b13045cf9a8ed1c8246539feb43afd55cee Mon Sep 17 00:00:00 2001
+From abf7402bc4ecece3ae26cdc95077e1948f349189 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
diff --git a/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
similarity index 91%
rename from Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
rename to Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
index db72eb50fc..592318344c 100644
--- a/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
+++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
@@ -1,4 +1,4 @@
-From 5d998b54fbc373ae8d50dd5c19ddb64cd5db3e2c Mon Sep 17 00:00:00 2001
+From d6390344700e8736df3210e7fe2b54d942dd0b3f 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/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 99%
rename from Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
index 537a9e5072..7b94dd6e1c 100644
--- a/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 16fae4609fea741833ed1b7936b260fc18628cee Mon Sep 17 00:00:00 2001
+From 8c9cae0f00a34d7db7987f0de3e348143fca2559 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
diff --git a/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch
rename to Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
index 0846cc6edf..5d94b9a560 100644
--- a/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch
+++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 6c6a2ce230f36f7b42b89b2ba7be407dc28c3a3c Mon Sep 17 00:00:00 2001
+From 859fbcc49fee34e570ef93b1cedeea6129c923d7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
diff --git a/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
similarity index 99%
rename from Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
rename to Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
index 4025c46b3d..858710131e 100644
--- a/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
@@ -1,4 +1,4 @@
-From 7fde4c2352b99a7f57694bdae89f691ecc656c68 Mon Sep 17 00:00:00 2001
+From 9e6d679a2e1a3956d445cf4a45b317dafd5ab8b0 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
diff --git a/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0101-WitchConsumePotionEvent.patch
rename to Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
index efe6ff9b09..d921808430 100644
--- a/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch
+++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From aad0ca777756d4b341f053bd70ffce06d04b3206 Mon Sep 17 00:00:00 2001
+From 4c4ed4d357e2ee60585351f515c1e2ef82754042 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:26:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
diff --git a/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0102-WitchThrowPotionEvent.patch
rename to Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
index a541c585e2..6c353f8b3a 100644
--- a/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch
+++ b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 541ae193668500d017ebe33cda73a44121ee3455 Mon Sep 17 00:00:00 2001
+From ec8448715301fcfc22907e25053ce24046112ec7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:39:09 -0400
 Subject: [PATCH] WitchThrowPotionEvent
diff --git a/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
similarity index 95%
rename from Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
rename to Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
index 63fdf01fea..95d0a1f7b7 100644
--- a/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
+++ b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
@@ -1,4 +1,4 @@
-From a6bcc9478c95e056ec412ed1317f4d597b0a7017 Mon Sep 17 00:00:00 2001
+From 6b5682f52304efe35982bf2d15e3d9a25b840b66 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()
diff --git a/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
similarity index 96%
rename from Spigot-API-Patches/0104-PotionEffect-clone-methods.patch
rename to Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
index e3c0c81d48..85abfd11bc 100644
--- a/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch
+++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
@@ -1,4 +1,4 @@
-From cc7e0cbb65f4290788d5f4864898611eb01d38ca Mon Sep 17 00:00:00 2001
+From 4855d23362468c0d6936adad449d9b43a4a8c80d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Jun 2018 04:10:13 -0400
 Subject: [PATCH] PotionEffect clone methods
diff --git a/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0105-WitchReadyPotionEvent.patch
rename to Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
index 3665efcdaf..7fa0f72acd 100644
--- a/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch
+++ b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From aa70385f1487c465957bf670526c427fe9a31f57 Mon Sep 17 00:00:00 2001
+From 148d9f989050de122ceed7cbc9ee8f3a74affc28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:08 -0400
 Subject: [PATCH] WitchReadyPotionEvent
diff --git a/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
similarity index 93%
rename from Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
index c8999a1a6c..a7996add96 100644
--- a/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From e336f7984ef9c18c49bfe743e7f33e9201c4fc24 Mon Sep 17 00:00:00 2001
+From 34ff6fed0aafab40ec06d9c768117a5c1b4f2d4e 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
diff --git a/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch
rename to Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
index 09be9b67fe..f36760f400 100644
--- a/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 7886764d86b2cbb9c33aaa5b57d103adf51482ba Mon Sep 17 00:00:00 2001
+From cf716be25a5b5aeea97c416dcc32c03d4572b7d2 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 13:08:21 +0100
 Subject: [PATCH] Add EntityTeleportEndGatewayEvent
diff --git a/Spigot-API-Patches/0108-Add-SentientNPC-Interface-to-Entities.patch b/Spigot-API-Patches/0107-Add-SentientNPC-Interface-to-Entities.patch
similarity index 99%
rename from Spigot-API-Patches/0108-Add-SentientNPC-Interface-to-Entities.patch
rename to Spigot-API-Patches/0107-Add-SentientNPC-Interface-to-Entities.patch
index 587b69b5f4..91d731a843 100644
--- a/Spigot-API-Patches/0108-Add-SentientNPC-Interface-to-Entities.patch
+++ b/Spigot-API-Patches/0107-Add-SentientNPC-Interface-to-Entities.patch
@@ -1,4 +1,4 @@
-From ae233d1060a039c57855d6b48ad29ee9f16534e5 Mon Sep 17 00:00:00 2001
+From ea3a8f5ed1c5ca4b73d03342500ca257864570f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 13:41:00 -0400
 Subject: [PATCH] Add SentientNPC Interface to Entities
diff --git a/Spigot-API-Patches/0109-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
similarity index 94%
rename from Spigot-API-Patches/0109-Make-shield-blocking-delay-configurable.patch
rename to Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
index 8b34c8407e..d1e2fac6ee 100644
--- a/Spigot-API-Patches/0109-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
@@ -1,4 +1,4 @@
-From af11f7559e3f9bf8f9862caecff1e2fa97495ae3 Mon Sep 17 00:00:00 2001
+From 047d17dce86b980dda8c0c0ec7220d90c321cd92 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/Spigot-API-Patches/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 96%
rename from Spigot-API-Patches/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index dc61a1ee4e..e98fe3ce6c 100644
--- a/Spigot-API-Patches/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 66bb665b7640a43ad6eeca4479360a07b3be11d3 Mon Sep 17 00:00:00 2001
+From 15994adb8231b553c5bd352326141857af8bfb25 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:52:04 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
diff --git a/Spigot-API-Patches/0111-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
similarity index 99%
rename from Spigot-API-Patches/0111-Add-getNearbyXXX-methods-to-Location.patch
rename to Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
index 75cd402a7d..d66bf5f7c9 100644
--- a/Spigot-API-Patches/0111-Add-getNearbyXXX-methods-to-Location.patch
+++ b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
@@ -1,4 +1,4 @@
-From 440009ac512a6ce127c556e999cea1e45804eab8 Mon Sep 17 00:00:00 2001
+From 557a8969ea196e6da7dea055516a9b66c30ec492 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/Spigot-API-Patches/0112-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0112-PlayerReadyArrowEvent.patch
rename to Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch
index d915c073be..06eceec300 100644
--- a/Spigot-API-Patches/0112-PlayerReadyArrowEvent.patch
+++ b/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 3b93e8bc7dc2bbdd6056c88375614f626c24ac3b Mon Sep 17 00:00:00 2001
+From 3c3e3c01d2d70fd004685f314dc5d222cdf6ae96 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:09:27 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
diff --git a/Spigot-API-Patches/0113-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0113-Add-EntityKnockbackByEntityEvent.patch
rename to Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch
index e89370a22b..8aab51ca81 100644
--- a/Spigot-API-Patches/0113-Add-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 73104eda9ba4087e6bf0460769ae4c6894bb6740 Mon Sep 17 00:00:00 2001
+From eaa1c2e41c62b988a2617ebc76bf905450f2222e Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:40:39 +0200
 Subject: [PATCH] Add EntityKnockbackByEntityEvent
diff --git a/Spigot-API-Patches/0114-Expand-Explosions-API.patch b/Spigot-API-Patches/0113-Expand-Explosions-API.patch
similarity index 99%
rename from Spigot-API-Patches/0114-Expand-Explosions-API.patch
rename to Spigot-API-Patches/0113-Expand-Explosions-API.patch
index eb2c5e7c15..f510261fc0 100644
--- a/Spigot-API-Patches/0114-Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/0113-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 88204b64c1d28285d937ec1c7a85dd9e4e2d4a83 Mon Sep 17 00:00:00 2001
+From 43407287b576901c8c0706ff95904f8399a80d5f 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
diff --git a/Spigot-API-Patches/0115-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
similarity index 98%
rename from Spigot-API-Patches/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
rename to Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
index f2cfed82fc..5e784cf74c 100644
--- a/Spigot-API-Patches/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -1,4 +1,4 @@
-From 656a16565559bb80edf1f4cf49f007132c16650e Mon Sep 17 00:00:00 2001
+From 7cce1cf01bc05d8bbdbe79d43c1427c0acb7831d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 22 Jun 2018 22:59:18 -0400
 Subject: [PATCH] ItemStack API additions for quantity/flags/lore
diff --git a/Spigot-API-Patches/0116-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 96%
rename from Spigot-API-Patches/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
index a4bc45cfbb..cffdeb9509 100644
--- a/Spigot-API-Patches/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From cf99646a663b14d01ef54e22020b8faa8fa555f0 Mon Sep 17 00:00:00 2001
+From 04b67e12230f3c0feea220732944b891d5ca71c2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
diff --git a/Spigot-API-Patches/0117-RangedEntity-API.patch b/Spigot-API-Patches/0116-RangedEntity-API.patch
similarity index 98%
rename from Spigot-API-Patches/0117-RangedEntity-API.patch
rename to Spigot-API-Patches/0116-RangedEntity-API.patch
index 96d82b9ddf..3c6f27e262 100644
--- a/Spigot-API-Patches/0117-RangedEntity-API.patch
+++ b/Spigot-API-Patches/0116-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 3dfec6aa624fc7663fa0d677c115efe822c05171 Mon Sep 17 00:00:00 2001
+From cf0088878648dbcf7c0a341569456b3b20ddba42 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 21:34:40 -0400
 Subject: [PATCH] RangedEntity API
diff --git a/Spigot-API-Patches/0118-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-API-Patches/0117-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
similarity index 96%
rename from Spigot-API-Patches/0118-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
rename to Spigot-API-Patches/0117-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index d91a09c712..afc86048ed 100644
--- a/Spigot-API-Patches/0118-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-API-Patches/0117-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From 1026157cdfadb0aa749625df4fa4bd1c7dfd2a2c Mon Sep 17 00:00:00 2001
+From daa7931f24c915c80bcd1783f63ef11db9a0f232 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:04 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
diff --git a/Spigot-API-Patches/0119-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0118-Add-World.getEntity-UUID-API.patch
similarity index 93%
rename from Spigot-API-Patches/0119-Add-World.getEntity-UUID-API.patch
rename to Spigot-API-Patches/0118-Add-World.getEntity-UUID-API.patch
index b3ef285261..f063008e22 100644
--- a/Spigot-API-Patches/0119-Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/0118-Add-World.getEntity-UUID-API.patch
@@ -1,4 +1,4 @@
-From e4b5d675c5e8bb6aab767b25b2cf9ef27476b655 Mon Sep 17 00:00:00 2001
+From afba86e7d21df889c5255fc1fdd9404bed8f9202 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/Spigot-API-Patches/0120-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0119-InventoryCloseEvent-Reason-API.patch
similarity index 97%
rename from Spigot-API-Patches/0120-InventoryCloseEvent-Reason-API.patch
rename to Spigot-API-Patches/0119-InventoryCloseEvent-Reason-API.patch
index 206164d44a..0372d7c614 100644
--- a/Spigot-API-Patches/0120-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/0119-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 4deb6973896972f14c56e83e4ef64ca3beee04e9 Mon Sep 17 00:00:00 2001
+From f9e5dde76a9d7df4e99e9677c7a09a8fbca3711b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:52:52 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
diff --git a/Spigot-API-Patches/0121-Entity-getChunk-API.patch b/Spigot-API-Patches/0120-Entity-getChunk-API.patch
similarity index 93%
rename from Spigot-API-Patches/0121-Entity-getChunk-API.patch
rename to Spigot-API-Patches/0120-Entity-getChunk-API.patch
index 071d8d7175..6c79e5691f 100644
--- a/Spigot-API-Patches/0121-Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/0120-Entity-getChunk-API.patch
@@ -1,4 +1,4 @@
-From 5a3a031ef1c7d8f9023f94a7c514f210afe0c1c4 Mon Sep 17 00:00:00 2001
+From 3d06d7bea98b884dbda0cf95be3494af6c509546 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
diff --git a/Spigot-API-Patches/0122-Vex-getOwner-API.patch b/Spigot-API-Patches/0121-Vex-getOwner-API.patch
similarity index 92%
rename from Spigot-API-Patches/0122-Vex-getOwner-API.patch
rename to Spigot-API-Patches/0121-Vex-getOwner-API.patch
index b2be59228c..ffb1a88278 100644
--- a/Spigot-API-Patches/0122-Vex-getOwner-API.patch
+++ b/Spigot-API-Patches/0121-Vex-getOwner-API.patch
@@ -1,4 +1,4 @@
-From 9e4176114616d5b73fa13fcb5736cc5d2ff5bc52 Mon Sep 17 00:00:00 2001
+From 9701c04abd7b6530433049cf90502e7569f70ab0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:29:21 -0400
 Subject: [PATCH] Vex#getOwner API
diff --git a/Spigot-API-Patches/0123-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0122-Add-an-asterisk-to-legacy-API-plugins.patch
similarity index 97%
rename from Spigot-API-Patches/0123-Add-an-asterisk-to-legacy-API-plugins.patch
rename to Spigot-API-Patches/0122-Add-an-asterisk-to-legacy-API-plugins.patch
index 0403a37fbc..58d44933ad 100644
--- a/Spigot-API-Patches/0123-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/0122-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -1,4 +1,4 @@
-From a91f4cbb8c66889302966caa04d7fbbd3ad265cc Mon Sep 17 00:00:00 2001
+From d7ad6275b2c4d850e971e43d3d3fe0dbeed04cea 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
@@ -62,5 +62,5 @@ index 3cff01b6..2b9aad0a 100644
              JavaPlugin jPlugin = (JavaPlugin) plugin;
  
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0124-Use-specific-1.13-versioning-branch-build-name.patch b/Spigot-API-Patches/0123-Use-specific-1.13-versioning-branch-build-name.patch
similarity index 97%
rename from Spigot-API-Patches/0124-Use-specific-1.13-versioning-branch-build-name.patch
rename to Spigot-API-Patches/0123-Use-specific-1.13-versioning-branch-build-name.patch
index 38578e7b00..d2d9fa7379 100644
--- a/Spigot-API-Patches/0124-Use-specific-1.13-versioning-branch-build-name.patch
+++ b/Spigot-API-Patches/0123-Use-specific-1.13-versioning-branch-build-name.patch
@@ -1,4 +1,4 @@
-From 07605531827fe881188f2dc08385c6a82b23215f Mon Sep 17 00:00:00 2001
+From 104243eb412fa6c00f206d6ea2102ffa5090ee74 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 19 Jul 2018 17:32:47 -0500
 Subject: [PATCH] Use specific 1.13 versioning branch/build name
@@ -40,5 +40,5 @@ index c45faf4c..7041085c 100644
              if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit
              try (
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0125-Add-async-chunk-load-API.patch b/Spigot-API-Patches/0124-Add-async-chunk-load-API.patch
similarity index 98%
rename from Spigot-API-Patches/0125-Add-async-chunk-load-API.patch
rename to Spigot-API-Patches/0124-Add-async-chunk-load-API.patch
index 0ce23ae271..02ac5b36aa 100644
--- a/Spigot-API-Patches/0125-Add-async-chunk-load-API.patch
+++ b/Spigot-API-Patches/0124-Add-async-chunk-load-API.patch
@@ -1,4 +1,4 @@
-From 50fe6b99320148740160eec04f499d03b57987dc Mon Sep 17 00:00:00 2001
+From 2b95e12f292000685d4475a372dbcb4e2c275db2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Add async chunk load API
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index b4e14d04e7..e5f625c8df 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -1,11 +1,11 @@
-From 767daac10e6f8de9fccba88decfb0327905f9c9b Mon Sep 17 00:00:00 2001
+From 196e3b344fb42d27702bca99fd7e635d140d9d24 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index c3e990bdf..e2a7b4be2 100644
+index c3e990bdff..e2a7b4be2c 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -93,7 +93,7 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -18,7 +18,7 @@ index c3e990bdf..e2a7b4be2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 121a137f3..279045e49 100644
+index 121a137f3b..279045e499 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -10,7 +10,6 @@ import org.apache.logging.log4j.Logger;
@@ -54,7 +54,7 @@ index 121a137f3..279045e49 100644
              return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
          }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 411ab6061..cd4fbee0c 100644
+index 411ab6061b..cd4fbee0ca 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -28,7 +28,7 @@ import com.google.common.collect.Lists; // CraftBukkit
@@ -75,7 +75,7 @@ index 411ab6061..cd4fbee0c 100644
      public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
-index 00a530c51..2947d9ff6 100644
+index 00a530c51c..2947d9ff6a 100644
 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 @@ -24,6 +24,8 @@ public class ChunkCoordIntPair {
@@ -88,7 +88,7 @@ index 00a530c51..2947d9ff6 100644
          return (long) i & 4294967295L | ((long) j & 4294967295L) << 32;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index ca2a14d7a..9a513b4e3 100644
+index ca2a14d7ac..9a513b4e3a 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -131,7 +131,7 @@ index ca2a14d7a..9a513b4e3 100644
          private boolean c = true;
          private boolean d = true;
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 3f0c5d7dd..68a59e708 100644
+index 1e27433b90..c973397898 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -25,6 +25,7 @@ import org.bukkit.Location;
@@ -142,7 +142,7 @@ index 3f0c5d7dd..68a59e708 100644
  import org.bukkit.craftbukkit.util.CraftMagicNumbers;
  import org.bukkit.entity.Player;
  import org.bukkit.event.world.StructureGrowEvent;
-@@ -553,6 +554,17 @@ public final class ItemStack {
+@@ -563,6 +564,17 @@ public final class ItemStack {
          return this.tag != null ? this.tag.getList("Enchantments", 10) : new NBTTagList();
      }
  
@@ -161,7 +161,7 @@ index 3f0c5d7dd..68a59e708 100644
          this.tag = nbttagcompound;
      }
 diff --git a/src/main/java/net/minecraft/server/LotoSelectorEntry.java b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
-index a540167d6..add618866 100644
+index a540167d6d..add618866b 100644
 --- a/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 @@ -85,11 +85,11 @@ public abstract class LotoSelectorEntry {
@@ -180,7 +180,7 @@ index a540167d6..add618866 100644
      }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
-index 000000000..70cdc3f10
+index 0000000000..70cdc3f102
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +1,292 @@
@@ -477,7 +477,7 @@ index 000000000..70cdc3f10
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java
-index 8170a8428..e21e60b00 100644
+index 8170a84280..e21e60b003 100644
 --- a/src/main/java/net/minecraft/server/NBTBase.java
 +++ b/src/main/java/net/minecraft/server/NBTBase.java
 @@ -20,7 +20,7 @@ public interface NBTBase {
@@ -499,7 +499,7 @@ index 8170a8428..e21e60b00 100644
          case 0:
              return "TAG_End";
 diff --git a/src/main/java/net/minecraft/server/NBTList.java b/src/main/java/net/minecraft/server/NBTList.java
-index 1a81d8e5f..057c2077a 100644
+index 1a81d8e5f6..057c2077a0 100644
 --- a/src/main/java/net/minecraft/server/NBTList.java
 +++ b/src/main/java/net/minecraft/server/NBTList.java
 @@ -13,7 +13,7 @@ public abstract class NBTList<T extends NBTBase> extends AbstractList<T> impleme
@@ -525,7 +525,7 @@ index 1a81d8e5f..057c2077a 100644
 +    public abstract NBTList<T> clone(); // Paper - decompile fix
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
-index 11ffa6c34..3ff3a2983 100644
+index 11ffa6c342..3ff3a29835 100644
 --- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
 @@ -66,7 +66,8 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
@@ -539,7 +539,7 @@ index 11ffa6c34..3ff3a2983 100644
  
          System.arraycopy(this.data, 0, abyte, 0, this.data.length);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 7fc9b5ff3..e658816c2 100644
+index 7fc9b5ff32..e658816c24 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -24,7 +24,7 @@ public class NBTTagCompound implements NBTBase {
@@ -575,7 +575,7 @@ index 7fc9b5ff3..e658816c2 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
-index f5c9b97d5..d121ad4f7 100644
+index f5c9b97d5c..d121ad4f7a 100644
 --- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
 @@ -132,7 +132,7 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {
@@ -588,7 +588,7 @@ index f5c9b97d5..d121ad4f7 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index b3c944d70..a8280acf9 100644
+index b3c944d701..a8280acf94 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -14,7 +14,7 @@ import org.apache.logging.log4j.Logger;
@@ -626,7 +626,7 @@ index b3c944d70..a8280acf9 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2f2f4c6c6..556989f60 100644
+index 2f2f4c6c60..556989f603 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -66,9 +66,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -643,7 +643,7 @@ index 2f2f4c6c6..556989f60 100644
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index ef332d651..7cc7eb773 100644
+index ef332d6517..7cc7eb7735 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -8,7 +8,7 @@ import java.util.Iterator;
@@ -665,7 +665,7 @@ index ef332d651..7cc7eb773 100644
  
          this.c.set(i, t0);
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index 2179664a0..d7e1ecc03 100644
+index 2179664a0c..d7e1ecc031 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -102,11 +102,11 @@ public class ServerPing {
diff --git a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
index 55a54dc449..cd54074b3e 100644
--- a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From e3d93eaaa690554b73b4a0a9ad90f214559284ec Mon Sep 17 00:00:00 2001
+From 4f6efae4b2d228e98af8ea5272a70d3677808374 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 6fc3b7621d..93486b4b82 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d378f1a9df..e16579116a 100644
+index 1870930f69..085f95dfe3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2252,6 +2252,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2258,6 +2258,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase be() {
@@ -37,7 +37,7 @@ index d378f1a9df..e16579116a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 18dd06980f..ab64fb7872 100644
+index 574883462d..dd48c6af0c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -537,6 +537,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
index f31d53a6ca..dcf616588a 100644
--- a/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 4535caf1f24d08822aa9144f91c6b40edb0dcf19 Mon Sep 17 00:00:00 2001
+From a796eafbb7a903319071385b8f6aef1a0c9bcb4b 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
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 68a59e708..ed714c2cc 100644
+index c973397898..e120521611 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -61,7 +61,7 @@ index 68a59e708..ed714c2cc 100644
              this.getItem().a(this.tag);
              // CraftBukkit end
          }
-@@ -567,6 +586,7 @@ public final class ItemStack {
+@@ -577,6 +596,7 @@ public final class ItemStack {
      // Paper end
      public void setTag(@Nullable NBTTagCompound nbttagcompound) {
          this.tag = nbttagcompound;
@@ -69,7 +69,7 @@ index 68a59e708..ed714c2cc 100644
      }
  
      public IChatBaseComponent getName() {
-@@ -643,6 +663,7 @@ public final class ItemStack {
+@@ -653,6 +673,7 @@ public final class ItemStack {
          nbttagcompound.setString("id", String.valueOf(Enchantment.enchantments.b(enchantment)));
          nbttagcompound.setShort("lvl", (short) ((byte) i));
          nbttaglist.add((NBTBase) nbttagcompound);
@@ -78,7 +78,7 @@ index 68a59e708..ed714c2cc 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 d41459ef0..cadff64bf 100644
+index d41459ef01..cadff64bfb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -204,7 +204,7 @@ index d41459ef0..cadff64bf 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 86ae0a4b6..86c61abe4 100644
+index b2190b01d4..f1430d226f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -8,12 +8,14 @@ import java.lang.reflect.Constructor;
@@ -229,8 +229,8 @@ index 86ae0a4b6..86c61abe4 100644
 +import java.util.TreeMap;
  import java.util.logging.Level;
  import java.util.logging.Logger;
- import net.minecraft.server.NBTCompressedStreamTools;
-@@ -234,7 +237,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+ import net.minecraft.server.ChatComponentText;
+@@ -235,7 +238,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
      private IChatBaseComponent displayName;
      private IChatBaseComponent locName;
      private List<String> lore;
@@ -239,7 +239,7 @@ index 86ae0a4b6..86c61abe4 100644
      private int repairCost;
      private int hideFlag;
      private boolean unbreakable;
-@@ -243,7 +246,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -244,7 +247,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
      private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
  
      private NBTTagCompound internalTag;
@@ -248,7 +248,7 @@ index 86ae0a4b6..86c61abe4 100644
  
      CraftMetaItem(CraftMetaItem meta) {
          if (meta == null) {
-@@ -258,7 +261,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -259,7 +262,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          }
  
          if (meta.enchantments != null) { // Spigot
@@ -257,7 +257,7 @@ index 86ae0a4b6..86c61abe4 100644
          }
  
          this.repairCost = meta.repairCost;
-@@ -491,13 +494,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -492,13 +495,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          }
      }
  
@@ -273,7 +273,7 @@ index 86ae0a4b6..86c61abe4 100644
  
          for (int i = 0; i < ench.size(); i++) {
              String id = ((NBTTagCompound) ench.get(i)).getString(ENCHANTMENTS_ID.NBT);
-@@ -572,13 +575,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -573,13 +576,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
      void deserializeInternal(NBTTagCompound tag) {
      }
  
@@ -289,7 +289,7 @@ index 86ae0a4b6..86c61abe4 100644
          for (Map.Entry<?, ?> entry : ench.entrySet()) {
              // Doctor older enchants
              String enchantKey = entry.getKey().toString();
-@@ -733,13 +736,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -734,13 +737,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
      }
  
      public Map<Enchantment, Integer> getEnchants() {
@@ -305,7 +305,7 @@ index 86ae0a4b6..86c61abe4 100644
          }
  
          if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) {
-@@ -927,7 +930,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -928,7 +931,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
                  clone.lore = new ArrayList<String>(this.lore);
              }
              if (this.enchantments != null) {
@@ -314,7 +314,7 @@ index 86ae0a4b6..86c61abe4 100644
              }
              clone.hideFlag = this.hideFlag;
              clone.unbreakable = this.unbreakable;
-@@ -1096,6 +1099,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1097,6 +1100,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          }
      }
  
diff --git a/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
index 9af0f571ad..ddf8d12054 100644
--- a/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 66f0b458722d01614e1ecb8a82d09a92e4f5864a Mon Sep 17 00:00:00 2001
+From aba15fcba7f9d46fd103d2e8776d4732d800902c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 56aa89b45..f98f93c5c 100644
+index dd47797724..a465f1cf79 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2569,7 +2569,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2575,7 +2575,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public Entity teleportTo(Location exit, boolean portal) {
diff --git a/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 31814ff952..eebc0eebe1 100644
--- a/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,11 +1,11 @@
-From 95364b7e710394eda68ea6d81a7691c02b21907f Mon Sep 17 00:00:00 2001
+From 0b9bcb936fe6d77e2a1ffd169ec008a2f91ff999 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6ac58e5ec..ff9929a05 100644
+index 6ac58e5ec5..ff9929a051 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -238,4 +238,9 @@ public class PaperWorldConfig {
@@ -19,10 +19,10 @@ index 6ac58e5ec..ff9929a05 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f98f93c5c..31c580de1 100644
+index a465f1cf79..76934f81a8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2264,6 +2264,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2270,6 +2270,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.getFlag(5);
      }
  
@@ -31,7 +31,7 @@ index f98f93c5c..31c580de1 100644
      public ScoreboardTeamBase be() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a3486bd46..79fddc866 100644
+index 12b7afc524..9d705ed7d1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1622,7 +1622,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0110-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0110-Vehicle-Event-Cancellation-Changes.patch
deleted file mode 100644
index 20ace0aafe..0000000000
--- a/Spigot-Server-Patches/0110-Vehicle-Event-Cancellation-Changes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 173ce5b19ace1cc6316fe318b79cc36ee2c207d5 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Fri, 22 Apr 2016 18:20:05 -0500
-Subject: [PATCH] Vehicle Event Cancellation Changes
-
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 31c580de1..16d521dfd 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-     public boolean j;
-     public final List<Entity> passengers;
-     protected int k;
--    private Entity ax;
-+    private Entity ax;public void setVehicle(Entity entity) { this.ax = entity; } // Paper - OBFHELPER
-     public boolean attachedToPlayer;
-     public World world;
-     public double lastX;
-@@ -2123,6 +2123,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
-         } else {
-             // CraftBukkit start
-+            entity.setVehicle(this); // Paper - Set the vehicle back for the event
-             CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
-             Entity orig = craft == null ? null : craft.getHandle();
-             if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
-@@ -2138,7 +2139,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-                 }
-             }
-             // CraftBukkit end
--            Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
-+            // Paper start - make EntityDismountEvent cancellable
-+            if (!new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity()).callEvent()) {
-+                return;
-+            }
-+            entity.setVehicle(null);
-+            // Paper end
-+
-             this.passengers.remove(entity);
-             entity.k = 60;
-         }
--- 
-2.18.0
-
diff --git a/Spigot-Server-Patches/0111-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0110-remove-null-possibility-for-getServer-singleton.patch
similarity index 95%
rename from Spigot-Server-Patches/0111-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0110-remove-null-possibility-for-getServer-singleton.patch
index 18eae85d87..64f9a4b97c 100644
--- a/Spigot-Server-Patches/0111-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0110-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 767ba63e4bab628feacd5454d38b96a849cb089d Mon Sep 17 00:00:00 2001
+From bf2bd153e0203883f109de1266912090918f6b5d 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 c181acd99..6de0b22f7 100644
+index c181acd991..6de0b22f72 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -68,6 +68,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/Spigot-Server-Patches/0112-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0111-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 96%
rename from Spigot-Server-Patches/0112-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0111-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 61a0032634..7e277002f5 100644
--- a/Spigot-Server-Patches/0112-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0111-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 1b250f7abc586467c2a08285ab380754c75fc64e Mon Sep 17 00:00:00 2001
+From 7917e09469846bbe6836f8397451bea1a44a2df6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1aa32bf11..83bfb6611 100644
+index a47ef2ca50..06b663c4db 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -610,6 +610,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index 1aa32bf11..83bfb6611 100644
              ItemStack itemstack1 = this.a(entityitem);
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 6ae576a2e..af1981967 100644
+index 40e0bd7ce2..a04a06f3bf 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -90,7 +90,7 @@ public class EntityTrackerEntry {
@@ -43,7 +43,7 @@ index 6ae576a2e..af1981967 100644
              ItemStack itemstack = entityitemframe.getItem();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e5ecfdbf0..5102f24ed 100644
+index 46eab028d9..f1c036aa6a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1075,6 +1075,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -55,7 +55,7 @@ index e5ecfdbf0..5102f24ed 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index 445a016b7..4c64f90be 100644
+index 445a016b72..4c64f90be3 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -29,6 +29,7 @@ public class WorldMap extends PersistentBase {
@@ -127,7 +127,7 @@ index 445a016b7..4c64f90be 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a13178..5768cd512 100644
+index 256a131781..5768cd512e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
diff --git a/Spigot-Server-Patches/0113-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0112-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 98%
rename from Spigot-Server-Patches/0113-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0112-LootTable-API-Replenishable-Lootables-Feature.patch
index 157ce8fa8d..2278c6d9b8 100644
--- a/Spigot-Server-Patches/0113-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0112-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 89c539bf9cd6e0a1ac5fd61cbcb7bf6a08ed570d Mon Sep 17 00:00:00 2001
+From ec99cec780a2ae3c3ff8194fc74467161697b99f 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 0c50cb4bd..38de48ebc 100644
+index 0c50cb4bd6..38de48ebc2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -253,4 +253,26 @@ public class PaperWorldConfig {
@@ -43,7 +43,7 @@ index 0c50cb4bd..38de48ebc 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 new file mode 100644
-index 000000000..36c36d158
+index 0000000000..36c36d158f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 @@ -0,0 +1,12 @@
@@ -61,7 +61,7 @@ index 000000000..36c36d158
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 new file mode 100644
-index 000000000..20d236c45
+index 0000000000..20d236c451
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -100,7 +100,7 @@ index 000000000..20d236c45
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 new file mode 100644
-index 000000000..1150dee01
+index 0000000000..1150dee01e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 @@ -0,0 +1,31 @@
@@ -137,7 +137,7 @@ index 000000000..1150dee01
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 new file mode 100644
-index 000000000..668097620
+index 0000000000..668097620f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 @@ -0,0 +1,88 @@
@@ -231,7 +231,7 @@ index 000000000..668097620
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 new file mode 100644
-index 000000000..9a65603bc
+index 0000000000..9a65603bcb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 @@ -0,0 +1,182 @@
@@ -418,7 +418,7 @@ index 000000000..9a65603bc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 9ec73ac06..8bd7976f9 100644
+index 9ec73ac06a..8bd7976f97 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -6,17 +6,21 @@ import javax.annotation.Nullable;
@@ -540,7 +540,7 @@ index 9ec73ac06..8bd7976f9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index fbda02b32..e6fc1ae92 100644
+index fbda02b321..e6fc1ae923 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -1,12 +1,16 @@
@@ -657,7 +657,7 @@ index fbda02b32..e6fc1ae92 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index ac9b4297b..0558cafe3 100644
+index ac9b4297b2..0558cafe31 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
@@ -670,7 +670,7 @@ index ac9b4297b..0558cafe3 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 6a54f2a16..a94c78512 100644
+index 6a54f2a166..a94c785126 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -1,6 +1,7 @@
@@ -691,7 +691,7 @@ index 6a54f2a16..a94c78512 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
-index 1dc8bfecd..bfcf9b6c4 100644
+index 1dc8bfecd2..bfcf9b6c4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 @@ -1,5 +1,6 @@
@@ -711,7 +711,7 @@ index 1dc8bfecd..bfcf9b6c4 100644
      public CraftDispenser(final Block block) {
          super(block, TileEntityDispenser.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index 6566554ab..df156d0d9 100644
+index 6566554ab6..df156d0d92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -1,5 +1,6 @@
@@ -731,7 +731,7 @@ index 6566554ab..df156d0d9 100644
      public CraftHopper(final Block block) {
          super(block, TileEntityHopper.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-index c029a1244..c26f0b5af 100644
+index c029a12441..c26f0b5afc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -751,7 +751,7 @@ index c029a1244..c26f0b5af 100644
      public CraftShulkerBox(final Block block) {
          super(block, TileEntityShulkerBox.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 69435c457..4291edf25 100644
+index 69435c4576..4291edf252 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 @@
@@ -771,7 +771,7 @@ index 69435c457..4291edf25 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index e9963e21c..acb4dee04 100644
+index e9963e21cd..acb4dee04f 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/0114-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0113-Do-not-load-chunks-for-pathfinding.patch
similarity index 87%
rename from Spigot-Server-Patches/0114-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0113-Do-not-load-chunks-for-pathfinding.patch
index 13d0f956d4..66c88d73a6 100644
--- a/Spigot-Server-Patches/0114-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0113-Do-not-load-chunks-for-pathfinding.patch
@@ -1,11 +1,11 @@
-From 8377c919dfb9fe70801510f6e077bbf6a9847d8f Mon Sep 17 00:00:00 2001
+From bc7a01c2d7b9be7bfabb73c3ead9364433e5fee1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
-index 6d153e431..07444a86a 100644
+index 6d153e4311..07444a86ac 100644
 --- a/src/main/java/net/minecraft/server/ChunkCache.java
 +++ b/src/main/java/net/minecraft/server/ChunkCache.java
 @@ -27,7 +27,7 @@ public class ChunkCache implements IIBlockAccess {
diff --git a/Spigot-Server-Patches/0115-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0115-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch
index dfa8f65f8a..1729de72ae 100644
--- a/Spigot-Server-Patches/0115-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From dde88036ee16b61e39407d75420102c714842eef Mon Sep 17 00:00:00 2001
+From a4ca6f81234296ae1cfb63d2e7a2344d48456e67 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 16d521dfd..dd4ac4bfe 100644
+index 76934f81a8..93df154b15 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -70,6 +70,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index 16d521dfd..dd4ac4bfe 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index af1981967..e054ae905 100644
+index a04a06f3bf..c405cc74ba 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -49,6 +49,7 @@ public class EntityTrackerEntry {
diff --git a/Spigot-Server-Patches/0116-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0115-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 92%
rename from Spigot-Server-Patches/0116-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0115-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index c79726b5d3..c643be32f5 100644
--- a/Spigot-Server-Patches/0116-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0115-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,11 +1,11 @@
-From a348c3710bdb5813fc2278b285f8f77f3a5d4368 Mon Sep 17 00:00:00 2001
+From e285eb1fe1e6cbe2acba6d05392b04005024bb6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 430b5d0cd..011cbf5e3 100644
+index 430b5d0cdc..011cbf5e31 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -225,4 +225,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 430b5d0cd..011cbf5e3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
-index 0260fb7ec..45d8de1b7 100644
+index 0260fb7ec9..45d8de1b7b 100644
 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
 +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
 @@ -177,6 +177,7 @@ public class PersistentScoreboard extends PersistentBase {
diff --git a/Spigot-Server-Patches/0117-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0116-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 92%
rename from Spigot-Server-Patches/0117-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0116-Fix-Chunk-Unload-Queue-Issues.patch
index 34736a4cfb..000dd4aa61 100644
--- a/Spigot-Server-Patches/0117-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0116-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 570d7c506c2cc65f5899a4ca5e6b5cd5c2f38182 Mon Sep 17 00:00:00 2001
+From 30ff596e33f0ee629ff67ef52d067a7957ef540d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues
@@ -9,7 +9,7 @@ has not resolved all the bugs with the changes.
 This patch fixes known issues and really should be applied by Spigot team.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 49c5953fb..8da7e39ee 100644
+index 695c6d3b70..acc21aec02 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -58,7 +58,7 @@ public class Chunk implements IChunkAccess {
@@ -22,7 +22,7 @@ index 49c5953fb..8da7e39ee 100644
      private int E;
      private final AtomicInteger F;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 6917fdbe0..bac5c921b 100644
+index 6917fdbe04..bac5c921b6 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -301,6 +301,7 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/0118-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0117-System-property-for-disabling-watchdoge.patch
similarity index 90%
rename from Spigot-Server-Patches/0118-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0117-System-property-for-disabling-watchdoge.patch
index 47d08c74a8..c5593b5eae 100644
--- a/Spigot-Server-Patches/0118-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0117-System-property-for-disabling-watchdoge.patch
@@ -1,11 +1,11 @@
-From 2c589fea6f44a9eceb5240d226fab7a8aa65879d Mon Sep 17 00:00:00 2001
+From d898f0e91a714338c156db3161c150ec25996761 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
 
 
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 0c106ea9c..57a4748a3 100644
+index 0c106ea9c5..57a4748a30 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -52,7 +52,7 @@ public class WatchdogThread extends Thread
diff --git a/Spigot-Server-Patches/0119-Optimize-EAR.patch b/Spigot-Server-Patches/0118-Optimize-EAR.patch
similarity index 96%
rename from Spigot-Server-Patches/0119-Optimize-EAR.patch
rename to Spigot-Server-Patches/0118-Optimize-EAR.patch
index 92cee707e8..31e1f79031 100644
--- a/Spigot-Server-Patches/0119-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0118-Optimize-EAR.patch
@@ -1,11 +1,11 @@
-From 85b6d5e7f7854bd7803c2b5afc06a7250039fed7 Mon Sep 17 00:00:00 2001
+From c8e46d2dfb85a7fb46d51d433b842e9d195139eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1aade75f3..a9b84fdec 100644
+index 1aade75f34..a9b84fdec4 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -2,6 +2,8 @@ package org.spigotmc;
diff --git a/Spigot-Server-Patches/0120-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0119-Optimize-UserCache-Thread-Safe.patch
similarity index 96%
rename from Spigot-Server-Patches/0120-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0119-Optimize-UserCache-Thread-Safe.patch
index 73810beb26..1cb4f75edc 100644
--- a/Spigot-Server-Patches/0120-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0119-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From 55c50523df7924649d44089d0ef4e4bd9471334a Mon Sep 17 00:00:00 2001
+From b2db33ed633fd55ba4fe042e9f24bc90bf378979 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6de0b22f7..5f17ec1e9 100644
+index 6de0b22f72..5f17ec1e9d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -676,7 +676,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -23,7 +23,7 @@ index 6de0b22f7..5f17ec1e9 100644
          // Spigot end
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 0e168ad34..f8b7d695c 100644
+index 0e168ad349..f8b7d695c6 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -109,7 +109,7 @@ public class UserCache {
diff --git a/Spigot-Server-Patches/0121-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0120-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 96%
rename from Spigot-Server-Patches/0121-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0120-Avoid-blocking-on-Network-Manager-creation.patch
index 817c70c732..715f6cfce1 100644
--- a/Spigot-Server-Patches/0121-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0120-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 4b72a52f493d03f141642c45278dd654ef5fdb69 Mon Sep 17 00:00:00 2001
+From a883b4d3d653824a53997fa6971ef99341f807b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index be8d07f41..9808561eb 100644
+index be8d07f41e..9808561eb3 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -40,6 +40,15 @@ public class ServerConnection {
diff --git a/Spigot-Server-Patches/0122-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch
similarity index 94%
rename from Spigot-Server-Patches/0122-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch
index b35726fb29..2c786b2be9 100644
--- a/Spigot-Server-Patches/0122-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From 66110221d713089a4bd59d79a17a4b8f6100f015 Mon Sep 17 00:00:00 2001
+From 371a7184180641fd732e454d8ef10f8606018c60 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 38de48ebc..321da3be3 100644
+index 38de48ebc2..321da3be35 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,7 +32,7 @@ index 38de48ebc..321da3be3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dd4ac4bfe..34c617958 100644
+index 93df154b15..e56f458ca9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1195,6 +1195,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -48,7 +48,7 @@ index dd4ac4bfe..34c617958 100644
          return this.isInWater() || this.q();
      }
  
-@@ -2737,6 +2743,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2736,6 +2742,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bw() {
@@ -61,7 +61,7 @@ index dd4ac4bfe..34c617958 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 87f3205f8..8c1d25979 100644
+index 87f3205f82..8c1d25979f 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
diff --git a/Spigot-Server-Patches/0123-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0122-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 94%
rename from Spigot-Server-Patches/0123-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0122-Faster-redstone-torch-rapid-clock-removal.patch
index 1b04bbceba..2633e8dc4f 100644
--- a/Spigot-Server-Patches/0123-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0122-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 0ab83c3fcfa7cba9f3436c814c560124d4013e2a Mon Sep 17 00:00:00 2001
+From bd9abe1adfe269fd95965e845ff7b18f9edc7d2a Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
-index 6a54da4d6..ebd47196b 100644
+index c912fb8ae0..d2246cfb10 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 @@ -63,9 +63,17 @@ public class BlockRedstoneTorch extends BlockTorch {
diff --git a/Spigot-Server-Patches/0124-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0123-Ensure-Chunks-never-ever-load-async.patch
similarity index 95%
rename from Spigot-Server-Patches/0124-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0123-Ensure-Chunks-never-ever-load-async.patch
index dc00202cc8..b9ecbbcde0 100644
--- a/Spigot-Server-Patches/0124-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0123-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From eca617fa0198e46fcf7d2b215ab9c3661546ad39 Mon Sep 17 00:00:00 2001
+From 36c2a934001480dd1365190147d4e70a1f791018 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Chunks never ever load async
 Safely pushes the operation to main thread, then back to the posting thread
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7b7a3d01b..9aaca21a7 100644
+index 7b7a3d01b9..9aaca21a79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -4,6 +4,7 @@ import com.destroystokyo.paper.PaperConfig;
@@ -27,7 +27,7 @@ index 7b7a3d01b..9aaca21a7 100644
  
      public static void queueChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z, Runnable runnable) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 52a8c48fa..2bbd5a7e2 100644
+index 52a8c48fa4..2bbd5a7e2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -35,9 +35,9 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
diff --git a/Spigot-Server-Patches/0125-Add-server-name-parameter.patch b/Spigot-Server-Patches/0124-Add-server-name-parameter.patch
similarity index 90%
rename from Spigot-Server-Patches/0125-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0124-Add-server-name-parameter.patch
index 981b629d8f..c021a833d3 100644
--- a/Spigot-Server-Patches/0125-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0124-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From 66f789bf81987858175b8ef9204c85c50a69d1b1 Mon Sep 17 00:00:00 2001
+From cf48b3196d4f28b7ba27d4224610c7c538b6b420 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 38e696aa9..c552c624e 100644
+index 38e696aa94..c552c624e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -136,6 +136,14 @@ public class Main {
diff --git a/Spigot-Server-Patches/0126-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0125-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 95%
rename from Spigot-Server-Patches/0126-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0125-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 23408ddcf4..31b3e96d98 100644
--- a/Spigot-Server-Patches/0126-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0125-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 75a746991400c961cb2e2e48ffc77195d999a16d Mon Sep 17 00:00:00 2001
+From dd0d1f30603f537e6468a4fa50fbc416e5c49d1b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
 Also fix view distance lookup
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 24cce6c03..e5f064577 100644
+index bbd807315a..131f8a5156 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -573,8 +573,12 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -25,7 +25,7 @@ index 24cce6c03..e5f064577 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index e9d9ec239..28f524468 100644
+index 4f73b02baf..0d68a9be6c 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -199,8 +199,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0127-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 96%
rename from Spigot-Server-Patches/0127-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 9b99a796d9..b0924decad 100644
--- a/Spigot-Server-Patches/0127-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 51db9f7a8b2e9545edec3a323c0d6c1e298d30d8 Mon Sep 17 00:00:00 2001
+From d94fba211d446e594b97bb2eecd19a7dc92544d8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 321da3be3..0e6c18b32 100644
+index 321da3be35..0e6c18b327 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -284,4 +284,18 @@ public class PaperWorldConfig {
@@ -40,7 +40,7 @@ index 321da3be3..0e6c18b32 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8da7e39ee..99421aca9 100644
+index acc21aec02..c27073d27c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -39,6 +39,7 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index 8da7e39ee..99421aca9 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index bac5c921b..4f9ece9e4 100644
+index bac5c921b6..4f9ece9e47 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -317,6 +317,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -76,7 +76,7 @@ index bac5c921b..4f9ece9e4 100644
              this.f.a();
              this.chunkLoader.b();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index ffff87dc0..344b95233 100644
+index ffff87dc03..344b95233f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -33,14 +33,23 @@ public class PlayerChunk {
@@ -112,7 +112,7 @@ index ffff87dc0..344b95233 100644
  
              return this.chunk != null;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 4d888d6d4..cf5c76a78 100644
+index 4d888d6d4f..cf5c76a78e 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -461,7 +461,13 @@ public class PlayerChunkMap {
@@ -131,7 +131,7 @@ index 4d888d6d4..cf5c76a78 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f1c036aa6..95ec4f48f 100644
+index f1c036aa6a..95ec4f48f2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1294,7 +1294,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -150,7 +150,7 @@ index f1c036aa6..95ec4f48f 100644
                          this.methodProfiler.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ff3558363..90e260f3b 100644
+index ff3558363b..90e260f3b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1581,7 +1581,7 @@ public class CraftWorld implements World {
@@ -163,7 +163,7 @@ index ff3558363..90e260f3b 100644
              }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a9b84fdec..e02647f80 100644
+index a9b84fdec4..e02647f806 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -284,6 +284,10 @@ public class ActivationRange
diff --git a/Spigot-Server-Patches/0128-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0127-Fix-Double-World-Add-issues.patch
similarity index 93%
rename from Spigot-Server-Patches/0128-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0127-Fix-Double-World-Add-issues.patch
index 484c94d664..ecfefdab69 100644
--- a/Spigot-Server-Patches/0128-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0127-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From dbfe877863ead07c12ce6bc9fe159f20cd3a8563 Mon Sep 17 00:00:00 2001
+From d3ba0114303906b3d911da03acd12d54ef66d382 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f007af2e1..2f1488ee5 100644
+index f007af2e1a..2f1488ee53 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1050,7 +1050,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -21,7 +21,7 @@ index f007af2e1..2f1488ee5 100644
              Iterator iterator = entity.bP().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 95ec4f48f..45ab70167 100644
+index 95ec4f48f2..45ab70167a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -955,6 +955,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0128-Fix-Old-Sign-Conversion.patch
similarity index 95%
rename from Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0128-Fix-Old-Sign-Conversion.patch
index fb27b26e3d..96d0013ced 100644
--- a/Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0128-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 6b3f4ff9f1bbc1a21ec0b323e444cf24e6582eb9 Mon Sep 17 00:00:00 2001
+From 597a59550c1b3edf942a5b9d3fbe9f5d4400c285 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 15c7cc170..2109f316d 100644
+index 785a1a2184..528db8704e 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -218,9 +218,11 @@ public class DefinedStructure {
@@ -25,7 +25,7 @@ index 15c7cc170..2109f316d 100644
                                  }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 8cab71c0e..2cfe2202e 100644
+index e03965fc7c..9ad14417e3 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit
@@ -37,7 +37,7 @@ index 8cab71c0e..2cfe2202e 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 939d8790f..335a4d27f 100644
+index c5164ca3f4..2591c2f0b2 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -49,13 +49,14 @@ public class TileEntitySign extends TileEntity implements ICommandListener {
@@ -58,5 +58,5 @@ index 939d8790f..335a4d27f 100644
                  if (this.world instanceof WorldServer) {
                      try {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0130-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0129-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 90%
rename from Spigot-Server-Patches/0130-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0129-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 867723c393..e208ea63c5 100644
--- a/Spigot-Server-Patches/0130-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0129-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,11 +1,11 @@
-From 52368f047b0365b4b14565ec92e5770fcf62c463 Mon Sep 17 00:00:00 2001
+From c0b4e3b3ba563f5560520a639f972179352c3418 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index f8b7d695c..a47a51a41 100644
+index f8b7d695c6..a47a51a412 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -87,7 +87,7 @@ public class UserCache {
diff --git a/Spigot-Server-Patches/0131-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0130-More-informative-vehicle-moved-wrongly-message.patch
similarity index 90%
rename from Spigot-Server-Patches/0131-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0130-More-informative-vehicle-moved-wrongly-message.patch
index 2fed575944..3ecc36059e 100644
--- a/Spigot-Server-Patches/0131-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0130-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 62b82aafb470f62c90f6b4af01f863508532a0c1 Mon Sep 17 00:00:00 2001
+From 5fe385d1c9048225ddd1b55d874c0782d527d01f 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 79fddc866..32cef8e30 100644
+index 9d705ed7d1..fc33baf2bf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -354,7 +354,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0132-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0131-Re-track-players-that-dismount-from-other-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0132-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0131-Re-track-players-that-dismount-from-other-players.patch
index 89fe9ca76b..1951d5dec2 100644
--- a/Spigot-Server-Patches/0132-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0131-Re-track-players-that-dismount-from-other-players.patch
@@ -1,11 +1,11 @@
-From 4bea6aa92d099eca90ad5acad6cba3724c67deed Mon Sep 17 00:00:00 2001
+From bcfa3dba803fbc577ffba930dab5c3e7617d6533 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 8b5cfc78a..5aafa4e23 100644
+index 27ea8984fb..982e18f8af 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -733,6 +733,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0133-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0132-Add-setting-for-proxy-online-mode-status.patch
similarity index 93%
rename from Spigot-Server-Patches/0133-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0132-Add-setting-for-proxy-online-mode-status.patch
index 6709510ea1..34bef9c589 100644
--- a/Spigot-Server-Patches/0133-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0132-Add-setting-for-proxy-online-mode-status.patch
@@ -1,11 +1,11 @@
-From ee073c0208ecf659a81f02bd43bf65b4fe99699d Mon Sep 17 00:00:00 2001
+From 0a01c1e28d8e2357e9fa7cdf4682286cafc51820 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 011cbf5e3..cf06f8ac3 100644
+index 011cbf5e31..cf06f8ac3c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -230,4 +230,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 011cbf5e3..cf06f8ac3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index f13534917..85c7a96c5 100644
+index f135349174..85c7a96c5a 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -60,7 +60,8 @@ public class NameReferencingFileConverter {
@@ -33,7 +33,7 @@ index f13534917..85c7a96c5 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 7cb795dd8..e125632ff 100644
+index 7cb795dd89..e125632ffe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1357,7 +1357,8 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0134-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0133-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 96%
rename from Spigot-Server-Patches/0134-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0133-Optimise-BlockStateEnum-hashCode-and-equals.patch
index dbfc695357..407fd4450e 100644
--- a/Spigot-Server-Patches/0134-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0133-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,11 +1,11 @@
-From 8581e708e437ba0aedfd536cef77fcd7cadf7abe Mon Sep 17 00:00:00 2001
+From 300e97ecdb34c2c837b4610065ce834de7be0afb Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 725087de5..5e6cb5d7d 100644
+index 725087de59..5e6cb5d7de 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
 @@ -17,6 +17,11 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
diff --git a/Spigot-Server-Patches/0135-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0134-Disable-ticking-of-snow-blocks.patch
similarity index 89%
rename from Spigot-Server-Patches/0135-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0134-Disable-ticking-of-snow-blocks.patch
index d4756dbaed..6839453fc7 100644
--- a/Spigot-Server-Patches/0135-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0134-Disable-ticking-of-snow-blocks.patch
@@ -1,11 +1,11 @@
-From 27d2d5a316ab5a3c70afafb1fec9c236c35b02ab Mon Sep 17 00:00:00 2001
+From 5f1f0cd80117d5f1a165875516edbd0a6f44510f Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockSnowBlock.java b/src/main/java/net/minecraft/server/BlockSnowBlock.java
-index 0c8f9d37f..44ed65626 100644
+index 0c8f9d37fd..44ed656263 100644
 --- a/src/main/java/net/minecraft/server/BlockSnowBlock.java
 +++ b/src/main/java/net/minecraft/server/BlockSnowBlock.java
 @@ -16,6 +16,8 @@ public class BlockSnowBlock extends Block {
diff --git a/Spigot-Server-Patches/0136-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0135-Fix-AIOOBE-in-inventory-handling.patch
similarity index 91%
rename from Spigot-Server-Patches/0136-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0135-Fix-AIOOBE-in-inventory-handling.patch
index 84d61a6ec1..89f4951316 100644
--- a/Spigot-Server-Patches/0136-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0135-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,11 +1,11 @@
-From 6fabf2f21ad94320e5e9a0ce4662598185a03b2e Mon Sep 17 00:00:00 2001
+From 5b34a9ea3ba3c3732c57d3ff3703e608c4eef485 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 32cef8e30..b17540ecb 100644
+index fc33baf2bf..9ec898d164 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2085,7 +2085,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0137-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0136-Configurable-packet-in-spam-threshold.patch
similarity index 94%
rename from Spigot-Server-Patches/0137-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0136-Configurable-packet-in-spam-threshold.patch
index c4ff8687da..70077b324d 100644
--- a/Spigot-Server-Patches/0137-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0136-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From d7bbea2686479f0573da09c114879cc3c4768962 Mon Sep 17 00:00:00 2001
+From 337acb808b81ce7d4dbfe020a896347e929ec663 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 cf06f8ac3..2001175bf 100644
+index cf06f8ac3c..2001175bf8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -235,4 +235,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index cf06f8ac3..2001175bf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b17540ecb..a41fa05ee 100644
+index 9ec898d164..7baa679e16 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1186,13 +1186,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0138-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0137-Configurable-flying-kick-messages.patch
similarity index 94%
rename from Spigot-Server-Patches/0138-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0137-Configurable-flying-kick-messages.patch
index b307c26aca..ec5b92f0b3 100644
--- a/Spigot-Server-Patches/0138-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0137-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From 1f456ac80600eb29d13fd5f4eeec395f6a3a98bb Mon Sep 17 00:00:00 2001
+From d69854a0718d761e7e8a5bf74c3716a1f64a6635 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 2001175bf..621c585e7 100644
+index 2001175bf8..621c585e7e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -244,4 +244,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 2001175bf..621c585e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a41fa05ee..1f2cfbc92 100644
+index 7baa679e16..fc4e927d67 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,6 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0139-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0138-Auto-Save-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0139-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0138-Auto-Save-Improvements.patch
index 1f2cb88d02..b921f38e54 100644
--- a/Spigot-Server-Patches/0139-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0138-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From d90131ced1d9d0e53f7c997d16e8ebffb3c3a761 Mon Sep 17 00:00:00 2001
+From aabf1de6eaa18e36ab9b50c24db1b2f2ec369eda Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 621c585e7..459c86bce 100644
+index 621c585e7e..459c86bce2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -251,4 +251,15 @@ public class PaperConfig {
@@ -32,7 +32,7 @@ index 621c585e7..459c86bce 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0e6c18b32..c182ceffb 100644
+index 0e6c18b327..c182ceffb1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -64,7 +64,7 @@ index 0e6c18b32..c182ceffb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c27073d27..06d6814b8 100644
+index c27073d27c..06d6814b83 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -52,9 +52,9 @@ public class Chunk implements IChunkAccess {
@@ -96,7 +96,7 @@ index c27073d27..06d6814b8 100644
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 4f9ece9e4..afeb0685b 100644
+index 4f9ece9e47..afeb0685b0 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1,5 +1,6 @@
@@ -116,7 +116,7 @@ index 4f9ece9e4..afeb0685b 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 982e18f8a..1879c3238 100644
+index 982e18f8af..1879c32381 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -38,6 +38,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -128,7 +128,7 @@ index 982e18f8a..1879c3238 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5f17ec1e9..94df23c31 100644
+index 5f17ec1e9d..94df23c31f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -144,6 +144,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -175,7 +175,7 @@ index 5f17ec1e9..94df23c31 100644
          this.methodProfiler.a("snooper");
          if (getSnooperEnabled() && !this.j.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d0c547cc9..12f6812d6 100644
+index d0c547cc99..12f6812d67 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -341,6 +341,7 @@ public abstract class PlayerList {
@@ -214,7 +214,7 @@ index d0c547cc9..12f6812d6 100644
      public WhiteList getWhitelist() {
          return this.whitelist;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 96002184b..bf07155bc 100644
+index 96002184bb..bf07155bc1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -872,8 +872,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0140-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0139-Chunk-registration-fixes.patch
similarity index 90%
rename from Spigot-Server-Patches/0140-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0139-Chunk-registration-fixes.patch
index 3fbfc4895c..c14f5dea3a 100644
--- a/Spigot-Server-Patches/0140-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0139-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From be60b6d44fc147afab85cfd2e75313fd053fd746 Mon Sep 17 00:00:00 2001
+From 077b1083946830fd30de8b44913abf39100c97a8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 45ab70167..5d3378be0 100644
+index 45ab70167a..5d3378be0b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1474,7 +1474,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0141-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0140-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 89%
rename from Spigot-Server-Patches/0141-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0140-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 6f49382da0..56a80ece40 100644
--- a/Spigot-Server-Patches/0141-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0140-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,11 +1,11 @@
-From e05148f8cd85509c3dfa6580961b625e76b5ba9e Mon Sep 17 00:00:00 2001
+From 1a602000612c28f2376c093593250ff851542acb 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 8392b16b3..752b56435 100644
+index 8392b16b3b..752b56435d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 @@ -62,4 +62,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {
diff --git a/Spigot-Server-Patches/0142-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0141-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 90%
rename from Spigot-Server-Patches/0142-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0141-Auto-fix-bad-Y-levels-on-player-login.patch
index 767b7f982a..b16c02adcf 100644
--- a/Spigot-Server-Patches/0142-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0141-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 14bdfe423406bd73328a42edff706d053538a9e9 Mon Sep 17 00:00:00 2001
+From a079a95c1d916ad191338fb5fad68745d9cf1558 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f5fae7ba8..dc32dc80d 100644
+index 1879c32381..b76c28147b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -199,6 +199,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0143-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0142-Disable-Vanilla-Chunk-GC.patch
similarity index 92%
rename from Spigot-Server-Patches/0143-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0142-Disable-Vanilla-Chunk-GC.patch
index ebbf325fc7..559e3669c8 100644
--- a/Spigot-Server-Patches/0143-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0142-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 42f903c1bbf57ab046c7bb5b730bc04b9ea9f691 Mon Sep 17 00:00:00 2001
+From 0f4827d2c74c4372c38edf9a701a45ed926c67b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 72b3a6d40..e766e2536 100644
+index bf07155bc1..8f6ce6bf1a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -889,7 +889,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0143-Option-to-remove-corrupt-tile-entities.patch
similarity index 93%
rename from Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0143-Option-to-remove-corrupt-tile-entities.patch
index 0445b2649d..1804e0f798 100644
--- a/Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0143-Option-to-remove-corrupt-tile-entities.patch
@@ -1,11 +1,11 @@
-From 2a9a58bbd5fc82a274e2189b2fd43d7719e6c64c Mon Sep 17 00:00:00 2001
+From 2a52beed13f3f3eeccccaec83bb210f0c10aad43 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c182ceffb..9a2ec0793 100644
+index c182ceffb1..9a2ec07939 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -314,4 +314,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index c182ceffb..9a2ec0793 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 06d6814b8..7a797bef0 100644
+index 06d6814b83..7a797bef0d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -829,6 +829,12 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0145-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0144-Add-EntityZapEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0145-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0144-Add-EntityZapEvent.patch
index 7dfee18bd6..7550375684 100644
--- a/Spigot-Server-Patches/0145-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0144-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From d2f8d17d9f237442ffd96055011475ecaf059e51 Mon Sep 17 00:00:00 2001
+From e858d6c03e2ac879054dceb8daa3ea41be42c4ca 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 286382399f..2c7677b480 100644
+index 34b6b01a30..670f26c827 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -152,6 +152,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 286382399f..2c7677b480 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 6c66f7deb5..f14d118427 100644
+index 32893a32c9..45df38bad4 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -610,6 +610,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
diff --git a/Spigot-Server-Patches/0146-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0145-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 94%
rename from Spigot-Server-Patches/0146-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0145-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 3aa6029cf5..9eaee7704f 100644
--- a/Spigot-Server-Patches/0146-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0145-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From c6e872685630cb2732c1f34b2f53d95867fcea05 Mon Sep 17 00:00:00 2001
+From 6f5410680ed1d35082625a9c84be695294046115 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 1ad39aca3..7262c2b19 100644
+index 1ad39aca3b..7262c2b19f 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -196,7 +196,12 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC
diff --git a/Spigot-Server-Patches/0147-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 94%
rename from Spigot-Server-Patches/0147-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index fd8e7a45ef..30b8f1bef2 100644
--- a/Spigot-Server-Patches/0147-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 821c5c8577518add23e8a91fec1d7dc1ca81d7f2 Mon Sep 17 00:00:00 2001
+From a3cbf1ef9b9bef9fb1dc6f3b8aaf989d380cc04b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -7,7 +7,7 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9a2ec0793..f88444c7e 100644
+index 9a2ec07939..f88444c7e7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -315,6 +315,11 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index 9a2ec0793..f88444c7e 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index afeb0685b..a4c4a9486 100644
+index afeb0685b0..a4c4a9486b 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -249,6 +249,14 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -51,7 +51,7 @@ index afeb0685b..a4c4a9486 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 2f1488ee5..859148cb8 100644
+index 2f1488ee53..859148cb86 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -137,6 +137,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0148-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0147-Chunk-Save-Stats-Debug-Option.patch
similarity index 97%
rename from Spigot-Server-Patches/0148-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0147-Chunk-Save-Stats-Debug-Option.patch
index 1fc1f7bd6d..6f176a9d11 100644
--- a/Spigot-Server-Patches/0148-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0147-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From 908a149ec4d6d824d1457eb2745f45e5afbfb942 Mon Sep 17 00:00:00 2001
+From 3bfb26feb30df2fd52c8d8977140a3e4a5348349 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index a4c4a9486..4be7173bf 100644
+index a4c4a9486b..4be7173bf2 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -36,6 +36,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -55,7 +55,7 @@ index a4c4a9486..4be7173bf 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 859148cb8..ea8684747 100644
+index 859148cb86..ea8684747d 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -137,7 +137,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0149-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0148-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 94%
rename from Spigot-Server-Patches/0149-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0148-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index ffeb24b9a2..662524d678 100644
--- a/Spigot-Server-Patches/0149-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0148-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From ede8e8d3f9e7c61a406433dd867cb320b744d3e1 Mon Sep 17 00:00:00 2001
+From 0e73fa9632dbbe4ec144af5f0b97994773f52470 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f88444c7e..f64a5ef35 100644
+index f88444c7e7..f64a5ef35f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -30,7 +30,7 @@ index f88444c7e..f64a5ef35 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 7e5a2775a..ad5ac66ac 100644
+index 33bc46b054..4e1b74ebe4 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -228,6 +228,15 @@ public class EntityFallingBlock extends Entity {
diff --git a/Spigot-Server-Patches/0150-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
similarity index 96%
rename from Spigot-Server-Patches/0150-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
index c370520266..06a5090fba 100644
--- a/Spigot-Server-Patches/0150-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
@@ -1,11 +1,11 @@
-From 85f2e0489f30bf8ab598150d903f060544c593ea Mon Sep 17 00:00:00 2001
+From 5932dddd728efb8aad079283e90ce638dfe95471 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 2f6d79b03..89a11a496 100644
+index a22f4c55e9..b6e8296824 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -93,6 +93,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0151-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0150-Optimize-Network-Queue.patch
similarity index 90%
rename from Spigot-Server-Patches/0151-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0150-Optimize-Network-Queue.patch
index 70a98027dd..13bfaab9f9 100644
--- a/Spigot-Server-Patches/0151-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0150-Optimize-Network-Queue.patch
@@ -1,11 +1,11 @@
-From 2f10cd1f97fd59757d6e3d452cc8afe6e36fb3ab Mon Sep 17 00:00:00 2001
+From e1b901c4c6129afd133c9364c4996e61b03ab618 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bf020293d..f81ff5628 100644
+index 94df23c31f..c97953a2fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -118,7 +118,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0152-Optimise-removeQueue.patch b/Spigot-Server-Patches/0151-Optimise-removeQueue.patch
similarity index 96%
rename from Spigot-Server-Patches/0152-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0151-Optimise-removeQueue.patch
index d9556926df..aa0576713c 100644
--- a/Spigot-Server-Patches/0152-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0151-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From 79801a202521b7cd79bdb5e0c2389e6993677099 Mon Sep 17 00:00:00 2001
+From 046d278b356f8850334858fdf7c1e4b1048e667b 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 dc32dc80d..cf2a39384 100644
+index b76c28147b..4bde378afb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -5,8 +5,10 @@ import com.mojang.authlib.GameProfile;
diff --git a/Spigot-Server-Patches/0153-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0152-Allow-Reloading-of-Command-Aliases.patch
similarity index 93%
rename from Spigot-Server-Patches/0153-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0152-Allow-Reloading-of-Command-Aliases.patch
index 2f87c93386..2ab039337e 100644
--- a/Spigot-Server-Patches/0153-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0152-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 8c64658c0fc06e452f61e18f3e5c5191edd1890b Mon Sep 17 00:00:00 2001
+From f1900c57c2495acc1a0747ef052e9123a535936e Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e125632ff..d7247a1ec 100644
+index e125632ffe..d7247a1ec9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1968,5 +1968,24 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0153-Add-source-to-PlayerExpChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0153-Add-source-to-PlayerExpChangeEvent.patch
index 57da2beb85..1b69b61352 100644
--- a/Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0153-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From f14b1122c926551e727b08ae7e699917c7fec942 Mon Sep 17 00:00:00 2001
+From fb639b8ca21b61e7043169b518c47f59b200e512 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/Spigot-Server-Patches/0155-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0154-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 90%
rename from Spigot-Server-Patches/0155-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0154-Optimize-World.isLoaded-BlockPosition-Z.patch
index 256435b374..425a04ac3b 100644
--- a/Spigot-Server-Patches/0155-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0154-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 28b408d7f00001f367ebc48d66e6cc33510fafdc Mon Sep 17 00:00:00 2001
+From 7a5bea01249d8a9da6a2ac09ae808e0baeb1e9fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 04b5521cd..ca7c23f54 100644
+index 5d3378be0b..92070c9325 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -273,6 +273,10 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0156-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch
similarity index 91%
rename from Spigot-Server-Patches/0156-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch
index be6e24e4c3..9bba7a93f5 100644
--- a/Spigot-Server-Patches/0156-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From 3b917e4772c474dd49cf79fb2fcc46cbddf928bf Mon Sep 17 00:00:00 2001
+From 458307a35436678f93443b917ff19d94e341a212 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 34c617958..c7ef67a52 100644
+index e56f458ca9..167cbb2820 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 34c617958..c7ef67a52 100644
      public int dimension;
      protected BlockPosition aq;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 866f41980..8630184d4 100644
+index 7c119282b9..4f801e8fec 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -190,6 +190,12 @@ public class EntityFishingHook extends Entity {
diff --git a/Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0156-Add-ProjectileCollideEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0156-Add-ProjectileCollideEvent.patch
index 4f78170faf..f1bb4181d4 100644
--- a/Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0156-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 180ca0b7f1381aea69c6be70f5022c8821be8534 Mon Sep 17 00:00:00 2001
+From 7b0507da629c3fcacfddd3c1da01a7bbf86fd8d8 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
@@ -46,7 +46,7 @@ index 3e3619d79f..58cc4824cf 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 8630184d4b..7440e4a2a9 100644
+index 4f801e8fec..1804a49de9 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -245,6 +245,16 @@ public class EntityFishingHook extends Entity {
diff --git a/Spigot-Server-Patches/0158-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0157-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 93%
rename from Spigot-Server-Patches/0158-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0157-Prevent-Pathfinding-out-of-World-Border.patch
index 2c7d94bbb1..46042786a5 100644
--- a/Spigot-Server-Patches/0158-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0157-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 4bfd853ce5f453c11bf3376a7c25a66964be68be Mon Sep 17 00:00:00 2001
+From 44e9f98e750fe8171d75df30354e63ef03e5b5ba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 0c5215657..05e0545fd 100644
+index 76d1f4bd21..76b2787bae 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -73,6 +73,7 @@ public abstract class NavigationAbstract {
@@ -26,7 +26,7 @@ index 0c5215657..05e0545fd 100644
              if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
                  return this.c;
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 4763c30a8..ec5386fd5 100644
+index 4763c30a81..ec5386fd50 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -29,7 +29,7 @@ public class WorldBorder {
diff --git a/Spigot-Server-Patches/0159-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0158-Bound-Treasure-Maps-to-World-Border.patch
similarity index 95%
rename from Spigot-Server-Patches/0159-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0158-Bound-Treasure-Maps-to-World-Border.patch
index 981283a738..a092defa2b 100644
--- a/Spigot-Server-Patches/0159-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0158-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From c562348ff2e519c8f456cdf7966730a3391cea5b Mon Sep 17 00:00:00 2001
+From 2251066897e6922fa76254032d8420e91fb16eca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 263ea953a..8b8b468f3 100644
+index 263ea953ad..8b8b468f39 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -124,6 +124,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 263ea953a..8b8b468f3 100644
  
                                  if (structurestart != StructureGenerator.a) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index ec5386fd5..08424a88b 100644
+index ec5386fd50..08424a88bf 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -33,6 +33,18 @@ public class WorldBorder {
diff --git a/Spigot-Server-Patches/0160-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0159-Configurable-Cartographer-Treasure-Maps.patch
similarity index 93%
rename from Spigot-Server-Patches/0160-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0159-Configurable-Cartographer-Treasure-Maps.patch
index edc9d45512..fa3eea38e5 100644
--- a/Spigot-Server-Patches/0160-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0159-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From ec6f484932e8d2c5f039245e18942fa4c02fc7fb Mon Sep 17 00:00:00 2001
+From 964311e665d25efb129818b19d3c3ac8630214d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f64a5ef35..5df8b1143 100644
+index f64a5ef35f..5df8b1143f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -333,4 +333,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index f64a5ef35..5df8b1143 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index abfd9adbd..dcc14aa11 100644
+index 45df38bad4..e8fdf86250 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -755,6 +755,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
diff --git a/Spigot-Server-Patches/0161-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch
similarity index 89%
rename from Spigot-Server-Patches/0161-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch
index 6a20ec00f1..72003cc744 100644
--- a/Spigot-Server-Patches/0161-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From a568807b1275842ccd23458e723c4bcaac760497 Mon Sep 17 00:00:00 2001
+From 4dc090c70a0b01357032d2293e26ecb341779756 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ed714c2cc..ca169e113 100644
+index e120521611..023dd48a23 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -140,7 +140,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0162-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0161-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 92%
rename from Spigot-Server-Patches/0162-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0161-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 47890bf920..0371f57d7e 100644
--- a/Spigot-Server-Patches/0162-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0161-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 542ff3ee75511fdfb8bd5963063c428d43a82747 Mon Sep 17 00:00:00 2001
+From 733a688296bb6dd124969295ffb9238c561d6405 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index cf11a2225..578d96640 100644
+index cf11a2225b..578d966401 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index cf11a2225..578d96640 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..8a06cb165 100644
+index 2b66a08ade..8a06cb1656 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0163-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0162-Add-option-to-remove-invalid-statistics.patch
similarity index 94%
rename from Spigot-Server-Patches/0163-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0162-Add-option-to-remove-invalid-statistics.patch
index fe6c6d90d5..2ce48552ff 100644
--- a/Spigot-Server-Patches/0163-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0162-Add-option-to-remove-invalid-statistics.patch
@@ -1,11 +1,11 @@
-From 2544e5bd92cf9529f315cd485c63960ee5bb9658 Mon Sep 17 00:00:00 2001
+From cecf8ef12df4777c1c8f69f7f6420609a352b043 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 459c86bce..ea6fcb39f 100644
+index 459c86bce2..ea6fcb39f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -262,4 +262,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 459c86bce..ea6fcb39f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 172f72fd8..7ba12c23d 100644
+index 07e7db455b..34c57e26f4 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -83,6 +83,7 @@ public class ServerStatisticManager extends StatisticManager {
diff --git a/Spigot-Server-Patches/0164-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0163-Properly-fix-item-duplication-bug.patch
similarity index 91%
rename from Spigot-Server-Patches/0164-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0163-Properly-fix-item-duplication-bug.patch
index 3ad1c4ef4e..f716a2404f 100644
--- a/Spigot-Server-Patches/0164-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0163-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 92dd98b36207e4e5aa69b572e52cf01641543621 Mon Sep 17 00:00:00 2001
+From 5f881637843edb83974634b9c7ed501943135071 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4bde378af..7059fc118 100644
+index 4bde378afb..7059fc1187 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1525,7 +1525,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index 4bde378af..7059fc118 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index fc4e927d6..9ac86f7af 100644
+index fc4e927d67..9ac86f7af2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2504,7 +2504,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0165-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0164-String-based-Action-Bar-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0165-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0164-String-based-Action-Bar-API.patch
index 759ae55c71..a15aabe5f4 100644
--- a/Spigot-Server-Patches/0165-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0164-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 3d11f50f3781e08137517897b588503b5eede4d7 Mon Sep 17 00:00:00 2001
+From f5962e81f2d63910e83d54400b0173879b453d57 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 70cdc3f10..381542e0d 100644
+index 70cdc3f102..381542e0d2 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,10 +1,13 @@
@@ -62,7 +62,7 @@ index 70cdc3f10..381542e0d 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dea59d3fa..a546f3118 100644
+index dea59d3fab..a546f3118e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -208,6 +208,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0166-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0165-Activation-Range-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0166-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0165-Activation-Range-Improvements.patch
index 4980f156d0..940b1b43c4 100644
--- a/Spigot-Server-Patches/0166-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0165-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From f99c9ad753cb27454bb9bbc36b4c9ba4d54027e2 Mon Sep 17 00:00:00 2001
+From 571ec9d52c313314df1280403dd225517047839b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index b34756769..53b25dd80 100644
+index b347567699..53b25dd805 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -6,6 +6,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -18,7 +18,7 @@ index b34756769..53b25dd80 100644
      private float b;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8dbff3c37..3da4bc356 100644
+index 8dbff3c370..3da4bc356a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -74,7 +74,7 @@ public abstract class EntityLiving extends Entity {
@@ -31,7 +31,7 @@ index 8dbff3c37..3da4bc356 100644
      protected int ticksFarFromPlayer;
      protected float aZ;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index bb86ecb2f..5cd8c3f28 100644
+index bb86ecb2fb..5cd8c3f288 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -43,7 +43,7 @@ index bb86ecb2f..5cd8c3f28 100644
          return this.bQ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index a146a8b45..a19853463 100644
+index a146a8b459..a19853463c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@@ -59,7 +59,7 @@ index a146a8b45..a19853463 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index d5c08aa7c..fe6570c88 100644
+index d5c08aa7cb..fe6570c88d 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -2,17 +2,24 @@ package net.minecraft.server;
@@ -99,7 +99,7 @@ index d5c08aa7c..fe6570c88 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index e02647f80..cdbf769e7 100644
+index e02647f806..cdbf769e7b 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball;
diff --git a/Spigot-Server-Patches/0167-Firework-API-s.patch b/Spigot-Server-Patches/0166-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0167-Firework-API-s.patch
rename to Spigot-Server-Patches/0166-Firework-API-s.patch
index c6ab9a39c7..6b9f909308 100644
--- a/Spigot-Server-Patches/0167-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0166-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From 03ba9d6471507f90f994c073cb953104b14a9bf9 Mon Sep 17 00:00:00 2001
+From 9e4afcd7dd8a13723ed96074ecc3f71bef52f7d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 4c2cdd4bc..abf8799c4 100644
+index 6e2592e96d..f9332d3fda 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 4c2cdd4bc..abf8799c4 100644
  
      public boolean bk() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 7b1d51e5a..1493d0999 100644
+index 5eae1724ed..d4420e68fb 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -19,6 +19,7 @@ public class ItemFireworks extends Item {
@@ -73,7 +73,7 @@ index 7b1d51e5a..1493d0999 100644
                  if (!entityhuman.abilities.canInstantlyBuild) {
                      itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index e658816c2..0d69deb51 100644
+index e658816c24..0d69deb51c 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -108,7 +108,7 @@ public class NBTTagCompound implements NBTBase {
@@ -86,7 +86,7 @@ index e658816c2..0d69deb51 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 7b3b20682..b39e33f4f 100644
+index 7b3b206823..b39e33f4f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -1,6 +1,7 @@
diff --git a/Spigot-Server-Patches/0168-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0167-PlayerTeleportEndGatewayEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0168-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0167-PlayerTeleportEndGatewayEvent.patch
index 357eec5680..c4df78a8f8 100644
--- a/Spigot-Server-Patches/0168-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0167-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From dcd26cf78eb1be638e65f503ec57c45ad15a6b0b Mon Sep 17 00:00:00 2001
+From e2f315dc84a82b3d7a612787b73136bcb502495e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index bb9822799..c3d30dc94 100644
+index 9fd4ab6a7f..888bbd7a45 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -126,7 +126,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/0169-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0168-ShulkerBox-Dupe-Prevention.patch
similarity index 90%
rename from Spigot-Server-Patches/0169-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0168-ShulkerBox-Dupe-Prevention.patch
index 1464ff67b4..7928c2ed67 100644
--- a/Spigot-Server-Patches/0169-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0168-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From aad88b0533769c7d6b63acdd216dda85afc81ffc Mon Sep 17 00:00:00 2001
+From 14c4520470eb40961776f706ffb916db46f2128e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.
 
 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index a823e7073..37ec634f6 100644
+index 82b4d82c0e..d00bd9d610 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -100,6 +100,7 @@ public class BlockShulkerBox extends BlockTileEntity {
diff --git a/Spigot-Server-Patches/0170-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0169-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0170-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0169-Provide-E-TE-Chunk-count-stat-methods.patch
index fdae65a9ac..92908aaaa1 100644
--- a/Spigot-Server-Patches/0170-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0169-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 7fd2743b54acb9d73497c60fac89f8c2ab7b783d Mon Sep 17 00:00:00 2001
+From fc7de1415a8052d3d1eb76f878c5bcd34258c9bb 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,7 +7,7 @@ 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 90e260f3b..8b63192cf 100644
+index 90e260f3b3..8b63192cf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -81,6 +81,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0171-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0170-Enforce-Sync-Player-Saves.patch
similarity index 91%
rename from Spigot-Server-Patches/0171-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0170-Enforce-Sync-Player-Saves.patch
index dbc70c0181..904a4a8ae0 100644
--- a/Spigot-Server-Patches/0171-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0170-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 0e2d3a5968ee223fd6d7c206a3393be137bd0046 Mon Sep 17 00:00:00 2001
+From c8cb88449adba448d0c187dca5d998dd2f22a236 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 12f6812d6..c8b5a610a 100644
+index 12f6812d67..c8b5a610aa 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1220,6 +1220,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0172-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0171-Enforce-Sync-Chunk-Unloads.patch
similarity index 92%
rename from Spigot-Server-Patches/0172-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0171-Enforce-Sync-Chunk-Unloads.patch
index 73e150c0d3..0ee1099acc 100644
--- a/Spigot-Server-Patches/0172-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0171-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 52a8c651983adc960cd9028d41fad58b1db2e468 Mon Sep 17 00:00:00 2001
+From 43dcb62043ee21ca98b65960606e890140287243 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8b63192cf..86848543d 100644
+index 8b63192cf9..86848543d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -224,6 +224,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 89%
rename from Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch
index 17ea7f498f..c7ffe47b0a 100644
--- a/Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From ed67deba02ff56017e9557fc956c66b39cf8c645 Mon Sep 17 00:00:00 2001
+From ff2027323bb780168321193a701b4328d3742544 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 c7ef67a52..4bfc49076 100644
+index 167cbb2820..78b7b8be99 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2088,6 +2088,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0174-Fix-block-break-desync.patch b/Spigot-Server-Patches/0173-Fix-block-break-desync.patch
similarity index 90%
rename from Spigot-Server-Patches/0174-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0173-Fix-block-break-desync.patch
index a8c3956c54..d63d4d442c 100644
--- a/Spigot-Server-Patches/0174-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0173-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From 9d17fa0376681765789ccddcb32b0310bdf1ed67 Mon Sep 17 00:00:00 2001
+From e84c33f296ef5dda7c89380053e5609ea81c9736 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 f26636e30..aa93b5945 100644
+index 9ac86f7af2..62b7d86e17 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1145,6 +1145,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index f26636e30..aa93b5945 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 96%
rename from Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index dde65c5e8d..402fd9d558 100644
--- a/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From cf91146dbca0cbe6b854ea98e00be7a4bf6de4c6 Mon Sep 17 00:00:00 2001
+From a2f619363cdd57c1db00dd504b5ed68e2218267d 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 43feccef8..e820bfbd5 100644
+index 43feccef8f..e820bfbd56 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -471,13 +471,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index 43feccef8..e820bfbd5 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 131f8a515..d8ab87e21 100644
+index 131f8a5156..d8ab87e216 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -41,7 +41,7 @@ index 131f8a515..d8ab87e21 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 3c888d601..79d80596d 100644
+index 3c888d6015..79d80596df 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity {
@@ -120,7 +120,7 @@ index 3c888d601..79d80596d 100644
  
      public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 1804a49de..82e4d2eab 100644
+index 1804a49de9..82e4d2eab6 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -467,7 +467,7 @@ public class EntityFishingHook extends Entity {
@@ -133,7 +133,7 @@ index 1804a49de..82e4d2eab 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.D)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3da4bc356..f9a76ce27 100644
+index 3da4bc356a..f9a76ce27c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -353,7 +353,8 @@ public abstract class EntityLiving extends Entity {
@@ -147,7 +147,7 @@ index 3da4bc356..f9a76ce27 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 a5e1939e0..e73dba09a 100644
+index a5e1939e05..e73dba09a6 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -36,7 +36,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -160,7 +160,7 @@ index a5e1939e0..e73dba09a 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index e8fdf8625..b51543ea7 100644
+index e8fdf86250..b51543ea7a 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -411,7 +411,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -173,7 +173,7 @@ index e8fdf8625..b51543ea7 100644
  
          if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 4a128f707..b87096467 100644
+index 4a128f707b..b870964674 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -186,7 +186,7 @@ index 4a128f707..b87096467 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 545a98302..55ec29bd2 100644
+index f455317eb6..55e45f84ca 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -384,7 +384,7 @@ public class PlayerInteractManager {
@@ -199,7 +199,7 @@ index 545a98302..55ec29bd2 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 998662d9e..6b4eb7f05 100644
+index 998662d9e6..6b4eb7f053 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -221,7 +221,7 @@ index 998662d9e..6b4eb7f05 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 86848543d..7004f1176 100644
+index 86848543d0..7004f11764 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1220,7 +1220,7 @@ public class CraftWorld implements World {
@@ -234,7 +234,7 @@ index 86848543d..7004f1176 100644
              // not sure what this can do
              if (LightningStrike.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 3a09cab3d4..3302af0e45 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 {
diff --git a/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
similarity index 93%
rename from Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
index 40512af49f..ab5926037d 100644
--- a/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From a831d40bdd5ca262053ca1c02870cc533a90a306 Mon Sep 17 00:00:00 2001
+From b2a476a7e2062d113de8a10658ce6b40b2bad9ee 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 5df8b1143..0b748d402 100644
+index 5df8b1143f..0b748d402b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -343,4 +343,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 5df8b1143..0b748d402 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4bfc49076..8a04a801b 100644
+index 78b7b8be99..6db20aa75c 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
@@ -39,7 +39,7 @@ index 4bfc49076..8a04a801b 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b25d4b714..f85da758d 100644
+index f9a76ce27c..3b4867bfc9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2318,8 +2318,11 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0176-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 96%
rename from Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0176-Remove-CraftScheduler-Async-Task-Debugger.patch
index d7e015fc3f..f615dba082 100644
--- a/Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0176-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From dac6c2c4e9dc1417cda683cf1ec54f22774da31c Mon Sep 17 00:00:00 2001
+From 41d4fcb5e9244eeb5cbd7da27dd7e9917b6b5ad6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 26753fac5..a2fadaf82 100644
+index 26753fac5e..a2fadaf82c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -84,8 +84,8 @@ public class CraftScheduler implements BukkitScheduler {
@@ -58,5 +58,5 @@ index 26753fac5..a2fadaf82 100644
  
      @Deprecated
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0177-Shame-on-you-Mojang.patch
similarity index 91%
rename from Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0177-Shame-on-you-Mojang.patch
index 11229e57c2..8cb01c0a48 100644
--- a/Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0177-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 17d230338982a4a23f4e00da04d055e05a6f884f Mon Sep 17 00:00:00 2001
+From a1b78315b821502b8462d4d2dab70bfb154ed863 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@@ -12,7 +12,7 @@ This then triggers async chunk loads!
 What in the hell were you thinking?
 
 diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index 1181d45fa..d081166d8 100644
+index 1181d45fad..d081166d86 100644
 --- a/src/main/java/net/minecraft/server/BlockBeacon.java
 +++ b/src/main/java/net/minecraft/server/BlockBeacon.java
 @@ -49,7 +49,7 @@ public class BlockBeacon extends BlockTileEntity {
@@ -34,5 +34,5 @@ index 1181d45fa..d081166d8 100644
      }
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 91%
rename from Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 95f1267b68..1512c2df73 100644
--- a/Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From 990b651cbd64dc43013878c653744f461492478e Mon Sep 17 00:00:00 2001
+From b460a12daf84e66911ff439a1605fa058aaaa35e 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/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 4be7173bf..7d77c5fb3 100644
+index 4be7173bf2..7d77c5fb31 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -327,7 +327,7 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch
similarity index 93%
rename from Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch
index 72d2b8bf6f..5b512424fe 100644
--- a/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 0fa5dce73cc9cdf2630c65eaa2ffaf4787580165 Mon Sep 17 00:00:00 2001
+From 224496958b947329bcbcf013a4f9492ba7f109d7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 578d96640..e9a746f13 100644
+index 578d966401..e9a746f138 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -764,5 +764,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 578d96640..e9a746f13 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3b4867bfc..b596a616f 100644
+index 3b4867bfc9..b596a616fe 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -201,6 +201,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0180-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0180-Properly-handle-async-calls-to-restart-the-server.patch
index 33a140c4dd..a9ce3c73c2 100644
--- a/Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0180-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 62401f6501f068b9494c86dc02f8ec41b2825a25 Mon Sep 17 00:00:00 2001
+From 2290cb8d1859a89dc6b1a8e9a6783c76a782849b 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 c97953a2f..8576545bb 100644
+index c97953a2fd..8576545bb7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -85,6 +85,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -78,7 +78,7 @@ index c97953a2f..8576545bb 100644
          return this.serverThread;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c8b5a610a..0b0d99652 100644
+index c8b5a610aa..0b0d996523 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1338,10 +1338,15 @@ public abstract class PlayerList {
@@ -107,7 +107,7 @@ index c8b5a610a..0b0d99652 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 947c43a5d..f15fd9f37 100644
+index 947c43a5d0..f15fd9f370 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,88 +46,123 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0181-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0181-Add-system-property-to-disable-book-size-limits.patch
index bb1c7a5888..b2354bb461 100644
--- a/Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0181-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From 7212abfc785954f473b1ae2c683b2a87852d5b8a Mon Sep 17 00:00:00 2001
+From 58676fef1f3ff751dc347888740ef41c7407e0cd 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 6ff1a2dcd..64a939952 100644
+index 6ff1a2dcd6..64a9399527 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -40,6 +40,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -57,5 +57,5 @@ index 6ff1a2dcd..64a939952 100644
              }
  
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0183-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0182-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 94%
rename from Spigot-Server-Patches/0183-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0182-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 9d07be7581..c4ef821dc1 100644
--- a/Spigot-Server-Patches/0183-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0182-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From ae5ea9831fce8e583f76f7f39513e5ee4475b617 Mon Sep 17 00:00:00 2001
+From 6c42bd5659094d1a85307d9ef4dc551473126982 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 0b748d402..99fe720e8 100644
+index 0b748d402b..99fe720e8b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -349,4 +349,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 0b748d402..99fe720e8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 83bfb6611..0486dee2c 100644
+index 06b663c4db..42c6249535 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -460,7 +460,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 83bfb6611..0486dee2c 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aa93b5945..383ef87ba 100644
+index 62b7d86e17..932eeb19db 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1746,6 +1746,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0184-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0183-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 91%
rename from Spigot-Server-Patches/0184-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0183-Add-configuration-option-to-prevent-player-names-fro.patch
index fa1f9493a6..7f9568620e 100644
--- a/Spigot-Server-Patches/0184-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0183-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From b7ebc8e864503bb53440d7d919063dbce2971df6 Mon Sep 17 00:00:00 2001
+From b8c5c89c35bee66e660db73012b2a74ab647db9e 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 ea6fcb39f..dbafef023 100644
+index ea6fcb39f4..dbafef023e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -271,4 +271,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index ea6fcb39f..dbafef023 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d7247a1ec..ff9346023 100644
+index d7247a1ec9..ff93460235 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1987,5 +1987,10 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0185-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0184-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0185-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0184-Use-TerminalConsoleAppender-for-console-improvements.patch
index 2f6894d6ee..75ca32b469 100644
--- a/Spigot-Server-Patches/0185-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0184-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From fac7eb134f5fdf048ac9db058b571944ed8c6015 Mon Sep 17 00:00:00 2001
+From ba46169bb1c11766a1570d04a2d16509993c141b Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 09b4ddf19..47e307a24 100644
+index 09b4ddf199..47e307a246 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -39,12 +39,6 @@
@@ -89,7 +89,7 @@ index 09b4ddf19..47e307a24 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 000000000..688b4715e
+index 0000000000..688b4715eb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -135,7 +135,7 @@ index 000000000..688b4715e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 0000000000..685deaa0e5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -157,7 +157,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index bf1fffcfe..af430b73f 100644
+index bf1fffcfee..af430b73f0 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -79,6 +79,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -199,7 +199,7 @@ index bf1fffcfe..af430b73f 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 8576545bb..0808da26f 100644
+index 8576545bb7..0808da26f6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -57,7 +57,6 @@ import org.apache.commons.lang3.Validate;
@@ -257,7 +257,7 @@ index 8576545bb..0808da26f 100644
  
      public KeyPair G() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0b0d99652..4cbe14801 100644
+index 0b0d996523..4cbe148010 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -78,8 +78,7 @@ public abstract class PlayerList {
@@ -271,7 +271,7 @@ index 0b0d99652..4cbe14801 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 ff9346023..21d9f381c 100644
+index ff93460235..21d9f381cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -137,8 +137,8 @@ import java.nio.ByteBuffer;
@@ -299,7 +299,7 @@ index ff9346023..21d9f381c 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 c552c624e..3245fded9 100644
+index c552c624e5..3245fded9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -14,7 +14,7 @@ import java.util.logging.Logger;
@@ -341,7 +341,7 @@ index c552c624e..3245fded9 100644
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb894..000000000
+index 26a2fb8942..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,74 +0,0 @@
@@ -420,7 +420,7 @@ index 26a2fb894..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02c..1e3aae3b8 100644
+index 33e8ea02c4..1e3aae3b8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -8,17 +8,27 @@ import java.util.logging.Level;
@@ -499,7 +499,7 @@ index 33e8ea02c..1e3aae3b8 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 984df4083..bbb5a84f3 100644
+index 984df4083d..bbb5a84f36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread {
@@ -513,7 +513,7 @@ index 984df4083..bbb5a84f3 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 b64097113..000000000
+index b640971130..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -572,7 +572,7 @@ index b64097113..000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00e..08b6bb7f9 100644
+index 5cee8f00ef..08b6bb7f97 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
diff --git a/Spigot-Server-Patches/0186-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0185-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 92%
rename from Spigot-Server-Patches/0186-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0185-provide-a-configurable-option-to-disable-creeper-lin.patch
index 6391c95b6f..039c5aec67 100644
--- a/Spigot-Server-Patches/0186-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0185-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 36d19d1a7e42d31db09f1d3b94cb2293dbf484df Mon Sep 17 00:00:00 2001
+From 1f16a8e86d08dd4f21e281e6ef39d68909d61119 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 99fe720e8..c80d84b9b 100644
+index 99fe720e8b..c80d84b9b2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -355,4 +355,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 99fe720e8..c80d84b9b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 8b0134ecd..0147054df 100644
+index 8b0134ecdb..0147054dff 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -214,7 +214,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0187-Item-canEntityPickup.patch b/Spigot-Server-Patches/0186-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0187-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0186-Item-canEntityPickup.patch
index f26d366ba4..6b06b44ef1 100644
--- a/Spigot-Server-Patches/0187-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0186-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From 11478e1b753667087f079de9c6aa568c7c40efd8 Mon Sep 17 00:00:00 2001
+From d59a01eaa5f962e8616dd5b2916f194ca8636432 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 d29364b01..9dc86e90d 100644
+index 3723fd9770..14d122b22b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -512,6 +512,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index d29364b01..9dc86e90d 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 4af09f5cd..f2a4476c5 100644
+index 4af09f5cdb..f2a4476c5c 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -13,6 +13,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index 4af09f5cd..f2a4476c5 100644
      private UUID f;
      private UUID g;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index a17a537d6..1df17f09b 100644
+index a17a537d69..1df17f09bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item {
diff --git a/Spigot-Server-Patches/0188-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0187-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0188-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0187-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 22c8b779a1..156f2e7b07 100644
--- a/Spigot-Server-Patches/0188-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0187-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From 96319109ec641f4aca1b0267122c18112b42bf46 Mon Sep 17 00:00:00 2001
+From a7b7ab149feb1f3dca1cb24e0d88e43118021449 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index f2a4476c5..62d1c3d11 100644
+index f2a4476c5c..62d1c3d119 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -308,6 +308,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0189-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0188-PlayerAttemptPickupItemEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0189-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0188-PlayerAttemptPickupItemEvent.patch
index d4086ff75d..1f7a657ec5 100644
--- a/Spigot-Server-Patches/0189-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0188-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From a245aa5dfbedac9d105b7d507a4d180ca22108f2 Mon Sep 17 00:00:00 2001
+From e7685d8e92926c91d7704389eedf46fd90446b3c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 62d1c3d11..d232bab74 100644
+index 62d1c3d119..d232bab745 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
diff --git a/Spigot-Server-Patches/0190-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0189-Add-UnknownCommandEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0190-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0189-Add-UnknownCommandEvent.patch
index ca27bdfab7..7824bcff6f 100644
--- a/Spigot-Server-Patches/0190-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0189-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From be4afd9ab09714e4d71ad135da08502529867317 Mon Sep 17 00:00:00 2001
+From 8cc7d79a757d71e277e0699e18699769b8b131fb Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9fe7c6a0d..69cfe5c4d 100644
+index 21d9f381cc..814a65ec58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -79,6 +79,7 @@ import org.bukkit.craftbukkit.util.Versioning;
diff --git a/Spigot-Server-Patches/0191-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0190-Basic-PlayerProfile-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0191-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0190-Basic-PlayerProfile-API.patch
index cdbc52d0e0..6bda7d5cb6 100644
--- a/Spigot-Server-Patches/0191-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0190-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From ab857a7e34a6916af5ef7105f553d74934c8f5fb Mon Sep 17 00:00:00 2001
+From a3979ad06f4ed58539c5cebb7de2c88544d3ad33 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..9ad5853de
+index 0000000000..9ad5853de3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,281 @@
@@ -294,7 +294,7 @@ index 000000000..9ad5853de
 +}
 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 @@
@@ -330,7 +330,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 @@
@@ -353,7 +353,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 @@
@@ -388,7 +388,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 @@
@@ -404,7 +404,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 381542e0d..80927de08 100644
+index 381542e0d2..80927de08b 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,6 +1,9 @@
@@ -429,7 +429,7 @@ index 381542e0d..80927de08 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 0808da26f..cdcc37592 100644
+index 0808da26f6..cdcc375923 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1162,7 +1162,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -450,7 +450,7 @@ index 0808da26f..cdcc37592 100644
          return this.V;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index a47a51a41..4c476f757 100644
+index a47a51a412..4c476f757c 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -44,7 +44,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index a47a51a41..4c476f757 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 814a65ec5..202c6c492 100644
+index 814a65ec58..202c6c4927 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -152,6 +152,10 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey;
diff --git a/Spigot-Server-Patches/0192-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0191-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0192-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0191-Shoulder-Entities-Release-API.patch
index ee25d0253d..1aadffb5d6 100644
--- a/Spigot-Server-Patches/0192-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0191-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From 7c4e663b965bd364495f89ac6677c07779ddd659 Mon Sep 17 00:00:00 2001
+From b46069d74f4963e51238e355c4bf70b1f8a4b84c 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 0486dee2c..f08c0ba60 100644
+index 42c6249535..b20cab58b1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1819,21 +1819,48 @@ public abstract class EntityHuman extends EntityLiving {
@@ -62,7 +62,7 @@ index 0486dee2c..f08c0ba60 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 073c8acf2..9e2fc4947 100644
+index 073c8acf2c..9e2fc4947c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -445,6 +445,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0193-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0192-Profile-Lookup-Events.patch
similarity index 97%
rename from Spigot-Server-Patches/0193-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0192-Profile-Lookup-Events.patch
index 6a6aaaf850..8db514e7c8 100644
--- a/Spigot-Server-Patches/0193-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0192-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 1f1911f9fa39fa1662ea475f1d3cb3705fae9478 Mon Sep 17 00:00:00 2001
+From d1090b257a18d039d63dde81cca6bb2fb7a1dc2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
-index 3bcdb8f93..bb9894318 100644
+index 3bcdb8f93f..bb9894318e 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -1,17 +1,68 @@
diff --git a/Spigot-Server-Patches/0194-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0193-Block-player-logins-during-server-shutdown.patch
similarity index 90%
rename from Spigot-Server-Patches/0194-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0193-Block-player-logins-during-server-shutdown.patch
index 084db50ba0..e21f236c02 100644
--- a/Spigot-Server-Patches/0194-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0193-Block-player-logins-during-server-shutdown.patch
@@ -1,11 +1,11 @@
-From dd04e617cb4eb245710fe0691eb157a0ab850400 Mon Sep 17 00:00:00 2001
+From a1e1fd273bd4c01c575f6cea31f72219187b536d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index b6e829682..85eff6e2d 100644
+index b6e8296824..85eff6e2dd 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -50,6 +50,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0195-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch
similarity index 95%
rename from Spigot-Server-Patches/0195-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch
index a4065b75f1..ff402f1115 100644
--- a/Spigot-Server-Patches/0195-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From fc4ab62ab798d05629a58a87394aedefd66ed528 Mon Sep 17 00:00:00 2001
+From 6947e3fbbe3d9138b66a298d2b5f5f68c810d7d8 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 8a04a801b..0d69e6187 100644
+index 6db20aa75c..bd232b31e4 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
@@ -37,7 +37,7 @@ index 8a04a801b..0d69e6187 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 61472a0eb..2b6b062c6 100644
+index 61472a0eb2..2b6b062c61 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index 61472a0eb..2b6b062c6 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 03a3328b0..6d4dc539c 100644
+index 03a3328b06..6d4dc539cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -816,5 +816,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0196-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0195-Fix-Anvil-Level-sync-to-client.patch
similarity index 93%
rename from Spigot-Server-Patches/0196-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0195-Fix-Anvil-Level-sync-to-client.patch
index 4207682cab..f0fc9c9f3a 100644
--- a/Spigot-Server-Patches/0196-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0195-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From 4a7821dd77549bcdfd5bde075bb5057dfe2ca86f Mon Sep 17 00:00:00 2001
+From dafadb7573dda165d077047126448e2806cb7f29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 845ec2250..c252ff6d5 100644
+index 229f4f8829..fb3413d81e 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -377,9 +377,9 @@ public class ContainerAnvil extends Container {
@@ -26,7 +26,7 @@ index 845ec2250..c252ff6d5 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1c8c364d3..019fd4b48 100644
+index a546f3118e..8686457e13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1378,6 +1378,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0197-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0196-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 90%
rename from Spigot-Server-Patches/0197-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0196-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index ee80c26c4d..bda1f660e0 100644
--- a/Spigot-Server-Patches/0197-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0196-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From 4ecc569661a1bba81809d640be36e55f827e6fe4 Mon Sep 17 00:00:00 2001
+From 6abcfc52f3b1140bf55d775ef2083c3bc17c0797 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e766e2536..c5da2cde3 100644
+index 8f6ce6bf1a..5d5f6f6328 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -234,6 +234,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0198-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0197-Improve-the-Saddle-API-for-Horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0198-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0197-Improve-the-Saddle-API-for-Horses.patch
index b62df91004..8fed37f46f 100644
--- a/Spigot-Server-Patches/0198-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0197-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From d5fae2a8f82bdf07f4d23afeb78e13d26180b350 Mon Sep 17 00:00:00 2001
+From 8e0eed18f7b4b54add9bdf23b0ecad8b38cc77c5 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 14d0416802..e56bef3340 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@@ -27,7 +27,7 @@ index 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 173818e682..2f68524049 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/0199-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0198-Implement-ensureServerConversions-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0199-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0198-Implement-ensureServerConversions-API.patch
index 4b544f3521..e26336017c 100644
--- a/Spigot-Server-Patches/0199-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0198-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 4d681ce123b48ae324efb5883474c0c4317d4328 Mon Sep 17 00:00:00 2001
+From ed06a3f52e0a0fd9899b4f5c9082bab768bc7c60 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,7 +7,7 @@ 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 59d2685dc..27a264f54 100644
+index 59d2685dc8..27a264f549 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -288,4 +288,10 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0200-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0199-Implement-getI18NDisplayName.patch
similarity index 92%
rename from Spigot-Server-Patches/0200-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0199-Implement-getI18NDisplayName.patch
index 3bf83cad58..3b373c9bf0 100644
--- a/Spigot-Server-Patches/0200-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0199-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 2a4dd5bde33fc980cfb0b74f7330461f74bea81d Mon Sep 17 00:00:00 2001
+From e093780dd2f3014b31a6baacb6cafe05c05c50f7 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/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 27a264f54..1cdbdf6d0 100644
+index 27a264f549..1cdbdf6d07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -293,5 +293,18 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0201-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0200-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 91%
rename from Spigot-Server-Patches/0201-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0200-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index 4d39493b3c..652f58925e 100644
--- a/Spigot-Server-Patches/0201-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0200-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From d8b44f39e8fefbad27e051d8d8ad1b52d687409e Mon Sep 17 00:00:00 2001
+From f7d2dff64466b07794f828ff7f3f0e9d632a2a07 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@@ -9,7 +9,7 @@ This behavior causes a save to occur even though saving was supposed to be turne
 It's triggered when Hell/End worlds are empty of players.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cf5c76a78..bfe2d03a5 100644
+index cf5c76a78e..bfe2d03a57 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -194,7 +194,7 @@ public class PlayerChunkMap {
diff --git a/Spigot-Server-Patches/0202-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0201-ProfileWhitelistVerifyEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0202-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0201-ProfileWhitelistVerifyEvent.patch
index b4775558df..c1c11f4c8c 100644
--- a/Spigot-Server-Patches/0202-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0201-ProfileWhitelistVerifyEvent.patch
@@ -1,11 +1,11 @@
-From 81ace36f21de4341d47d827637fcfe406d40b33a Mon Sep 17 00:00:00 2001
+From dab3a07d152b33b5d5751aa2ea340d5f365c8a86 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 4cbe14801..45e42e998 100644
+index 4cbe148010..45e42e9989 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -543,9 +543,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0203-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch
similarity index 94%
rename from Spigot-Server-Patches/0203-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch
index 4855f3b464..189d4d0c10 100644
--- a/Spigot-Server-Patches/0203-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From ae43b5d79b454b6a616f610119360894023cb5c1 Mon Sep 17 00:00:00 2001
+From 24d03637c3ce3f7c0c5268c5516e90c1f3c6d4fa Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3245fded9..d4f6e009e 100644
+index 3245fded9b..d4f6e009e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -217,10 +217,12 @@ public class Main {
diff --git a/Spigot-Server-Patches/0204-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0203-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 89%
rename from Spigot-Server-Patches/0204-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0203-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 9079618866..ffa130547e 100644
--- a/Spigot-Server-Patches/0204-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0203-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,11 +1,11 @@
-From 0b24486b1491cb7f560baf2b753fcbc4111369fe Mon Sep 17 00:00:00 2001
+From 25b46dccb550d0d2f16157b10a9da455ae7e8d43 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 6ea276aa0..720e7bbf9 100644
+index 4e132eabb1..c28b72222e 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -61,7 +61,7 @@ public class EntityOcelot extends EntityTameableAnimal {
diff --git a/Spigot-Server-Patches/0205-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0204-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 92%
rename from Spigot-Server-Patches/0205-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0204-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index e9e25e798e..fbca4658dd 100644
--- a/Spigot-Server-Patches/0205-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0204-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From e175a2606aa41ccdd34359e8ed80506380c74ae1 Mon Sep 17 00:00:00 2001
+From f43818ecbd951f93007a6112564c338f7aa42db7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 2b6b062c6..c76dbe74a 100644
+index 2b6b062c61..c76dbe74ac 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -121,6 +121,9 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0206-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0205-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 92%
rename from Spigot-Server-Patches/0206-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0205-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index b65cd4600c..3c0d1cf7f1 100644
--- a/Spigot-Server-Patches/0206-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0205-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From 17637d37ab1940aa043270746f079f79afaca09e Mon Sep 17 00:00:00 2001
+From c8e4e8aa0b920806ef94772fdfb9d803b31ff748 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ca7c23f54..d0ce6b363 100644
+index 92070c9325..2f9aa10f85 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1275,7 +1275,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0207-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 94%
rename from Spigot-Server-Patches/0207-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch
index 0929a5195f..c6400691d7 100644
--- a/Spigot-Server-Patches/0207-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 0dcddd2985a9c7a7b64d4c84c900b84c4929bcfb Mon Sep 17 00:00:00 2001
+From 73f5986b0b8ceebddcfb6e30b3c7a4f7d43cd778 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dbafef023..ec89ecfca 100644
+index dbafef023e..ec89ecfcae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -27,7 +27,7 @@ index dbafef023..ec89ecfca 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index bab13a4fd..d0e719f44 100644
+index 85eff6e2dd..3464af6791 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -241,6 +241,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0208-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0207-LivingEntity-setKiller.patch
similarity index 92%
rename from Spigot-Server-Patches/0208-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0207-LivingEntity-setKiller.patch
index 747f524ab0..9a0b321a55 100644
--- a/Spigot-Server-Patches/0208-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0207-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From 2ad5b2c13862575d1cf7a73a68e117b5729be51f Mon Sep 17 00:00:00 2001
+From 60f41c74b9da92c99db52fdbb77e577b5cd83bf1 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/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 506d0d4e48..460a050cce 100644
+index bd2d90349e..524cfd99b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -255,6 +255,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0209-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0208-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0209-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0208-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index ed0ebe3f64..527e292b31 100644
--- a/Spigot-Server-Patches/0209-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0208-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From 73bbebc2ba89bec6a0a886d598bac3901e2f81c8 Mon Sep 17 00:00:00 2001
+From bbc9db021b60dd6257e0efc1acb190c28f0a023c Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index 47e307a24..a93ed45df 100644
+index 47e307a246..a93ed45df9 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -89,6 +89,13 @@
@@ -30,7 +30,7 @@ index 47e307a24..a93ed45df 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index af430b73f..8c7630018 100644
+index af430b73f0..8c76300185 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0210-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 95%
rename from Spigot-Server-Patches/0210-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 495741d009..723e3c257d 100644
--- a/Spigot-Server-Patches/0210-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From d5b28ecc49de351485333e2960919669c43780e7 Mon Sep 17 00:00:00 2001
+From 28222826f87feef4f8cdd05f38e2b6220e987dc6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index a93ed45df..bb32cb749 100644
+index a93ed45df9..bb32cb749d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -86,7 +86,7 @@
@@ -28,7 +28,7 @@ index a93ed45df..bb32cb749 100644
  
          <!-- Paper - Add additional Log4J dependencies -->
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 676780b61..5a873fe9d 100644
+index 676780b619..5a873fe9d7 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -286,7 +286,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index 676780b61..5a873fe9d 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f9..9f8334376 100644
+index 08b6bb7f97..9f8334376f 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,10 +2,22 @@
diff --git a/Spigot-Server-Patches/0211-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0210-Include-Log4J2-SLF4J-implementation.patch
similarity index 87%
rename from Spigot-Server-Patches/0211-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0210-Include-Log4J2-SLF4J-implementation.patch
index f15a0e056f..86ca74b568 100644
--- a/Spigot-Server-Patches/0211-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0210-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From 7c9fbb91ca5a19e2e151dbf2e4021220d5347a31 Mon Sep 17 00:00:00 2001
+From a56190cc108317d133af9fa00a0e7ed0ad0ae60e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index bb32cb749..a319cfe3b 100644
+index bb32cb749d..a319cfe3b8 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -90,6 +90,12 @@
diff --git a/Spigot-Server-Patches/0212-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0211-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 95%
rename from Spigot-Server-Patches/0212-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0211-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index e84d0ea243..f39b34a294 100644
--- a/Spigot-Server-Patches/0212-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0211-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From f0482df655443d55ca6c3af38ad3fdc16e60273b Mon Sep 17 00:00:00 2001
+From 302c4c748fcecce67136bb6784edec39bed38d40 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f8334376..6711e6dff 100644
+index 9f8334376f..6711e6dff9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,7 +5,8 @@
diff --git a/Spigot-Server-Patches/0213-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0212-Add-PlayerJumpEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0213-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0212-Add-PlayerJumpEvent.patch
index 3c22920fa1..840a5ff83a 100644
--- a/Spigot-Server-Patches/0213-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0212-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From e2039fa94b546d69eae59942ae8af658cb991af5 Mon Sep 17 00:00:00 2001
+From 79fc93dd4ff1dd0556c676f32dcd539d6e2104b1 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/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b20cab58b..1bfe9d0e7 100644
+index b20cab58b1..1bfe9d0e7a 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1460,6 +1460,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index b20cab58b..1bfe9d0e7 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 932eeb19d..7465c548a 100644
+index 932eeb19db..7465c548af 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,8 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0214-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch
similarity index 95%
rename from Spigot-Server-Patches/0214-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch
index 16314c9032..94225a61bd 100644
--- a/Spigot-Server-Patches/0214-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 05eb39bf369cc2a0267af54bead833e5fccfec1e Mon Sep 17 00:00:00 2001
+From 08d88bf479bfa513a4a5dcf0cab8bf6a13aac406 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,7 +15,7 @@ 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 480b93aa0..9f7443ef0 100644
+index 7465c548af..add29081d2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2470,14 +2470,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0215-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0214-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from Spigot-Server-Patches/0215-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0214-Expose-client-protocol-version-and-virtual-host.patch
index 7070c28631..7583ac8b15 100644
--- a/Spigot-Server-Patches/0215-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0214-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 3541b3881a5ed15147bc2f89d8802dd32b52249b Mon Sep 17 00:00:00 2001
+From 27ae3854b22a9da1824e3adad67c0d1a94b52be4 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 088ec198e..bc34cd687 100644
+index 2d57bdf40e..816210fb91 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 088ec198e..bc34cd687 100644
  
      public void a(IChatBaseComponent ichatbasecomponent) {}
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 5b0d83a1d..424464d09 100644
+index 0afaea8109..61f9eb3e64 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -63,6 +63,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 5b0d83a1d..424464d09 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 7acdac55e..f1a3be69d 100644
+index 7acdac55e5..f1a3be69d0 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -33,6 +33,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 7acdac55e..f1a3be69d 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 019fd4b48..43e357e39 100644
+index 8686457e13..23200bb597 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -175,6 +175,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0216-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0215-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0216-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0215-revert-serverside-behavior-of-keepalives.patch
index 7886df176c..7a519048df 100644
--- a/Spigot-Server-Patches/0216-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0215-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 536039aa33410910fde48d002df8528fa25c3db0 Mon Sep 17 00:00:00 2001
+From a4ee3c01cd5658dbf171d22af6b6fd271249375a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9f7443ef0..7e96c4eb4 100644
+index add29081d2..cb9f25e961 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -69,7 +69,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0217-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0216-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 92%
rename from Spigot-Server-Patches/0217-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0216-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index 8e6b230f73..22538c69ad 100644
--- a/Spigot-Server-Patches/0217-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0216-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From 02485329579ce13c80b522e35a9dbf9602e0d82e Mon Sep 17 00:00:00 2001
+From b088e781bdb0c1f995db5e4865791f7aeb6c401e Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
@@ -13,7 +13,7 @@ ObjectOpenHashSet never uses compareTo(), so the inconsistencies of NextTickList
 Fixes https://github.com/PaperMC/Paper/issues/588
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
-index 80a5c29f3..cd864c404 100644
+index 80a5c29f3b..cd864c4047 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 @@ -8,7 +8,7 @@ import java.util.TreeSet;
diff --git a/Spigot-Server-Patches/0218-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0217-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 97%
rename from Spigot-Server-Patches/0218-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0217-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index c0d5b85eb2..f44056311a 100644
--- a/Spigot-Server-Patches/0218-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0217-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 68d7cdfbe8d650efad86ee10f528f15670eabe04 Mon Sep 17 00:00:00 2001
+From e18095189bb47d3aa275a03f012007f493105b05 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1bfe9d0e7..cd3e021a0 100644
+index 1bfe9d0e7a..cd3e021a09 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -981,6 +981,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index 1bfe9d0e7..cd3e021a0 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2f9aa10f8..2904a845b 100644
+index 2f9aa10f85..2904a845b1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -916,6 +916,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0219-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0218-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 95%
rename from Spigot-Server-Patches/0219-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0218-Option-for-maximum-exp-value-when-merging-orbs.patch
index c6c966b6f3..ddbcc311a8 100644
--- a/Spigot-Server-Patches/0219-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0218-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,11 +1,11 @@
-From 15caeb73f605a58c3988eba2faba786ec1de8850 Mon Sep 17 00:00:00 2001
+From ba753e79cce891252f5a7acc373fe4bd63a7d969 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 c80d84b9b..605e84173 100644
+index c80d84b9b2..605e84173d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -361,4 +361,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index c80d84b9b..605e84173 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 56292fad9..d5c509733 100644
+index 2904a845b1..142b6cc033 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -994,16 +994,30 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch
index 0d6aa4e73f..6646042213 100644
--- a/Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 9cb4fc032e1908f0126b22723ebc8ec555e51884 Mon Sep 17 00:00:00 2001
+From 28232f54f42a2be1d450bb346630809b76fbf87f Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0dcafdbcc..a4026d64a 100644
+index b596a616fe..999a02cad3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index 0dcafdbcc..a4026d64a 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index cdf3a3ba4..be5d0bf89 100644
+index cdf3a3ba4a..be5d0bf898 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
diff --git a/Spigot-Server-Patches/0221-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0220-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 91%
rename from Spigot-Server-Patches/0221-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0220-Prevent-logins-from-being-processed-when-the-player-.patch
index 2574c762d0..883dc3b6bf 100644
--- a/Spigot-Server-Patches/0221-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0220-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 9bdee54edd28ee7085c421af0183d3b196c9954e Mon Sep 17 00:00:00 2001
+From c456212ffebb223d42fc2f3c9faf162477427caf Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index d0e719f44..7dbc6f437 100644
+index 3464af6791..ae10cd89c1 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -57,7 +57,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0222-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0221-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 94%
rename from Spigot-Server-Patches/0222-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0221-use-CB-BlockState-implementations-for-captured-block.patch
index 62da1619b4..1685eb4af8 100644
--- a/Spigot-Server-Patches/0222-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0221-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From bd84d6b81f6ed4ad32b47fca3e98a50dac4b1822 Mon Sep 17 00:00:00 2001
+From 871572c7cb06159e032d17dcaf629252fd3ba907 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d5c509733..b96511804 100644
+index 142b6cc033..642a504d4f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -374,7 +374,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0223-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0222-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 96%
rename from Spigot-Server-Patches/0223-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0222-API-to-get-a-BlockState-without-a-snapshot.patch
index 7d0f77ea4c..b6b057fbe1 100644
--- a/Spigot-Server-Patches/0223-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0222-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 94d006f44ba2bb5da02873d81d82a0f0fe833300 Mon Sep 17 00:00:00 2001
+From 3654a5a2fdfc4d68c9055b22d9913a1d250f6130 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 2cfe2202e..909432d51 100644
+index 9ad14417e3..3e9b357c87 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -203,7 +203,12 @@ public abstract class TileEntity implements KeyedObject {
@@ -39,7 +39,7 @@ index 2cfe2202e..909432d51 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 bbf7b5088..c94b5c817 100644
+index 698d044a8d..9514968b07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -263,6 +263,20 @@ public class CraftBlock implements Block {
@@ -64,7 +64,7 @@ index bbf7b5088..c94b5c817 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 0558cafe3..d4d9c5fc5 100644
+index 0558cafe31..d4d9c5fc50 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
@@ -114,7 +114,7 @@ index 0558cafe3..d4d9c5fc5 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 7a8d44529..97b4e6910 100644
+index 7a8d445299..97b4e6910d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -14,10 +14,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
diff --git a/Spigot-Server-Patches/0224-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0223-AsyncTabCompleteEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0224-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0223-AsyncTabCompleteEvent.patch
index 74797e9ae6..e91160b0c7 100644
--- a/Spigot-Server-Patches/0224-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0223-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From f4914b7018762e1d9e23715905c35c231f5d697c Mon Sep 17 00:00:00 2001
+From 3e175150c0df5d545748e4fd74dd2c0c884a5e9b 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,18 +14,18 @@ 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 cb9f25e96..c0249933b 100644
+index 619f020ba4..5778bf1c65 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -504,18 +504,59 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -504,18 +504,60 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
 -        PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer());
 +        // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
          // CraftBukkit start
-         if (chatSpamField.addAndGet(this, 5) > 500 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
--            this.disconnect(new ChatMessage("disconnect.spam", new Object[0]));
+         if (chatSpamField.addAndGet(this, 2) > 500 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
+             this.disconnect(new ChatMessage("disconnect.spam", new Object[0]));
 +            minecraftServer.postToMainThread(() -> this.disconnect(new ChatMessage("disconnect.spam", new Object[0]))); // Paper
              return;
          }
@@ -85,7 +85,7 @@ index cb9f25e96..c0249933b 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 202c6c492..c74831b3d 100644
+index 202c6c4927..c74831b3d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1667,7 +1667,7 @@ public final class CraftServer implements Server {
@@ -98,7 +98,7 @@ index 202c6c492..c74831b3d 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 1e3aae3b8..95d13c146 100644
+index 1e3aae3b8f..95d13c146b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
diff --git a/Spigot-Server-Patches/0225-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0224-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 89%
rename from Spigot-Server-Patches/0225-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0224-Avoid-NPE-in-PathfinderGoalTempt.patch
index de264175cf..439c9cdcf2 100644
--- a/Spigot-Server-Patches/0225-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0224-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,11 +1,11 @@
-From 66b8e5de50e36ee6f046f28135d963376827f17e Mon Sep 17 00:00:00 2001
+From a36a3ffd0d1048e5e1cc7e74f46ae7a1d54289f6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index 154202700..64b1ac71b 100644
+index 8ca996e652..1b82479418 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -52,7 +52,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
diff --git a/Spigot-Server-Patches/0226-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0225-PlayerPickupExperienceEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0226-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0225-PlayerPickupExperienceEvent.patch
index 18338e14c7..19c4cc4dd4 100644
--- a/Spigot-Server-Patches/0226-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0225-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 8bed7b19ff45041aeeb92705f05366a3b2a15cff Mon Sep 17 00:00:00 2001
+From 9849a550cb90b5d34fb6d2a4882175a8e055460a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 79d80596d..a87ef5fb8 100644
+index 79d80596df..a87ef5fb8c 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -218,7 +218,7 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0227-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0226-ExperienceOrbMergeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0227-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0226-ExperienceOrbMergeEvent.patch
index c0ee601c88..9a2af97c4c 100644
--- a/Spigot-Server-Patches/0227-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0226-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From be8638c45049455649276f1af83033d7eb7760d2 Mon Sep 17 00:00:00 2001
+From 2c317cc196671b1892fe0fdf7b50105a322978e9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b96511804..d8ce3efc9 100644
+index 642a504d4f..00eb342f8c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1003,7 +1003,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0228-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0227-Ability-to-apply-mending-to-XP-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0228-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0227-Ability-to-apply-mending-to-XP-API.patch
index 5c849a7ebc..542f0fc63b 100644
--- a/Spigot-Server-Patches/0228-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0227-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From efe7ce57afb0a73e514ce0c788a111757e7ac7ae Mon Sep 17 00:00:00 2001
+From ad3c4c9dde2939d26da9efc5af88b794ecaac362 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 3204d94c5..e4ed9e206 100644
+index 3204d94c54..e4ed9e2066 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -245,6 +245,7 @@ public class EnchantmentManager {
@@ -22,7 +22,7 @@ index 3204d94c5..e4ed9e206 100644
          List list = enchantment.a(entityliving);
  
 diff --git a/src/main/java/net/minecraft/server/Enchantments.java b/src/main/java/net/minecraft/server/Enchantments.java
-index 0f4aad20f..3a5263fd9 100644
+index 0f4aad20fe..3a5263fd9f 100644
 --- a/src/main/java/net/minecraft/server/Enchantments.java
 +++ b/src/main/java/net/minecraft/server/Enchantments.java
 @@ -36,7 +36,7 @@ public class Enchantments {
@@ -35,7 +35,7 @@ index 0f4aad20f..3a5263fd9 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index a87ef5fb8..b8bfc7577 100644
+index a87ef5fb8c..b8bfc75771 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -246,10 +246,12 @@ public class EntityExperienceOrb extends Entity {
@@ -52,7 +52,7 @@ index a87ef5fb8..b8bfc7577 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 43e357e39..7021a81be 100644
+index 23200bb597..9f69000cb2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -970,8 +970,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0229-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0228-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 92%
rename from Spigot-Server-Patches/0229-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0228-Configurable-Chunks-Sends-per-Tick-setting.patch
index 5e917c3629..eb80cdb1d6 100644
--- a/Spigot-Server-Patches/0229-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0228-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From f833988ed04cab6d37a5e4fe6e0e011709bb0444 Mon Sep 17 00:00:00 2001
+From 7f9f65664836f95ae0a274c8d6895f515ddcd0c6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@@ -8,7 +8,7 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 605e84173..703642c0b 100644
+index 605e84173d..703642c0b6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -367,4 +367,13 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 605e84173..703642c0b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index bfe2d03a5..9fd07f859 100644
+index bfe2d03a57..9fd07f8596 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -172,7 +172,7 @@ public class PlayerChunkMap {
diff --git a/Spigot-Server-Patches/0230-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0229-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 95%
rename from Spigot-Server-Patches/0230-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to Spigot-Server-Patches/0229-Configurable-Max-Chunk-Gens-per-Tick.patch
index 172cabf936..2947a44561 100644
--- a/Spigot-Server-Patches/0230-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0229-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From 49fd7e234581b6c8da9707da2854313aae503874 Mon Sep 17 00:00:00 2001
+From 5afc717dcba0250b8eae9c051c8cde1729b95414 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -13,7 +13,7 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 703642c0b..faa7597b3 100644
+index 703642c0b6..faa7597b35 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -376,4 +376,15 @@ public class PaperWorldConfig {
@@ -33,7 +33,7 @@ index 703642c0b..faa7597b3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 344b95233..fcd9f5491 100644
+index 344b95233f..fcd9f5491f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -28,6 +28,7 @@ public class PlayerChunk {
@@ -53,7 +53,7 @@ index 344b95233..fcd9f5491 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9fd07f859..e29aaab2d 100644
+index 9fd07f8596..e29aaab2da 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -140,6 +140,7 @@ public class PlayerChunkMap {
@@ -77,7 +77,7 @@ index 9fd07f859..e29aaab2d 100644
                      if (playerchunk1.a(flag)) {
                          iterator1.remove();
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 9aaca21a7..f50d55c8e 100644
+index 9aaca21a79..f50d55c8ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -35,4 +35,10 @@ public class ChunkIOExecutor {
@@ -92,7 +92,7 @@ index 9aaca21a7..f50d55c8e 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
-index 193c3621c..cf1258c55 100644
+index 193c3621c6..cf1258c559 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 @@ -351,4 +351,10 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {
diff --git a/Spigot-Server-Patches/0231-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0231-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch
index 5ae1da1b9a..67a0096675 100644
--- a/Spigot-Server-Patches/0231-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 8717d750efce7685cb40fb5a2aada1deeca9a537 Mon Sep 17 00:00:00 2001
+From 2c20d9aab412c5b9d160456ef45d397a162298f5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index faa7597b3..fddd52caf 100644
+index faa7597b35..fddd52caf7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -387,4 +387,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index faa7597b3..fddd52caf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index ffc6d0b68..70b251210 100644
+index 97de169de2..3099f6aa7a 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -167,7 +167,10 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0232-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0232-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch
index 807440e5f0..72e7099e5c 100644
--- a/Spigot-Server-Patches/0232-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 58be61c968baa7692620f453e152388df99e325e Mon Sep 17 00:00:00 2001
+From 0bc6c124ed1c6be43add0164f7711220f38af6a8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index c76dbe74a..b88160a2e 100644
+index c76dbe74ac..b88160a2ed 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -1,6 +1,7 @@
@@ -55,7 +55,7 @@ index c76dbe74a..b88160a2e 100644
  
                      if (entity == null) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 6d842df62..8c6c68c9e 100644
+index 342a15db5e..973c3d1e9e 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -160,10 +160,30 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0233-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0233-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch
index 68345e32c9..230d9dab56 100644
--- a/Spigot-Server-Patches/0233-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From 003dd0a240eaccbd9e0f2b221ced65a8fcd825e7 Mon Sep 17 00:00:00 2001
+From 7834dbeef5d2f49dbed7721ff35dd583e2b84356 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 8c6c68c9e..e7bf1e5fc 100644
+index 973c3d1e9e..f525fd1b42 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -47,6 +47,15 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0234-Add-SkullMeta.setPlayerProfile-API.patch b/Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0234-Add-SkullMeta.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch
index a0f613613b..cc736eb407 100644
--- a/Spigot-Server-Patches/0234-Add-SkullMeta.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 6df26539d98a00ba824fba020dfb08a68c3b673c Mon Sep 17 00:00:00 2001
+From ca32eb428518822c63a80eaee3602dad31fea886 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add SkullMeta.setPlayerProfile API
@@ -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/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 52de1439e..960ae59ae 100644
+index 52de1439e7..960ae59ae1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
diff --git a/Spigot-Server-Patches/0235-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch
similarity index 94%
rename from Spigot-Server-Patches/0235-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch
index e2bcd2811c..7fe590d1a9 100644
--- a/Spigot-Server-Patches/0235-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 8679d7a0df439bb22997dd86d4ce8789676d7a59 Mon Sep 17 00:00:00 2001
+From 58025f5c89a85bf0b61e258b8a7c49d485b44e06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results.
 This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
-index 4b2a67423..f83aa5ef0 100644
+index 4b2a67423f..f83aa5ef0f 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0236-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0236-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch
index 70b3b478f7..e84202c873 100644
--- a/Spigot-Server-Patches/0236-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,11 +1,11 @@
-From ac99b992d5076653bb7d4a4870b297ef15c78fc9 Mon Sep 17 00:00:00 2001
+From 460396241443a00d258da20fd6e6717649361f94 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index 57918d3d6..67556ed32 100644
+index d0eb65aaf0..5fe0e947c3 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -232,6 +232,12 @@ public class AdvancementDataPlayer {
diff --git a/Spigot-Server-Patches/0237-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch
similarity index 97%
rename from Spigot-Server-Patches/0237-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch
index ee211c2575..e54c282a54 100644
--- a/Spigot-Server-Patches/0237-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 3169647239cfc18b81e98e3ea928845f28bc0cc0 Mon Sep 17 00:00:00 2001
+From 73d8cb3ae3e2d449ea00aaa96463effced959b27 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 1cdbdf6d0..da109e35a 100644
+index 1cdbdf6d07..da109e35a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -184,6 +184,8 @@ public final class CraftItemFactory implements ItemFactory {
@@ -26,7 +26,7 @@ index 1cdbdf6d0..da109e35a 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 cadff64bf..b1e0d6185 100644
+index cadff64bfb..b1e0d61856 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 cadff64bf..b1e0d6185 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..30941c7b0
+index 0000000000..30941c7b0c
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -0,0 +1,309 @@
@@ -354,10 +354,10 @@ index 000000000..30941c7b0
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 86c61abe4..c48911d00 100644
+index f1430d226f..a3f293e4cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -135,6 +135,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -136,6 +136,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
                      .put(CraftMetaCharge.class, "FIREWORK_EFFECT")
                      .put(CraftMetaKnowledgeBook.class, "KNOWLEDGE_BOOK")
                      .put(CraftMetaTropicalFishBucket.class, "TROPICAL_FISH_BUCKET")
@@ -365,7 +365,7 @@ index 86c61abe4..c48911d00 100644
                      .put(CraftMetaItem.class, "UNSPECIFIC")
                      .build();
  
-@@ -1092,7 +1093,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1093,7 +1094,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
                          CraftMetaCharge.EXPLOSION.NBT,
                          CraftMetaBlockState.BLOCK_ENTITY_TAG.NBT,
                          CraftMetaKnowledgeBook.BOOK_RECIPES.NBT,
@@ -383,7 +383,7 @@ index 86c61abe4..c48911d00 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 f66cc81d9..eb6cf1bb3 100644
+index f66cc81d9e..eb6cf1bb33 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 static org.hamcrest.Matchers.*;
diff --git a/Spigot-Server-Patches/0238-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch
similarity index 98%
rename from Spigot-Server-Patches/0238-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch
index 118b007acc..0e4cd2d227 100644
--- a/Spigot-Server-Patches/0238-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From 0d24007fe52669e5bd8aa604109f15490ae7cd07 Mon Sep 17 00:00:00 2001
+From fc10d576b3d09d06db5582b291dd01567dce5ed6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index e34198e40..e375e2556 100644
+index 55e45f84ca..e83b4fb4b0 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -110,6 +110,7 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0239-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0239-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch
index 0599134fce..61c7072cfa 100644
--- a/Spigot-Server-Patches/0239-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 0cc66b09744a98309a2bd93c8617d954006a83af Mon Sep 17 00:00:00 2001
+From 4109edb37b1ec2944247d97c29d71195ac9ba911 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index e56bef334..cc9d432e7 100644
+index e56bef3340..cc9d432e7f 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
@@ -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 eaaebeab8..2e959321b 100644
+index eaaebeab83..2e959321b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -18,6 +18,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
diff --git a/Spigot-Server-Patches/0240-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 92%
rename from Spigot-Server-Patches/0240-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 43b367241f..b5b85ac4e4 100644
--- a/Spigot-Server-Patches/0240-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,11 +1,11 @@
-From 2da97a3a645321975638551ed8b7b0b1e79b4783 Mon Sep 17 00:00:00 2001
+From 1abea43276b9357235efc7be09498deb92abb24d Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fddd52caf..79df2c171 100644
+index fddd52caf7..79df2c171c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -179,6 +179,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index fddd52caf..79df2c171 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 28688f2ac..98fdfcb60 100644
+index cd3e021a09..d04f9b380e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1021,6 +1021,7 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0241-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 92%
rename from Spigot-Server-Patches/0241-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index 254e4cfb5f..84dab040b7 100644
--- a/Spigot-Server-Patches/0241-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 8fb609894fd5ae64febc7444fc485735a565cbe6 Mon Sep 17 00:00:00 2001
+From 5db29b1d9b5e59cb0f75c5e2716ace221aae5989 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
 
 
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index ac81d3f86..f50bae012 100644
+index ac81d3f86b..f50bae0123 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
diff --git a/Spigot-Server-Patches/0242-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0242-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index ee3ccd9676..8e7e291006 100644
--- a/Spigot-Server-Patches/0242-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,11 +1,11 @@
-From c0843c56ac5dec0d56f164336ba713dfe9349178 Mon Sep 17 00:00:00 2001
+From f3e8233ea031d161f9fb5a92a019cd34f4ac7081 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 77cf6b8e9..9d9671eae 100644
+index 77cf6b8e9b..9d9671eaec 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -25,6 +25,12 @@ public class BlockIceFrost extends BlockIce {
diff --git a/Spigot-Server-Patches/0243-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 94%
rename from Spigot-Server-Patches/0243-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch
index 0f5d5adb7f..b80039b3ff 100644
--- a/Spigot-Server-Patches/0243-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 630db698e03a4dbf59460f3ea2d1ea32a9a9081c Mon Sep 17 00:00:00 2001
+From 83268ebeef5e977ab9b5d81b7e1851cf10c4abb5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 424464d09..909ad36fb 100644
+index 61f9eb3e64..2272f1239b 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -66,6 +66,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/Spigot-Server-Patches/0244-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0244-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch
index 56faf741ef..5fc1bc5d8e 100644
--- a/Spigot-Server-Patches/0244-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 7eb0bcaafabf173fa684587c8b7654a86a81417a Mon Sep 17 00:00:00 2001
+From f84dca7cff9a63c999b574287e6542ec3bcc0ccb 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..350410527
+index 0000000000..350410527b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
@@ -177,7 +177,7 @@ index 000000000..350410527
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cdcc37592..66b637326 100644
+index cdcc375923..66b637326a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -915,7 +915,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -203,7 +203,7 @@ index cdcc37592..66b637326 100644
          return this.s.getMaxPlayers();
      }
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index c9edd289a..8aa121e2f 100644
+index c9edd289ac..8aa121e2f7 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -30,6 +30,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -226,7 +226,7 @@ index c9edd289a..8aa121e2f 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index d7e1ecc03..f20cddc41 100644
+index d7e1ecc031..f20cddc41c 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 {
@@ -251,7 +251,7 @@ index d7e1ecc03..f20cddc41 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 5a873fe9d..42bd3b6ed 100644
+index 5a873fe9d7..42bd3b6edd 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -285,7 +285,7 @@ public class SpigotConfig
diff --git a/Spigot-Server-Patches/0245-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0245-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch
index b988bb3664..c0a7889f3e 100644
--- a/Spigot-Server-Patches/0245-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From f06918c9b3d5ea2e59d9fdb97964765cc67e41f3 Mon Sep 17 00:00:00 2001
+From fde7de079c6f314161efb3c36c58ba96fb90e6b9 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..eaf869287
+index 0000000000..eaf8692877
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +1,127 @@
@@ -164,7 +164,7 @@ index 000000000..eaf869287
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index a2fadaf82..223afc7ed 100644
+index a2fadaf82c..223afc7edc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicReference;
diff --git a/Spigot-Server-Patches/0246-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 96%
rename from Spigot-Server-Patches/0246-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 81f6f26079..05211c3e8d 100644
--- a/Spigot-Server-Patches/0246-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From fa21f31032976ddd5f0e58dd0b58a3dbdafe665d Mon Sep 17 00:00:00 2001
+From efacdfe905c6b465963472f725db2690aa1290d8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 7dbc6f437..02bbb0d1d 100644
+index ae10cd89c1..a721eb30e9 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0247-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
similarity index 98%
rename from Spigot-Server-Patches/0247-Call-PortalCreateEvent-for-exit-portals.patch
rename to Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
index 0c2b2c6219..8d962097df 100644
--- a/Spigot-Server-Patches/0247-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,11 +1,11 @@
-From 7c0b2a1664a8e7e9836aecccf5ae44c1562d669c Mon Sep 17 00:00:00 2001
+From 1638f3ff3613a2cfefd5bb77b761ff9b96e46e8d 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 402d8d7d6..f36373450 100644
+index 402d8d7d63..f363734500 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -3,16 +3,23 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0248-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0248-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
index 820b862af4..249a14d0cd 100644
--- a/Spigot-Server-Patches/0248-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 6345c6f66496c41addcec4bb59a20042d54113fa Mon Sep 17 00:00:00 2001
+From 4557d91dd4ca4ccd0d1ddbb66fdde9161dc25f47 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 98fdfcb60..de1b6ac86 100644
+index d04f9b380e..5015bd0710 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -67,7 +67,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 98fdfcb60..de1b6ac86 100644
      private final ItemCooldown ce;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 02bbb0d1d..e73b07f42 100644
+index a721eb30e9..258bdfe66a 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -38,7 +38,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -48,7 +48,7 @@ index 02bbb0d1d..e73b07f42 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 7021a81be..c0b484177 100644
+index 9f69000cb2..3c85d6323b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
diff --git a/Spigot-Server-Patches/0249-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch
similarity index 92%
rename from Spigot-Server-Patches/0249-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch
index 05cc9b6d7a..98efff037f 100644
--- a/Spigot-Server-Patches/0249-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From 2c68ce035af26d50da287bf6ffdf0cdab51c0cc8 Mon Sep 17 00:00:00 2001
+From e2fb3d62635848c82a99efb75ad353a6c389a88b 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 41b5a4519..b78d3fe50 100644
+index 41b5a4519b..b78d3fe508 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -51,7 +51,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
diff --git a/Spigot-Server-Patches/0250-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0250-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch
index 177a127264..db4c5b34d0 100644
--- a/Spigot-Server-Patches/0250-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 2881f51e09aaf6feb720969e323bbdcb87b054b7 Mon Sep 17 00:00:00 2001
+From 6ede5e57de6ec91bdb2a1fefbdc54539c7676010 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c74831b3d..e860a83d3 100644
+index c74831b3d7..e860a83d3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1361,6 +1361,26 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0251-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0251-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch
index 56abb4ebce..124551776e 100644
--- a/Spigot-Server-Patches/0251-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From 725c61e238b9e9a113f136f26b39315df99de52a Mon Sep 17 00:00:00 2001
+From fe2892e1dc7eb3ac18ed6567e1147369884de47f 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 ec89ecfca..b602bbf12 100644
+index ec89ecfcae..b602bbf122 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -282,4 +282,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index ec89ecfca..b602bbf12 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a562e1e46..cbfdb3cf7 100644
+index a562e1e46c..cbfdb3cf79 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -144,6 +144,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
diff --git a/Spigot-Server-Patches/0252-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0252-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch
index 62049e4f61..71c17545d5 100644
--- a/Spigot-Server-Patches/0252-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From c61ddf237a78a4fd0f77adf6bfef362304616d49 Mon Sep 17 00:00:00 2001
+From 7ed9f30f128f27736c38ab140dca2ac2ff0d6889 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 41115108f..07c53f505 100644
+index 41115108f1..07c53f5057 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
diff --git a/Spigot-Server-Patches/0253-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 98%
rename from Spigot-Server-Patches/0253-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 190dd80905..043c57b42d 100644
--- a/Spigot-Server-Patches/0253-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From 5eb3fa9c26c608913ef6ccf7f4c22fea153fa472 Mon Sep 17 00:00:00 2001
+From b63089a639307fd34b01ccb97374fb59873f6e79 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 000000000..74c012fd4
+index 0000000000..74c012fd40
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +1,73 @@
@@ -84,7 +84,7 @@ index 000000000..74c012fd4
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 07c53f505..91acfceec 100644
+index 07c53f5057..91acfceec8 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -9,6 +9,7 @@ import java.net.InetSocketAddress;
diff --git a/Spigot-Server-Patches/0254-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0254-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch
index 18aaa6cdb7..02c36b4567 100644
--- a/Spigot-Server-Patches/0254-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 98b33a4a6b8621669d139259b2c3906add1012ac Mon Sep 17 00:00:00 2001
+From 5f354f6ae7a61b535e8d1a764b49675c944dd812 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 c0b484177..60bc6d331 100644
+index 3c85d6323b..ab9956fa24 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0255-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch
similarity index 92%
rename from Spigot-Server-Patches/0255-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch
index 35cc0df120..ba37eb7d85 100644
--- a/Spigot-Server-Patches/0255-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From 3ff982bb8588ed6f368c4c5bf145261dac55ba46 Mon Sep 17 00:00:00 2001
+From 1d5afa94e8d93c45c29bbab7ce04a054fdc1a2ff 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 9e2fc4947..4b9ecb4a6 100644
+index 9e2fc4947c..4b9ecb4a62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -508,4 +508,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0256-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch
similarity index 89%
rename from Spigot-Server-Patches/0256-Load-version-history-at-server-start.patch
rename to Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch
index 5c03678061..69f6affbf9 100644
--- a/Spigot-Server-Patches/0256-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch
@@ -1,11 +1,11 @@
-From edbff1c504156c4ac399e840b6d4124b259151b4 Mon Sep 17 00:00:00 2001
+From 5819bb6f428681e72e0a2c1b5f2521de4b8d3555 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 927cbeedc..ae7a8c104 100644
+index 8c76300185..8e15710caf 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -207,6 +207,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0257-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch
similarity index 92%
rename from Spigot-Server-Patches/0257-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch
index cd01cbf97e..e3555ec170 100644
--- a/Spigot-Server-Patches/0257-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From c825dfa73f7484821534a66ee58be1ed28c5a33b Mon Sep 17 00:00:00 2001
+From 0fb62afd179e3993ab22f01b2d2e3de1f49b6637 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 79df2c171..b07ff9587 100644
+index 79df2c171c..b07ff95871 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -397,4 +397,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 79df2c171..b07ff9587 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index de1b6ac86..4aba5716c 100644
+index 5015bd0710..738ac8570c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1073,7 +1073,11 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0258-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 86%
rename from Spigot-Server-Patches/0258-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index c2eb210e2a..db60bbf67b 100644
--- a/Spigot-Server-Patches/0258-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,14 +1,14 @@
-From ec23704c6f67afe3004f9fe597196b976071492d Mon Sep 17 00:00:00 2001
+From 2070c1fd61c833fbafdb40b67a7d66b915039469 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 ab2bd6dae..067f7b990 100644
+index 5778bf1c65..5ee25d70fc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2502,7 +2502,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2503,7 +2503,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
diff --git a/Spigot-Server-Patches/0259-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0258-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0259-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0258-EndermanEscapeEvent.patch
index c3a6b276d4..ee91bfa822 100644
--- a/Spigot-Server-Patches/0259-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0258-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 2c487e159f55a7145d0e7a32048fa08fa60dcdae Mon Sep 17 00:00:00 2001
+From 521528b63eccb2a3d5a1e6fe68bb24cc2761b182 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 ddf64ee6c..a766b3895 100644
+index ddf64ee6c5..a766b38959 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -1,6 +1,7 @@
diff --git a/Spigot-Server-Patches/0260-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch
similarity index 91%
rename from Spigot-Server-Patches/0260-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch
index 076c64b117..82c5d6c8b7 100644
--- a/Spigot-Server-Patches/0260-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 4554c34485e08548f66997ac51e4ae290a56eecf Mon Sep 17 00:00:00 2001
+From bba39e03862eb5a4cc461cf03483e8947b833cbf 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 a766b3895..0f64c8f2b 100644
+index a766b38959..0f64c8f2b5 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -184,6 +184,7 @@ public class EntityEnderman extends EntityMonster {
@@ -18,7 +18,7 @@ index a766b3895..0f64c8f2b 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 5998530a8..f62ea821f 100644
+index 5998530a8f..f62ea821fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
diff --git a/Spigot-Server-Patches/0261-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch
similarity index 93%
rename from Spigot-Server-Patches/0261-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch
index 778d66e5a1..7490cc4385 100644
--- a/Spigot-Server-Patches/0261-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 6e8f677a4eafa9506dd5330ae0007c16e706226b Mon Sep 17 00:00:00 2001
+From 1cd1ff965f693b0ec852d79ea2355cb37abb2f9d 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 b07ff9587..f1db4becd 100644
+index b07ff95871..f1db4becde 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -402,4 +402,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index b07ff9587..f1db4becd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index fc8c0cab5..dd8af4be8 100644
+index fc8c0cab55..dd8af4be80 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -242,6 +242,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0262-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 96%
rename from Spigot-Server-Patches/0262-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch
index 1d3ef90510..5eb5f197a7 100644
--- a/Spigot-Server-Patches/0262-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 46f6693f3d0851bfe551d2ef6d25ccb0a2e5538c Mon Sep 17 00:00:00 2001
+From 08b71aa513ffb287734f6a8222dadbc7fc4d37b0 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
@@ -9,7 +9,7 @@ the standard API is to send the packet to everyone in the world, which is ineffe
 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 23414c776..9e3804579 100644
+index 5d5f6f6328..d506503e93 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1205,14 +1205,20 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -37,7 +37,7 @@ index 23414c776..9e3804579 100644
  
              if (this.a(entityplayer, false, d0, d1, d2, packetplayoutworldparticles)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7004f1176..1afb480f8 100644
+index 7004f11764..1afb480f86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1576,13 +1576,17 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0263-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0262-EndermanAttackPlayerEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0263-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0262-EndermanAttackPlayerEvent.patch
index c24935be37..d8de3ee81f 100644
--- a/Spigot-Server-Patches/0263-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0262-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From a8c38caffb5b627db4b48c26b6091cae36ae6140 Mon Sep 17 00:00:00 2001
+From 9ee9f23739ae7fe7599a3eb8c43d4195a6a6735c 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 df94b4ca9..f2fcba3d9 100644
+index 0f64c8f2b5..2db0eb4946 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -135,7 +135,15 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0264-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0264-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch
index 8530bede14..4e6f87d5e3 100644
--- a/Spigot-Server-Patches/0264-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From 0cbe97f322932b592af43ff5b7382b9a102e6f41 Mon Sep 17 00:00:00 2001
+From a986b34be653bc35d35d30c824015d1b4b9bc71f 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 524d84c5b..c77328e76 100644
+index b397636247..790ab11c17 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -67,7 +67,11 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0265-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0265-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch
index c6ff6f0fc7..7d56710ade 100644
--- a/Spigot-Server-Patches/0265-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 9cb40d40ad0b4f9ca8d6ec60318d3a5479b47887 Mon Sep 17 00:00:00 2001
+From bd0fa8018b2603d1f15fb90546d9666e04f03450 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 c77328e76..2d8e307e7 100644
+index 790ab11c17..9d802be18a 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -154,7 +154,15 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0266-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 92%
rename from Spigot-Server-Patches/0266-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index afaf8e7971..fc29ed1cb9 100644
--- a/Spigot-Server-Patches/0266-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 73f57a0e2462538caca787a27b268815f6e8d629 Mon Sep 17 00:00:00 2001
+From 986bbb97de3f713746ad2dbfb019241f14a787f8 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,7 +8,7 @@ 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 1afb480f8..f7eaecb3f 100644
+index 1afb480f86..f7eaecb3fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -936,6 +936,10 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0267-Don-t-load-chunks-for-villager-door-checks.patch b/Spigot-Server-Patches/0266-Don-t-load-chunks-for-villager-door-checks.patch
similarity index 90%
rename from Spigot-Server-Patches/0267-Don-t-load-chunks-for-villager-door-checks.patch
rename to Spigot-Server-Patches/0266-Don-t-load-chunks-for-villager-door-checks.patch
index 35ba71ef2d..e929e750d7 100644
--- a/Spigot-Server-Patches/0267-Don-t-load-chunks-for-villager-door-checks.patch
+++ b/Spigot-Server-Patches/0266-Don-t-load-chunks-for-villager-door-checks.patch
@@ -1,4 +1,4 @@
-From c6bbd29322e952519d7f2c351d868ee6cb60cf76 Mon Sep 17 00:00:00 2001
+From 837badd75f18ba3bb4eaa964fb3476cfeaf22c90 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Don't load chunks for villager door checks
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't load chunks for villager door checks
 This avoids villages spam loading chunks sync
 
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index dfcabb83a..22fe23e8e 100644
+index dfcabb83a1..22fe23e8ed 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -313,6 +313,12 @@ public class Village {
diff --git a/Spigot-Server-Patches/0268-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0268-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch
index 305f3ab2fe..2a9e321bb0 100644
--- a/Spigot-Server-Patches/0268-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch
@@ -1,11 +1,11 @@
-From 8b9681193930f2c02174ea5fb7e6b1aca5ea07ad Mon Sep 17 00:00:00 2001
+From 2fbd924ddeb8078f8241b35933e14e35a220767d 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 2d8e307e7..b6f4ec842 100644
+index 9d802be18a..0096df5de0 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -100,7 +100,11 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0269-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
similarity index 88%
rename from Spigot-Server-Patches/0269-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
index 1e17eefe4e..ce7c38fff4 100644
--- a/Spigot-Server-Patches/0269-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From b3a02b96725d11d0db406f34c2ff4dc2dec7aee6 Mon Sep 17 00:00:00 2001
+From 425c25691fe2dd228b01f6e4b20eb050440a85c5 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,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/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ca169e113..dad883054 100644
+index 023dd48a23..00691f6de9 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -514,6 +514,7 @@ public final class ItemStack {
+@@ -524,6 +524,7 @@ public final class ItemStack {
          this.getItem().b(this, world, entityhuman);
      }
  
@@ -18,7 +18,7 @@ index ca169e113..dad883054 100644
          return this.getItem().c(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index b1e0d6185..03f611518 100644
+index b1e0d61856..03f6115181 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -182,6 +182,13 @@ public final class CraftItemStack extends ItemStack {
diff --git a/Spigot-Server-Patches/0270-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0270-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch
index ec8ffedb18..db9f94e07a 100644
--- a/Spigot-Server-Patches/0270-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,11 +1,11 @@
-From b62e515f95531fb8a44ed48d0773987b0622100f Mon Sep 17 00:00:00 2001
+From d75aa9bc0f292cc70f7fd674acda2e705ca169cf 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 c3d30dc94..fd9be7574 100644
+index 888bbd7a45..c6632588eb 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -138,8 +138,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/0271-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 93%
rename from Spigot-Server-Patches/0271-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 8c0187303a..400735e51c 100644
--- a/Spigot-Server-Patches/0271-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From f00d585a8bbb438d74f7802fd5fb536bfc69185b Mon Sep 17 00:00:00 2001
+From d1bada03a8ddbe7c0ca4054c6c8fc5e4342935c5 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 0147054df..bbb4ca0fe 100644
+index 0147054dff..bbb4ca0fe6 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0272-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
similarity index 91%
rename from Spigot-Server-Patches/0272-Properly-remove-entities-on-dimension-teleport.patch
rename to Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
index 29173d801c..3f5f62e2e9 100644
--- a/Spigot-Server-Patches/0272-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From 8b876416290e13c07102b3f283e01512f9725557 Mon Sep 17 00:00:00 2001
+From 6010e68f2c3d4733a78baede40dd80d456bff758 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
@@ -22,10 +22,10 @@ requirement, but plugins (such as my own) use this method to
 trigger a "reload" of the entity on the client.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0d69e6187..67af3e25c 100644
+index bd232b31e4..af7b91b479 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2607,7 +2607,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2606,7 +2606,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end */
  
@@ -35,7 +35,7 @@ index 0d69e6187..67af3e25c 100644
              this.world.methodProfiler.a("reposition");
              /* CraftBukkit start - Handled in calculateTarget
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9e3804579..44d867663 100644
+index d506503e93..697296acd0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1025,6 +1025,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0273-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
similarity index 94%
rename from Spigot-Server-Patches/0273-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
index 987dc4fdcd..8a04e333a0 100644
--- a/Spigot-Server-Patches/0273-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From c19ab61ae52201550ca2cd3bd0b8d1046d94b7e7 Mon Sep 17 00:00:00 2001
+From 4e9e1e8a0136e140460f3054bd60ee7795002846 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6d4dc539c..7da6a25f1 100644
+index 6d4dc539cb..7da6a25f1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -525,14 +525,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0274-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from Spigot-Server-Patches/0274-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch
index 6ea2b684fa..89645fef90 100644
--- a/Spigot-Server-Patches/0274-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From bb83f7424505fdfcbde00c4a03cf33d1f5084158 Mon Sep 17 00:00:00 2001
+From dea60591fcd04c41b13cfd83ac0f530d1b32a9d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b602bbf12..62bce1806 100644
+index b602bbf122..62bce18061 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -291,4 +291,12 @@ public class PaperConfig {
@@ -53,7 +53,7 @@ index b602bbf12..62bce1806 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LotoSelectorEntry.java b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
-index add618866..9f8e17b9d 100644
+index add618866b..9f8e17b9d3 100644
 --- a/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 @@ -14,8 +14,8 @@ import java.util.Random;
diff --git a/Spigot-Server-Patches/0275-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 89%
rename from Spigot-Server-Patches/0275-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch
index 32d6ca5743..4690cc3a9a 100644
--- a/Spigot-Server-Patches/0275-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,11 +1,11 @@
-From 0174cd4916ed9847dc297dae74940d3053c18011 Mon Sep 17 00:00:00 2001
+From 3b1a296bedbe1651e82c0c07801a4d6da256ba4e 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 cbfdb3cf7..9a243010d 100644
+index cbfdb3cf79..9a243010d0 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -157,7 +157,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
diff --git a/Spigot-Server-Patches/0276-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0276-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
index d37042c508..b401226e15 100644
--- a/Spigot-Server-Patches/0276-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From 1bf8f7ce7285ba62fda47503cf9ac20e460b2926 Mon Sep 17 00:00:00 2001
+From 78c7950323b1153c58924dade556acde3e186391 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 f1db4becd..ef4bfb480 100644
+index f1db4becde..ef4bfb480c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -408,4 +408,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index f1db4becd..ef4bfb480 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 999a02cad..eaab10a14 100644
+index 999a02cad3..eaab10a146 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2664,7 +2664,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,7 +49,7 @@ index 999a02cad..eaab10a14 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 524cfd99b..a6f847e31 100644
+index 524cfd99b7..a6f847e313 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -530,5 +530,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0277-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 93%
rename from Spigot-Server-Patches/0277-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 1997547d6c..28812d69b8 100644
--- a/Spigot-Server-Patches/0277-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From aadf97220e1f6f86636f331da7fe9f0eaad87fa5 Mon Sep 17 00:00:00 2001
+From 50eb40a8a5203c8aa84d94d24148d7c4acf3c16c 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 71d6c4552..799f2be70 100644
+index 71d6c45529..799f2be707 100644
 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java
 +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
 @@ -77,7 +77,11 @@ public class RecipeBookServer extends RecipeBook {
diff --git a/Spigot-Server-Patches/0278-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 96%
rename from Spigot-Server-Patches/0278-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 1575ff282c..76878be901 100644
--- a/Spigot-Server-Patches/0278-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From ab2bedbe6a0f08e88ef7726bf5693669443a2bbf Mon Sep 17 00:00:00 2001
+From c40eeffb614580d924ea6b00a3e3d05e614365ed 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 c2bc8060a..1ae967d1c 100644
+index 8e1f6427d5..e262ce0969 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -160,7 +160,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index c2bc8060a..1ae967d1c 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 4aa3b6249..c8fc18045 100644
+index 8489f45be2..379a7f84a5 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -57,6 +57,7 @@ public class ItemBow extends Item {
@@ -58,7 +58,7 @@ index 4aa3b6249..c8fc18045 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8df07536f..28b156e43 100644
+index 8df07536f8..28b156e439 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -244,7 +244,7 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0279-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0279-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch
index 6ff21eaf5f..f99990ee8a 100644
--- a/Spigot-Server-Patches/0279-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 7f76c01206344b8ab4296cec33cd11c3be5763e6 Mon Sep 17 00:00:00 2001
+From 637bff64eeaaf0fc7af097f126863f0b81da9240 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index c8fc18045..de0d80361 100644
+index 379a7f84a5..c0caeda362 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0280-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 93%
rename from Spigot-Server-Patches/0280-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch
index 463186a4f5..35ddbe5f80 100644
--- a/Spigot-Server-Patches/0280-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,11 +1,11 @@
-From f0b6ccf18509b9884389988eae1ee25d85819505 Mon Sep 17 00:00:00 2001
+From ba6a4bd84e793af70eef53160e5308825978314b 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 d64664c4d..4832fdd02 100644
+index 82b36350c4..aebf704664 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -123,8 +123,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
diff --git a/Spigot-Server-Patches/0281-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0281-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
index 2415823103..a27364116c 100644
--- a/Spigot-Server-Patches/0281-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 121cd30c4f384f19b62d0ba25b4a7a31d0b9e6ef Mon Sep 17 00:00:00 2001
+From 75b301f96c5f5dfddc5bca5671e055cefcb9fcde 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 dffa42ba5..7cacbaffe 100644
+index eaab10a146..4455dc4891 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1247,6 +1247,12 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0282-Expand-Explosions-API.patch b/Spigot-Server-Patches/0281-Expand-Explosions-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0282-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0281-Expand-Explosions-API.patch
index 1084e1ed7e..41ff2ea20b 100644
--- a/Spigot-Server-Patches/0282-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0281-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 11db157dbfdbc9b58395db8ec6042f0b839d2b91 Mon Sep 17 00:00:00 2001
+From b676c9fc36769db1c201f65a7a7226227347f4e9 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,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f7eaecb3f..e8290759b 100644
+index f7eaecb3fe..e8290759bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -548,6 +548,11 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0283-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0283-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
index 8470753b9d..093f53b297 100644
--- a/Spigot-Server-Patches/0283-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 8f9dd75bf0186ef9e145b0399cedd29b5b090740 Mon Sep 17 00:00:00 2001
+From 7c7021b4de845573adde324dc039be0522406181 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 4455dc489..8be1ba526 100644
+index 4455dc4891..8be1ba5269 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index 4455dc489..8be1ba526 100644
          return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a6f847e31..768bce141 100644
+index a6f847e313..768bce1411 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -540,5 +540,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0284-RangedEntity-API.patch b/Spigot-Server-Patches/0283-RangedEntity-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0284-RangedEntity-API.patch
rename to Spigot-Server-Patches/0283-RangedEntity-API.patch
index 0d22333137..1cc516ee45 100644
--- a/Spigot-Server-Patches/0284-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0283-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 420a90ce0cca816c8a0599edb797468e80b1d779 Mon Sep 17 00:00:00 2001
+From 57df4b5405ec6348656973b78db6d86cadb57dc0 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 4fd69850f..7fe65b7c2 100644
+index 4fd69850fd..7fe65b7c24 100644
 --- a/src/main/java/net/minecraft/server/IRangedEntity.java
 +++ b/src/main/java/net/minecraft/server/IRangedEntity.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -46,7 +46,7 @@ index 4fd69850f..7fe65b7c2 100644
 +    void s(boolean flag); default void setChargingAttack(boolean flag) { s(flag); } // Paper OBF HELPER
  }
 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 4ed89615f..4fa5e84ea 100644
+index 4ed89615fd..4fa5e84ea4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 @@ -1,12 +1,13 @@
@@ -103,7 +103,7 @@ index 4ed89615f..4fa5e84ea 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 0349f0a574..2e3d8fcdfa 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 @@
@@ -121,7 +121,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 c08833cb7..f25998eb6 100644
+index c08833cb7a..f25998eb6d 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 @@
@@ -139,7 +139,7 @@ index c08833cb7..f25998eb6 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 fad3db8af..b9bb3a0d1 100644
+index fad3db8af8..b9bb3a0d1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -1,11 +1,12 @@
diff --git a/Spigot-Server-Patches/0285-Add-SentientNPC-Interface-to-Entities.patch b/Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch
similarity index 96%
rename from Spigot-Server-Patches/0285-Add-SentientNPC-Interface-to-Entities.patch
rename to Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch
index cd84a9b277..694b373697 100644
--- a/Spigot-Server-Patches/0285-Add-SentientNPC-Interface-to-Entities.patch
+++ b/Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch
@@ -1,4 +1,4 @@
-From fd187d957c8bf19ff2a0c3ae4e740f288f12ea83 Mon Sep 17 00:00:00 2001
+From 30f3ac826503f83cca607b290996357ebd24e6a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 Jul 2018 22:06:29 -0400
 Subject: [PATCH] Add SentientNPC Interface to Entities
@@ -14,7 +14,7 @@ This interface lets you identify NPC entities capable of sentience, and able to
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftSentientNPC.java b/src/main/java/com/destroystokyo/paper/entity/CraftSentientNPC.java
 new file mode 100644
-index 000000000..a60ba1349
+index 0000000000..a60ba13495
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/CraftSentientNPC.java
 @@ -0,0 +1,25 @@
@@ -44,7 +44,7 @@ index 000000000..a60ba1349
 +
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java
-index 086980e76..ccce080ab 100644
+index 086980e76d..ccce080ab8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java
 @@ -1,11 +1,12 @@
@@ -62,7 +62,7 @@ index 086980e76..ccce080ab 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index cc115cc36..3a4e6f0c7 100644
+index cc115cc368..3a4e6f0c7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 @@ -1,17 +1,19 @@
@@ -89,7 +89,7 @@ index cc115cc36..3a4e6f0c7 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
-index 09d42141f..30004e5e8 100644
+index 09d42141fb..30004e5e8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
 @@ -1,16 +1,18 @@
@@ -124,7 +124,7 @@ index 09d42141f..30004e5e8 100644
      @Override
      public EntityCreature getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
-index f374c7b88..9e6f523bf 100644
+index f374c7b880..9e6f523bf1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
 @@ -1,10 +1,11 @@
@@ -141,7 +141,7 @@ index f374c7b88..9e6f523bf 100644
      public CraftFlying(CraftServer server, EntityFlying entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index 6bf30c834..3768b9573 100644
+index 6bf30c834c..3768b9573a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0286-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
similarity index 92%
rename from Spigot-Server-Patches/0286-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
rename to Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index 2a1b1e6bbc..3a050e078f 100644
--- a/Spigot-Server-Patches/0286-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From 70fe646bea2f7c4ca1178600fccadf5c353679b1 Mon Sep 17 00:00:00 2001
+From 808e9e3d527ba62ca052f7d2cfb327c189c39137 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:39 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 28b156e43..8ac599b7a 100644
+index 28b156e439..8ac599b7a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -823,7 +823,7 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0287-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 94%
rename from Spigot-Server-Patches/0287-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch
index b71300d3b0..b0e3f5095f 100644
--- a/Spigot-Server-Patches/0287-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,11 +1,11 @@
-From 055edcc6b62bace3a2471207d453296e73532325 Mon Sep 17 00:00:00 2001
+From 770fa922234383edf17ee299d257f62ac875b832 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 ef4bfb480..1607619bd 100644
+index ef4bfb480c..1607619bd0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -413,4 +413,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index ef4bfb480..1607619bd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index a20d54ee3..48bcda0f5 100644
+index a20d54ee34..48bcda0f50 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -29,9 +29,12 @@ public class EnderDragonBattle {
diff --git a/Spigot-Server-Patches/0288-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch
similarity index 89%
rename from Spigot-Server-Patches/0288-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch
index 7cec39c53a..a985e75b09 100644
--- a/Spigot-Server-Patches/0288-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch
@@ -1,11 +1,11 @@
-From 8055597cb297475d5e271dcffc2495a85b2a2702 Mon Sep 17 00:00:00 2001
+From 454babc0dd55c39343955aaad2b704df8d31d91a 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 e8290759b..0f4a894eb 100644
+index e8290759bb..0f4a894ebb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -756,6 +756,14 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0289-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0289-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
index 911d167e92..c290c1c495 100644
--- a/Spigot-Server-Patches/0289-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From bb581a508ed49e47db77cfe8cd9a3fb642b03acc Mon Sep 17 00:00:00 2001
+From a42d1a506c7a0658bd9e8fd7882b411bef7a6225 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7a797bef0..7a7d65692 100644
+index 7a797bef0d..7a7d656926 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -883,7 +883,7 @@ public class Chunk implements IChunkAccess {
@@ -29,7 +29,7 @@ index 7a797bef0..7a7d65692 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 738ac8570..14a61f68e 100644
+index 738ac8570c..14a61f68e1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -153,7 +153,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -56,7 +56,7 @@ index 738ac8570..14a61f68e 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 7059fc118..0c01f8daf 100644
+index 7059fc1187..0c01f8dafa 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -343,7 +343,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -110,10 +110,10 @@ index 7059fc118..0c01f8daf 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 42bb86d31..2860df860 100644
+index 5ee25d70fc..fc47738ec5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2038,7 +2038,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2039,7 +2039,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
@@ -123,7 +123,7 @@ index 42bb86d31..2860df860 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 45e42e998..7a2b219c6 100644
+index 45e42e9989..7a2b219c67 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -422,7 +422,7 @@ public abstract class PlayerList {
@@ -136,7 +136,7 @@ index 45e42e998..7a2b219c6 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 4b9ecb4a6..b602a5d1b 100644
+index 4b9ecb4a62..b602a5d1b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -402,8 +402,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 4b9ecb4a6..b602a5d1b 100644
      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 ab9956fa2..0f3e1d5ae 100644
+index ab9956fa24..0f3e1d5ae1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -687,7 +687,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index ab9956fa2..0f3e1d5ae 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 8ac599b7a..cf398cd25 100644
+index 8ac599b7a2..cf398cd250 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -913,8 +913,19 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0290-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 96%
rename from Spigot-Server-Patches/0290-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index c69e102600..608b330bc9 100644
--- a/Spigot-Server-Patches/0290-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From e447edc0e8d60a97f6c61bf5c498f2cb90d5d0e7 Mon Sep 17 00:00:00 2001
+From a57ea7eda73f5bdf5359d585762275d4f7282b54 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
@@ -10,7 +10,7 @@ to the object directly on the Entity/TileEntity object we can directly grab.
 Use that local value instead to reduce lookups in many hot places.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9e798038b..03afa1236 100644
+index 7a7d656926..b37fa3829b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -721,6 +721,7 @@ public class Chunk implements IChunkAccess {
@@ -22,7 +22,7 @@ index 9e798038b..03afa1236 100644
          this.a(entity, entity.af);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d8ce3efc9..35db0e184 100644
+index 00eb342f8c..127dcedc97 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1208,12 +1208,15 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0291-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch
similarity index 96%
rename from Spigot-Server-Patches/0291-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch
index 90a9b0dc0b..08a1dc431e 100644
--- a/Spigot-Server-Patches/0291-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From bf9f070bd5c6e334801791d85ebb2af51a53a1e6 Mon Sep 17 00:00:00 2001
+From 940ace0eb306f6911a0743804edec04b445cff9c 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 1607619bd..692206127 100644
+index 1607619bd0..6922061276 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -418,4 +418,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index 1607619bd..692206127 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 6832eaac5..b9cb59fa7 100644
+index 6832eaac5d..b9cb59fa72 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -172,7 +172,54 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
diff --git a/Spigot-Server-Patches/0292-Vex-getOwner-API.patch b/Spigot-Server-Patches/0291-Vex-getOwner-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0292-Vex-getOwner-API.patch
rename to Spigot-Server-Patches/0291-Vex-getOwner-API.patch
index 7cbe481578..8ce81b0fcd 100644
--- a/Spigot-Server-Patches/0292-Vex-getOwner-API.patch
+++ b/Spigot-Server-Patches/0291-Vex-getOwner-API.patch
@@ -1,4 +1,4 @@
-From 3ec7cf2dd409d5331a0b0715086104d1147d4f7e Mon Sep 17 00:00:00 2001
+From 767ec9898c4a8360d40b39d18029d157a9e64ac7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:30:22 -0400
 Subject: [PATCH] Vex#getOwner API
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getOwner 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 897d7c681..ba1109e03 100644
+index 80403473c8..36f8c315b5 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -86,6 +86,7 @@ public class EntityVex extends EntityMonster {
@@ -18,7 +18,7 @@ index 897d7c681..ba1109e03 100644
          return this.b;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 787a41e01..5d5658136 100644
+index 787a41e015..5d5658136c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0293-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 88%
rename from Spigot-Server-Patches/0293-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index a9d806535a..f53720da2a 100644
--- a/Spigot-Server-Patches/0293-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 2f8f876bb0fd67dc5c808631f0f2e5b4d96bae3f Mon Sep 17 00:00:00 2001
+From 6a99734646c6f697a4ef06e6b0822d3befbcfa53 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 97b315bca..d9d11a531 100644
+index fc47738ec5..6950f8a729 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1952,6 +1952,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1953,6 +1953,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      }
  
                      if (event.isCancelled()) {
diff --git a/Spigot-Server-Patches/0294-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 88%
rename from Spigot-Server-Patches/0294-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch
index a60f53816e..e6bc230c25 100644
--- a/Spigot-Server-Patches/0294-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From c6f4d4c98bc7fd4c6a536160e1c3150f4117b387 Mon Sep 17 00:00:00 2001
+From dfc6c7b5b887052a5c2911ee20bc8a473249a50b 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 70b251210..0114d585b 100644
+index 3099f6aa7a..2205932295 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -22,7 +22,7 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0295-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 94%
rename from Spigot-Server-Patches/0295-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 1d78d85f2f..d6c218bb35 100644
--- a/Spigot-Server-Patches/0295-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 2546c359772a7d9a0a6b347c8e07a6562fefcc37 Mon Sep 17 00:00:00 2001
+From 4a2e8aceb015706daadd73f26286ba2baf3c9b32 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 44d867663..fcb5f68f8 100644
+index 697296acd0..b048343b7c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -979,7 +979,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0296-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0295-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
similarity index 92%
rename from Spigot-Server-Patches/0296-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
rename to Spigot-Server-Patches/0295-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
index 729d4fc41c..3d243189a5 100644
--- a/Spigot-Server-Patches/0296-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ b/Spigot-Server-Patches/0295-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
@@ -1,4 +1,4 @@
-From 525217b8e83b87a99cd4e9733f5729c0d4cb9ac3 Mon Sep 17 00:00:00 2001
+From 3780df5dee4adf98b8ab4468c605979f989d04e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:23:00 -0400
 Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for
@@ -12,7 +12,7 @@ keep it vanilla in behavior
 a player may teleport away, and trigger instant despawn
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 9dc86e90d..c03eaf1e4 100644
+index 14d122b22b..7b64ec27c3 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -617,6 +617,8 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/0297-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0296-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 90%
rename from Spigot-Server-Patches/0297-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0296-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index f9b1904a6d..3696adc13c 100644
--- a/Spigot-Server-Patches/0297-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0296-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From 5528d5deb733bbad1d1aa7f9e9820750bbec2813 Mon Sep 17 00:00:00 2001
+From 7981e61b9a6dddd2e982f421b94e98e2d146eab2 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 d232bab74..b0f22f8f0 100644
+index d232bab745..b0f22f8f09 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -173,6 +173,10 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0298-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0297-Use-asynchronous-Log4j-2-loggers.patch
similarity index 87%
rename from Spigot-Server-Patches/0298-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0297-Use-asynchronous-Log4j-2-loggers.patch
index b42c6fd7f3..a6dbd49039 100644
--- a/Spigot-Server-Patches/0298-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0297-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From 4f6298ddaea7e4a4437ea321033433a16d8cf8fd Mon Sep 17 00:00:00 2001
+From 7964f140f23edfbb3b70f1e70d785db5f5cdfec9 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 a319cfe3b..ddee1b048 100644
+index a319cfe3b8..ddee1b0488 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -102,6 +102,14 @@
@@ -25,7 +25,7 @@ index a319cfe3b..ddee1b048 100644
              <groupId>junit</groupId>
 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/0299-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch
similarity index 89%
rename from Spigot-Server-Patches/0299-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch
index 480bbbec13..518891dbb1 100644
--- a/Spigot-Server-Patches/0299-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From ba47092b597856758723b579a1eae506c01d7d54 Mon Sep 17 00:00:00 2001
+From 88ce3d06ea198c762aed6e42caf403f595b07f58 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 67af3e25c..0e0dc72f0 100644
+index af7b91b479..47ce5cda76 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2506,7 +2506,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2505,7 +2505,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
diff --git a/Spigot-Server-Patches/0300-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0300-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 5ad950356e..84a4dd6bc3 100644
--- a/Spigot-Server-Patches/0300-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From c7266c6cc9e99625f22a54a8cbbca62a10d7acf0 Mon Sep 17 00:00:00 2001
+From 73e6428814b5eb1135bb45d9d3c2f30695c052e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0e0dc72f0..d725bf13e 100644
+index 47ce5cda76..b308f44168 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 0e0dc72f0..d725bf13e 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index fcb5f68f8..013f4eef5 100644
+index b048343b7c..747d99dbe6 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -53,6 +53,10 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0301-Additional-Paper-Config-options.patch b/Spigot-Server-Patches/0300-Additional-Paper-Config-options.patch
similarity index 90%
rename from Spigot-Server-Patches/0301-Additional-Paper-Config-options.patch
rename to Spigot-Server-Patches/0300-Additional-Paper-Config-options.patch
index 3408f8c8b1..7307465ba4 100644
--- a/Spigot-Server-Patches/0301-Additional-Paper-Config-options.patch
+++ b/Spigot-Server-Patches/0300-Additional-Paper-Config-options.patch
@@ -1,4 +1,4 @@
-From 98c8705126dd30ffab51ce8a21ee8069941c7477 Mon Sep 17 00:00:00 2001
+From ccd7f0abffd40781df772807c10fbbfeeb72f496 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:23:31 -0400
 Subject: [PATCH] Additional Paper Config options
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional Paper Config options
 Have to keep as sep patch for now until 1.13, otherwise we can't merge :/
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 62bce1806..5a17ce3d2 100644
+index 62bce18061..5a17ce3d22 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -67,6 +67,10 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 62bce1806..5a17ce3d2 100644
          if (verbose) {
              Bukkit.getLogger().info(s);
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 692206127..7bd7aa0d9 100644
+index 6922061276..7bd7aa0d94 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -8,6 +8,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0301-Duplicate-UUID-Resolve-Option.patch
similarity index 97%
rename from Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0301-Duplicate-UUID-Resolve-Option.patch
index f0315797f8..caa8760e11 100644
--- a/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0301-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 92a07e301c03b31ac531b25614d11b10168c3ae8 Mon Sep 17 00:00:00 2001
+From ffb9e895c678e0bc8bcd62042080e712d786e6dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7bd7aa0d9..ba6d5b7ff 100644
+index 7bd7aa0d94..ba6d5b7ff5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -430,4 +430,40 @@ public class PaperWorldConfig {
@@ -78,7 +78,7 @@ index 7bd7aa0d9..ba6d5b7ff 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b37fa3829..c56e435b1 100644
+index b37fa3829b..c56e435b19 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
@@ -147,10 +147,10 @@ index b37fa3829..c56e435b1 100644
              this.world.a((Collection) entityslice);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index be3b1f096..6eceb1dce 100644
+index b308f44168..b6d6d4f378 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2735,6 +2735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2734,6 +2734,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
@@ -159,7 +159,7 @@ index be3b1f096..6eceb1dce 100644
          this.uniqueID = uuid;
          this.au = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 747d99dbe..7a9f28421 100644
+index 747d99dbe6..7a9f28421b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -40,7 +40,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0303-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0302-Add-async-chunk-load-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0303-Add-async-chunk-load-API.patch
rename to Spigot-Server-Patches/0302-Add-async-chunk-load-API.patch
index 05c8fbbc6f..002b88c894 100644
--- a/Spigot-Server-Patches/0303-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0302-Add-async-chunk-load-API.patch
@@ -1,11 +1,11 @@
-From c956b264d891943cfe291d01eb7218d88eabe347 Mon Sep 17 00:00:00 2001
+From a753c54e8811761c74b60be329b82c2fed32c769 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Add async chunk load API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0f4a894eb..995e02f1d 100644
+index 0f4a894ebb..995e02f1d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -156,6 +156,27 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0304-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch b/Spigot-Server-Patches/0303-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
similarity index 92%
rename from Spigot-Server-Patches/0304-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
rename to Spigot-Server-Patches/0303-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
index c1e62eca7e..0a0b84f850 100644
--- a/Spigot-Server-Patches/0304-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
+++ b/Spigot-Server-Patches/0303-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
@@ -1,4 +1,4 @@
-From 48823e6b74986eb521e651c82065f4ffcea3673e Mon Sep 17 00:00:00 2001
+From 1be6de780667fdfdb842f80bfa0730a70371895d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Apr 2018 11:21:48 -0400
 Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
@@ -7,7 +7,7 @@ This disables the behavior that allows players to keep chunks permanently loaded
 by default and allows server operators to enable it if they wish.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ba6d5b7ff..b9f5f4905 100644
+index ba6d5b7ff5..b9f5f49055 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -466,4 +466,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index ba6d5b7ff..b9f5f4905 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 70790386e..7f83ed51d 100644
+index 7d77c5fb31..fd8430a68f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -111,7 +111,7 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/0305-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0304-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0305-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0304-Speedup-BlockPos-by-fixing-inlining.patch
index 15d1b98326..4abc228aac 100644
--- a/Spigot-Server-Patches/0305-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0304-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 24b5fbaa4e37f418c3eefd5a6ab6678aa6e095ac Mon Sep 17 00:00:00 2001
+From d4e24e1b648305ae75c64ba245fcfb3d1712fdfb 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 58f8b4b72..98992513d 100644
+index 58f8b4b720..98992513da 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;
@@ -80,7 +80,7 @@ index 58f8b4b72..98992513d 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 7122a9aa8..2f6fc330b 100644
+index 7122a9aa8a..2f6fc330b3 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -207,15 +207,17 @@ public class BlockPosition extends BaseBlockPosition {
diff --git a/Spigot-Server-Patches/0306-Optimize-Hoppers.patch b/Spigot-Server-Patches/0305-Optimize-Hoppers.patch
similarity index 98%
rename from Spigot-Server-Patches/0306-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0305-Optimize-Hoppers.patch
index 166fd72720..d0356bca0f 100644
--- a/Spigot-Server-Patches/0306-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0305-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 4d6153f46915538901e3983474ee836e2ea49d97 Mon Sep 17 00:00:00 2001
+From 3b1cd8419e873319c05fbb282e828bfd9e6b9bd7 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 b9f5f4905..a8470e6e7 100644
+index b9f5f49055..a8470e6e76 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -399,6 +399,15 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index b9f5f4905..a8470e6e7 100644
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 66b637326..f9a7bde0b 100644
+index 66b637326a..f9a7bde0b6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1022,6 +1022,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -43,7 +43,7 @@ index 66b637326..f9a7bde0b 100644
                  this.methodProfiler.a(() -> {
                      return worldserver.getWorldData().getName();
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 3e9b357c8..db78274a8 100644
+index 3e9b357c87..db78274a8c 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -49,6 +49,7 @@ public abstract class TileEntity implements KeyedObject {
@@ -63,7 +63,7 @@ index 3e9b357c8..db78274a8 100644
              this.world.b(this.position, this);
              if (!this.f.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index bb41d4780..9e7a91fe4 100644
+index bb41d4780f..9e7a91fe48 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -190,6 +190,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
diff --git a/Spigot-Server-Patches/0307-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0307-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch
index db407f5763..5aaee817e6 100644
--- a/Spigot-Server-Patches/0307-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From 0793b868c59fa342bf8438b1f23b489f1fe730ae Mon Sep 17 00:00:00 2001
+From 2d53aa2c84c4fed063659a26e9bcb90d546a5ae8 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,7 +8,7 @@ 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/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index fd8430a68..b425704b1 100644
+index fd8430a68f..b425704b1a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -250,7 +250,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -30,7 +30,7 @@ index fd8430a68..b425704b1 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ea8684747..a97e024ec 100644
+index ea8684747d..a97e024ec4 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -282,6 +282,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/work/Bukkit b/work/Bukkit
index 7731ecdea4..b7b10ad1c3 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 7731ecdea45210a641cedc66d7ef91a8176e3cfc
+Subproject commit b7b10ad1c3cd0c03c041e2958a37895ce6990f65
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 1c7adf74e4..587014503b 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1c7adf74e45bb83545603c1e4b7974ad979c442c
+Subproject commit 587014503baa1ccdfb835404e1a88f1c0e1915d5
diff --git a/work/Spigot b/work/Spigot
index ed1cec9ae9..5eb39219b1 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit ed1cec9ae9ee07f1b51bdda14dfe14b40e92c9ed
+Subproject commit 5eb39219b1987510730e082ef6c14470b11bcc5b