From 33163525f30e182abfeb45e3f1fb1ac6f1f28f00 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 20 Dec 2016 16:34:27 -0600
Subject: [PATCH] Update Paper to MC 1.11.1

---
 Spigot-API-Patches/0001-POM-changes.patch     |   8 +-
 ...cord-chat-API-from-spigot-subclasses.patch |  32 ++++--
 .../0017-Player-Tab-List-and-Title-APIs.patch |  12 +-
 ...t-sendMessage-methods-to-CommandSend.patch |  20 ++--
 .../0022-Complete-resource-pack-API.patch     |   8 +-
 ...eload-permissions.yml-and-require-co.patch |   8 +-
 .../0033-Add-getEntity-by-UUID-API.patch      |   8 +-
 ...nt.patch => 0039-Add-EntityZapEvent.patch} |   4 +-
 ...bug-logging-to-Timings-enable-setter.patch |  25 -----
 ...Misc-Utils.patch => 0040-Misc-Utils.patch} |   4 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |   8 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |   4 +-
 ... => 0043-Add-ProjectileCollideEvent.patch} |   2 +-
 ...044-Add-String-based-Action-Bar-API.patch} |   6 +-
 Spigot-Server-Patches/0001-POM-Changes.patch  |   8 +-
 Spigot-Server-Patches/0004-MC-Utils.patch     |  16 +--
 Spigot-Server-Patches/0005-Timings-v2.patch   |  61 +++++-----
 ...009-Configurable-fishing-time-ranges.patch |  10 +-
 .../0016-Player-affects-spawning-API.patch    |  14 +--
 .../0023-Entity-Origin-API.patch              |  16 +--
 ...event-tile-entity-and-entity-crashes.patch |  10 +-
 ...nfigurable-top-of-nether-void-damage.patch |  10 +-
 ...e-before-converting-and-renaming-pla.patch |   6 +-
 .../0029-Configurable-end-credits.patch       |   8 +-
 ...0-Configurable-mob-spawner-tick-rate.patch |  10 +-
 ...figurable-container-update-tick-rate.patch |   6 +-
 .../0045-Disable-spigot-tick-limiters.patch   |   8 +-
 ...50-Ensure-commands-are-not-ran-async.patch |   6 +-
 ...cord-chat-API-from-spigot-subclasses.patch |  60 ----------
 ...0056-Player-Tab-List-and-Title-APIs.patch} |  18 +--
 ...> 0057-Ensure-inv-drag-is-in-bounds.patch} |   2 +-
 ...ntation-of-tile-entity-removal-list.patch} |  10 +-
 ...d-configurable-portal-search-radius.patch} |   2 +-
 ...patch => 0060-Add-velocity-warnings.patch} |   2 +-
 ...-inter-world-teleportation-glitches.patch} |   6 +-
 ... 0062-Add-exception-reporting-event.patch} |  10 +-
 ...don-t-need-to-when-cerealising-text.patch} |   2 +-
 ...reboards-for-non-players-by-default.patch} |   6 +-
 ...orking-with-arrows-stuck-in-living-.patch} |   4 +-
 ... => 0066-Complete-resource-pack-API.patch} |  10 +-
 ... 0067-Chunk-save-queue-improvements.patch} |   4 +-
 ....patch => 0068-Chunk-Save-Reattempt.patch} |   4 +-
 ...ding-permissions.yml-before-plugins.patch} |   4 +-
 ...low-Reloading-of-Custom-Permissions.patch} |   6 +-
 ...h => 0071-Remove-Metadata-on-reload.patch} |   4 +-
 ...patch => 0072-Undead-horse-leashing.patch} |   2 +-
 ...h => 0073-Fix-Furnace-cook-time-bug.patch} |   2 +-
 ...74-Handle-Item-Meta-Inconsistencies.patch} |   2 +-
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |   4 +-
 ...atch => 0076-Add-World-Util-Methods.patch} |   4 +-
 ...7-Optimized-Light-Level-Comparisons.patch} |   4 +-
 ...0078-Pass-world-to-Village-creation.patch} |   2 +-
 ...-Custom-replacement-for-eaten-items.patch} |   4 +-
 ... 0080-Set-health-before-death-event.patch} |   2 +-
 ...h-absorb-values-and-repair-bad-data.patch} |   8 +-
 ...tch-Async-PlayerChunkMap-operations.patch} |   2 +-
 ...e-mode-in-whitelist-command-as-well.patch} |   2 +-
 ...tch => 0084-Fix-SkullCache-case-bug.patch} |   2 +-
 ...ch => 0085-Waving-banner-workaround.patch} |   2 +-
 ...86-Use-a-Shared-Random-for-Entities.patch} |   8 +-
 ...> 0087-Don-t-teleport-dead-entities.patch} |   6 +-
 ...patch => 0088-Optimize-Chunk-Access.patch} |   2 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |   4 +-
 ...ocation-getType-and-getBlockData-fo.patch} |  14 +--
 ... 0091-Fix-cooked-fish-legacy-import.patch} |   2 +-
 ... 0092-Access-items-by-EquipmentSlot.patch} |   2 +-
 ...eck-async-remove-unused-vars-GH-159.patch} |   4 +-
 ...-infinite-loop-in-BlockPosition-iter.patch |  91 ---------------
 ...able-BlockPhysicsEvent-for-Redstone.patch} |   6 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |   4 +-
 ...-Configurable-Chunk-Inhabited-Timer.patch} |   2 +-
 ...t.patch => 0097-EntityPathfindEvent.patch} |   2 +-
 ...-BlockFromToEvent-from-loading-chun.patch} |   2 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |   2 +-
 ...gionFileCache-and-make-configurable.patch} |   2 +-
 ...h => 0101-Add-getEntity-by-UUID-API.patch} |   8 +-
 ...h => 0102-Use-Optimized-Collections.patch} |   2 +-
 ...Do-not-load-chunks-for-light-checks.patch} |   4 +-
 ...104-Add-PlayerUseUnknownEntityEvent.patch} |   6 +-
 ...DebugInfo-not-initialized-on-client.patch} |   4 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |   2 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  10 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |   4 +-
 ...m-reload-spawn-chunks-in-nether-end.patch} |   6 +-
 ...0-Remove-Debug-checks-from-DataBits.patch} |   2 +-
 ...illa-per-world-scoreboard-coloring-.patch} |  10 +-
 ...d-for-setting-passengers-on-players.patch} |   6 +-
 ...emove-unused-World-Tile-Entity-List.patch} |  14 +--
 ... 0114-Don-t-tick-Skulls-unused-code.patch} |   2 +-
 ... 0115-Configurable-Player-Collision.patch} |  12 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |   4 +-
 ...mobs-should-only-spawn-in-the-water.patch} |   2 +-
 ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} |   4 +-
 ...> 0119-Configurable-RCON-IP-address.patch} |   2 +-
 ...20-Prevent-Fire-from-loading-chunks.patch} |   2 +-
 ...1-Implement-PlayerLocaleChangeEvent.patch} |  10 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |   4 +-
 ...to-configure-frosted_ice-properties.patch} |   2 +-
 ...-Vehicle-Event-Cancellation-Changes.patch} |  14 +--
 ...patch => 0125-Arrow-pickup-rule-API.patch} |   2 +-
 ...dispenser-dropper-furnace-placement.patch} |   6 +-
 ...mprove-Minecraft-Hopper-Performance.patch} |   4 +-
 ...possibility-for-getServer-singleton.patch} |   4 +-
 ...tem-frames-performance-and-bug-fixe.patch} |   6 +-
 ...API-Replenishable-Lootables-Feature.patch} |   2 +-
 ...-Do-not-load-chunks-for-pathfinding.patch} |   2 +-
 ...> 0132-Entity-Tracking-Improvements.patch} |   6 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |   2 +-
 ...unks-as-active-for-neighbor-updates.patch} |   2 +-
 ... 0135-Fix-Chunk-Unload-Queue-Issues.patch} |   2 +-
 ...em-property-for-disabling-watchdoge.patch} |   2 +-
 ...mize-EAR.patch => 0137-Optimize-EAR.patch} |   2 +-
 ...0138-Optimize-UserCache-Thread-Safe.patch} |   4 +-
 ...locking-on-Network-Manager-creation.patch} |   2 +-
 ...0-Optional-old-TNT-cannon-behaviors.patch} |  14 +--
 ...-redstone-torch-rapid-clock-removal.patch} |   2 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |   2 +-
 ...h => 0143-Add-server-name-parameter.patch} |   4 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |   8 +-
 ...FallingBlocks-being-stuck-on-fences.patch} |   6 +-
 ...0146-Make-entities-look-for-hoppers.patch} |  16 +--
 ...nk-Unloads-based-on-Player-Movement.patch} |   2 +-
 ... 0148-Toggleable-Elytra-Wall-Damage.patch} |   4 +-
 ...=> 0149-Fix-Double-World-Add-issues.patch} |   6 +-
 ...tch => 0150-Fix-Old-Sign-Conversion.patch} |   6 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |   2 +-
 ...ative-vehicle-moved-wrongly-message.patch} |   4 +-
 ...rs-that-dismount-from-other-players.patch} |   6 +-
 ...etting-for-proxy-online-mode-status.patch} |   6 +-
 ...-BlockStateEnum-hashCode-and-equals.patch} |   2 +-
 ...0156-Disable-ticking-of-snow-blocks.patch} |   2 +-
 ...rt-new-health-to-a-float-during-set.patch} |   2 +-
 ...58-Fix-AIOOBE-in-inventory-handling.patch} |   6 +-
 ...nfigurable-packet-in-spam-threshold.patch} |   6 +-
 ...0-Configurable-flying-kick-messages.patch} |   4 +-
 ...atch => 0161-Auto-Save-Improvements.patch} |   6 +-
 ...ch => 0162-Chunk-registration-fixes.patch} |   6 +-
 ...k-reference-on-Craft-Entity-removal.patch} |   2 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |   4 +-
 ...ring-limit-for-packet-serialization.patch} |   2 +-
 ...ch => 0166-Disable-Vanilla-Chunk-GC.patch} |   4 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |   2 +-
 ...nt.patch => 0168-Add-EntityZapEvent.patch} |   8 +-
 ...hunks-from-Hoppers-and-other-things.patch} |   4 +-
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} |   4 +-
 ... 0171-Chunk-Save-Stats-Debug-Option.patch} |   4 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |   8 +-
 ...73-Cache-user-authenticator-threads.patch} |   2 +-
 ...atch => 0174-Optimize-Network-Queue.patch} |   4 +-
 ...tch => 0175-Optimise-NetworkManager.patch} |   2 +-
 ....patch => 0176-Optimise-removeQueue.patch} |   8 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |   6 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |   4 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |   4 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} | 104 +++++++++---------
 ...-Don-t-let-fishinghooks-use-portals.patch} |  10 +-
 ... => 0182-Add-ProjectileCollideEvent.patch} |   8 +-
 ...-Vanished-players-don-t-have-rights.patch} |  12 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |   8 +-
 ...re-invalid-Marker-Icon-ID-s-in-maps.patch} |   6 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |   8 +-
 ...igurable-Cartographer-Treasure-Maps.patch} |   8 +-
 work/BuildData                                |   2 +-
 work/Bukkit                                   |   2 +-
 work/CraftBukkit                              |   2 +-
 work/Spigot                                   |   2 +-
 166 files changed, 538 insertions(+), 699 deletions(-)
 rename Spigot-API-Patches/{0040-Add-EntityZapEvent.patch => 0039-Add-EntityZapEvent.patch} (98%)
 delete mode 100644 Spigot-API-Patches/0039-Add-debug-logging-to-Timings-enable-setter.patch
 rename Spigot-API-Patches/{0041-Misc-Utils.patch => 0040-Misc-Utils.patch} (94%)
 rename Spigot-API-Patches/{0042-Allow-Reloading-of-Command-Aliases.patch => 0041-Allow-Reloading-of-Command-Aliases.patch} (95%)
 rename Spigot-API-Patches/{0043-Add-source-to-PlayerExpChangeEvent.patch => 0042-Add-source-to-PlayerExpChangeEvent.patch} (95%)
 rename Spigot-API-Patches/{0044-Add-ProjectileCollideEvent.patch => 0043-Add-ProjectileCollideEvent.patch} (97%)
 rename Spigot-API-Patches/{0045-Add-String-based-Action-Bar-API.patch => 0044-Add-String-based-Action-Bar-API.patch} (90%)
 delete mode 100644 Spigot-Server-Patches/0056-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
 rename Spigot-Server-Patches/{0057-Player-Tab-List-and-Title-APIs.patch => 0056-Player-Tab-List-and-Title-APIs.patch} (95%)
 rename Spigot-Server-Patches/{0058-Ensure-inv-drag-is-in-bounds.patch => 0057-Ensure-inv-drag-is-in-bounds.patch} (93%)
 rename Spigot-Server-Patches/{0059-Change-implementation-of-tile-entity-removal-list.patch => 0058-Change-implementation-of-tile-entity-removal-list.patch} (93%)
 rename Spigot-Server-Patches/{0060-Add-configurable-portal-search-radius.patch => 0059-Add-configurable-portal-search-radius.patch} (97%)
 rename Spigot-Server-Patches/{0061-Add-velocity-warnings.patch => 0060-Add-velocity-warnings.patch} (95%)
 rename Spigot-Server-Patches/{0062-Fix-inter-world-teleportation-glitches.patch => 0061-Fix-inter-world-teleportation-glitches.patch} (93%)
 rename Spigot-Server-Patches/{0063-Add-exception-reporting-event.patch => 0062-Add-exception-reporting-event.patch} (98%)
 rename Spigot-Server-Patches/{0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (95%)
 rename Spigot-Server-Patches/{0065-Disable-Scoreboards-for-non-players-by-default.patch => 0064-Disable-Scoreboards-for-non-players-by-default.patch} (93%)
 rename Spigot-Server-Patches/{0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (94%)
 rename Spigot-Server-Patches/{0067-Complete-resource-pack-API.patch => 0066-Complete-resource-pack-API.patch} (92%)
 rename Spigot-Server-Patches/{0068-Chunk-save-queue-improvements.patch => 0067-Chunk-save-queue-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0069-Chunk-Save-Reattempt.patch => 0068-Chunk-Save-Reattempt.patch} (96%)
 rename Spigot-Server-Patches/{0070-Default-loading-permissions.yml-before-plugins.patch => 0069-Default-loading-permissions.yml-before-plugins.patch} (96%)
 rename Spigot-Server-Patches/{0071-Allow-Reloading-of-Custom-Permissions.patch => 0070-Allow-Reloading-of-Custom-Permissions.patch} (88%)
 rename Spigot-Server-Patches/{0072-Remove-Metadata-on-reload.patch => 0071-Remove-Metadata-on-reload.patch} (91%)
 rename Spigot-Server-Patches/{0073-Undead-horse-leashing.patch => 0072-Undead-horse-leashing.patch} (96%)
 rename Spigot-Server-Patches/{0074-Fix-Furnace-cook-time-bug.patch => 0073-Fix-Furnace-cook-time-bug.patch} (94%)
 rename Spigot-Server-Patches/{0075-Handle-Item-Meta-Inconsistencies.patch => 0074-Handle-Item-Meta-Inconsistencies.patch} (99%)
 rename Spigot-Server-Patches/{0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (95%)
 rename Spigot-Server-Patches/{0077-Add-World-Util-Methods.patch => 0076-Add-World-Util-Methods.patch} (97%)
 rename Spigot-Server-Patches/{0078-Optimized-Light-Level-Comparisons.patch => 0077-Optimized-Light-Level-Comparisons.patch} (98%)
 rename Spigot-Server-Patches/{0079-Pass-world-to-Village-creation.patch => 0078-Pass-world-to-Village-creation.patch} (95%)
 rename Spigot-Server-Patches/{0080-Custom-replacement-for-eaten-items.patch => 0079-Custom-replacement-for-eaten-items.patch} (93%)
 rename Spigot-Server-Patches/{0081-Set-health-before-death-event.patch => 0080-Set-health-before-death-event.patch} (96%)
 rename Spigot-Server-Patches/{0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (92%)
 rename Spigot-Server-Patches/{0083-Catch-Async-PlayerChunkMap-operations.patch => 0082-Catch-Async-PlayerChunkMap-operations.patch} (93%)
 rename Spigot-Server-Patches/{0084-Support-offline-mode-in-whitelist-command-as-well.patch => 0083-Support-offline-mode-in-whitelist-command-as-well.patch} (98%)
 rename Spigot-Server-Patches/{0085-Fix-SkullCache-case-bug.patch => 0084-Fix-SkullCache-case-bug.patch} (94%)
 rename Spigot-Server-Patches/{0086-Waving-banner-workaround.patch => 0085-Waving-banner-workaround.patch} (95%)
 rename Spigot-Server-Patches/{0087-Use-a-Shared-Random-for-Entities.patch => 0086-Use-a-Shared-Random-for-Entities.patch} (83%)
 rename Spigot-Server-Patches/{0088-Don-t-teleport-dead-entities.patch => 0087-Don-t-teleport-dead-entities.patch} (84%)
 rename Spigot-Server-Patches/{0089-Optimize-Chunk-Access.patch => 0088-Optimize-Chunk-Access.patch} (96%)
 rename Spigot-Server-Patches/{0090-Configurable-spawn-chances-for-skeleton-horses.patch => 0089-Configurable-spawn-chances-for-skeleton-horses.patch} (95%)
 rename Spigot-Server-Patches/{0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (96%)
 rename Spigot-Server-Patches/{0092-Fix-cooked-fish-legacy-import.patch => 0091-Fix-cooked-fish-legacy-import.patch} (94%)
 rename Spigot-Server-Patches/{0094-Access-items-by-EquipmentSlot.patch => 0092-Access-items-by-EquipmentSlot.patch} (97%)
 rename Spigot-Server-Patches/{0095-Check-async-remove-unused-vars-GH-159.patch => 0093-Check-async-remove-unused-vars-GH-159.patch} (94%)
 delete mode 100644 Spigot-Server-Patches/0093-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
 rename Spigot-Server-Patches/{0096-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (96%)
 rename Spigot-Server-Patches/{0097-Entity-AddTo-RemoveFrom-World-Events.patch => 0095-Entity-AddTo-RemoveFrom-World-Events.patch} (91%)
 rename Spigot-Server-Patches/{0098-Configurable-Chunk-Inhabited-Timer.patch => 0096-Configurable-Chunk-Inhabited-Timer.patch} (95%)
 rename Spigot-Server-Patches/{0099-EntityPathfindEvent.patch => 0097-EntityPathfindEvent.patch} (96%)
 rename Spigot-Server-Patches/{0100-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch => 0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch} (97%)
 rename Spigot-Server-Patches/{0101-Reduce-IO-ops-opening-a-new-region-file.patch => 0099-Reduce-IO-ops-opening-a-new-region-file.patch} (96%)
 rename Spigot-Server-Patches/{0102-Sanitise-RegionFileCache-and-make-configurable.patch => 0100-Sanitise-RegionFileCache-and-make-configurable.patch} (98%)
 rename Spigot-Server-Patches/{0103-Add-getEntity-by-UUID-API.patch => 0101-Add-getEntity-by-UUID-API.patch} (91%)
 rename Spigot-Server-Patches/{0104-Use-Optimized-Collections.patch => 0102-Use-Optimized-Collections.patch} (97%)
 rename Spigot-Server-Patches/{0105-Do-not-load-chunks-for-light-checks.patch => 0103-Do-not-load-chunks-for-light-checks.patch} (90%)
 rename Spigot-Server-Patches/{0106-Add-PlayerUseUnknownEntityEvent.patch => 0104-Add-PlayerUseUnknownEntityEvent.patch} (91%)
 rename Spigot-Server-Patches/{0107-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0105-Fix-reducedDebugInfo-not-initialized-on-client.patch} (92%)
 rename Spigot-Server-Patches/{0108-Configurable-Grass-Spread-Tick-Rate.patch => 0106-Configurable-Grass-Spread-Tick-Rate.patch} (96%)
 rename Spigot-Server-Patches/{0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (95%)
 rename Spigot-Server-Patches/{0110-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (89%)
 rename Spigot-Server-Patches/{0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (88%)
 rename Spigot-Server-Patches/{0112-Remove-Debug-checks-from-DataBits.patch => 0110-Remove-Debug-checks-from-DataBits.patch} (96%)
 rename Spigot-Server-Patches/{0113-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (91%)
 rename Spigot-Server-Patches/{0114-Workaround-for-setting-passengers-on-players.patch => 0112-Workaround-for-setting-passengers-on-players.patch} (86%)
 rename Spigot-Server-Patches/{0115-Remove-unused-World-Tile-Entity-List.patch => 0113-Remove-unused-World-Tile-Entity-List.patch} (88%)
 rename Spigot-Server-Patches/{0116-Don-t-tick-Skulls-unused-code.patch => 0114-Don-t-tick-Skulls-unused-code.patch} (92%)
 rename Spigot-Server-Patches/{0117-Configurable-Player-Collision.patch => 0115-Configurable-Player-Collision.patch} (95%)
 rename Spigot-Server-Patches/{0118-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (96%)
 rename Spigot-Server-Patches/{0119-Water-mobs-should-only-spawn-in-the-water.patch => 0117-Water-mobs-should-only-spawn-in-the-water.patch} (94%)
 rename Spigot-Server-Patches/{0120-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch => 0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} (96%)
 rename Spigot-Server-Patches/{0121-Configurable-RCON-IP-address.patch => 0119-Configurable-RCON-IP-address.patch} (93%)
 rename Spigot-Server-Patches/{0122-Prevent-Fire-from-loading-chunks.patch => 0120-Prevent-Fire-from-loading-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0123-Implement-PlayerLocaleChangeEvent.patch => 0121-Implement-PlayerLocaleChangeEvent.patch} (90%)
 rename Spigot-Server-Patches/{0124-EntityRegainHealthEvent-isFastRegen-API.patch => 0122-EntityRegainHealthEvent-isFastRegen-API.patch} (95%)
 rename Spigot-Server-Patches/{0125-Add-ability-to-configure-frosted_ice-properties.patch => 0123-Add-ability-to-configure-frosted_ice-properties.patch} (97%)
 rename Spigot-Server-Patches/{0126-Vehicle-Event-Cancellation-Changes.patch => 0124-Vehicle-Event-Cancellation-Changes.patch} (89%)
 rename Spigot-Server-Patches/{0127-Arrow-pickup-rule-API.patch => 0125-Arrow-pickup-rule-API.patch} (96%)
 rename Spigot-Server-Patches/{0128-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch => 0126-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch} (95%)
 rename Spigot-Server-Patches/{0129-Improve-Minecraft-Hopper-Performance.patch => 0127-Improve-Minecraft-Hopper-Performance.patch} (95%)
 rename Spigot-Server-Patches/{0130-remove-null-possibility-for-getServer-singleton.patch => 0128-remove-null-possibility-for-getServer-singleton.patch} (95%)
 rename Spigot-Server-Patches/{0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0129-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (98%)
 rename Spigot-Server-Patches/{0132-LootTable-API-Replenishable-Lootables-Feature.patch => 0130-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0133-Do-not-load-chunks-for-pathfinding.patch => 0131-Do-not-load-chunks-for-pathfinding.patch} (92%)
 rename Spigot-Server-Patches/{0134-Entity-Tracking-Improvements.patch => 0132-Entity-Tracking-Improvements.patch} (96%)
 rename Spigot-Server-Patches/{0135-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0133-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (96%)
 rename Spigot-Server-Patches/{0136-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0134-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (97%)
 rename Spigot-Server-Patches/{0137-Fix-Chunk-Unload-Queue-Issues.patch => 0135-Fix-Chunk-Unload-Queue-Issues.patch} (96%)
 rename Spigot-Server-Patches/{0138-System-property-for-disabling-watchdoge.patch => 0136-System-property-for-disabling-watchdoge.patch} (93%)
 rename Spigot-Server-Patches/{0139-Optimize-EAR.patch => 0137-Optimize-EAR.patch} (97%)
 rename Spigot-Server-Patches/{0140-Optimize-UserCache-Thread-Safe.patch => 0138-Optimize-UserCache-Thread-Safe.patch} (97%)
 rename Spigot-Server-Patches/{0141-Avoid-blocking-on-Network-Manager-creation.patch => 0139-Avoid-blocking-on-Network-Manager-creation.patch} (97%)
 rename Spigot-Server-Patches/{0142-Optional-old-TNT-cannon-behaviors.patch => 0140-Optional-old-TNT-cannon-behaviors.patch} (98%)
 rename Spigot-Server-Patches/{0143-Faster-redstone-torch-rapid-clock-removal.patch => 0141-Faster-redstone-torch-rapid-clock-removal.patch} (96%)
 rename Spigot-Server-Patches/{0144-Ensure-Chunks-never-ever-load-async.patch => 0142-Ensure-Chunks-never-ever-load-async.patch} (97%)
 rename Spigot-Server-Patches/{0145-Add-server-name-parameter.patch => 0143-Add-server-name-parameter.patch} (90%)
 rename Spigot-Server-Patches/{0146-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0144-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (94%)
 rename Spigot-Server-Patches/{0147-Fix-FallingBlocks-being-stuck-on-fences.patch => 0145-Fix-FallingBlocks-being-stuck-on-fences.patch} (96%)
 rename Spigot-Server-Patches/{0148-Make-entities-look-for-hoppers.patch => 0146-Make-entities-look-for-hoppers.patch} (97%)
 rename Spigot-Server-Patches/{0149-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0147-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (99%)
 rename Spigot-Server-Patches/{0150-Toggleable-Elytra-Wall-Damage.patch => 0148-Toggleable-Elytra-Wall-Damage.patch} (95%)
 rename Spigot-Server-Patches/{0151-Fix-Double-World-Add-issues.patch => 0149-Fix-Double-World-Add-issues.patch} (93%)
 rename Spigot-Server-Patches/{0152-Fix-Old-Sign-Conversion.patch => 0150-Fix-Old-Sign-Conversion.patch} (96%)
 rename Spigot-Server-Patches/{0153-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0151-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (93%)
 rename Spigot-Server-Patches/{0154-More-informative-vehicle-moved-wrongly-message.patch => 0152-More-informative-vehicle-moved-wrongly-message.patch} (91%)
 rename Spigot-Server-Patches/{0155-Re-track-players-that-dismount-from-other-players.patch => 0153-Re-track-players-that-dismount-from-other-players.patch} (86%)
 rename Spigot-Server-Patches/{0156-Add-setting-for-proxy-online-mode-status.patch => 0154-Add-setting-for-proxy-online-mode-status.patch} (94%)
 rename Spigot-Server-Patches/{0157-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0155-Optimise-BlockStateEnum-hashCode-and-equals.patch} (97%)
 rename Spigot-Server-Patches/{0158-Disable-ticking-of-snow-blocks.patch => 0156-Disable-ticking-of-snow-blocks.patch} (94%)
 rename Spigot-Server-Patches/{0159-Convert-new-health-to-a-float-during-set.patch => 0157-Convert-new-health-to-a-float-during-set.patch} (94%)
 rename Spigot-Server-Patches/{0160-Fix-AIOOBE-in-inventory-handling.patch => 0158-Fix-AIOOBE-in-inventory-handling.patch} (85%)
 rename Spigot-Server-Patches/{0161-Configurable-packet-in-spam-threshold.patch => 0159-Configurable-packet-in-spam-threshold.patch} (93%)
 rename Spigot-Server-Patches/{0162-Configurable-flying-kick-messages.patch => 0160-Configurable-flying-kick-messages.patch} (96%)
 rename Spigot-Server-Patches/{0163-Auto-Save-Improvements.patch => 0161-Auto-Save-Improvements.patch} (98%)
 rename Spigot-Server-Patches/{0164-Chunk-registration-fixes.patch => 0162-Chunk-registration-fixes.patch} (84%)
 rename Spigot-Server-Patches/{0165-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0163-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (93%)
 rename Spigot-Server-Patches/{0166-Auto-fix-bad-Y-levels-on-player-login.patch => 0164-Auto-fix-bad-Y-levels-on-player-login.patch} (89%)
 rename Spigot-Server-Patches/{0167-Raise-string-limit-for-packet-serialization.patch => 0165-Raise-string-limit-for-packet-serialization.patch} (95%)
 rename Spigot-Server-Patches/{0168-Disable-Vanilla-Chunk-GC.patch => 0166-Disable-Vanilla-Chunk-GC.patch} (93%)
 rename Spigot-Server-Patches/{0169-Option-to-remove-corrupt-tile-entities.patch => 0167-Option-to-remove-corrupt-tile-entities.patch} (96%)
 rename Spigot-Server-Patches/{0170-Add-EntityZapEvent.patch => 0168-Add-EntityZapEvent.patch} (94%)
 rename Spigot-Server-Patches/{0171-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0169-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (94%)
 rename Spigot-Server-Patches/{0172-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0170-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (97%)
 rename Spigot-Server-Patches/{0173-Chunk-Save-Stats-Debug-Option.patch => 0171-Chunk-Save-Stats-Debug-Option.patch} (97%)
 rename Spigot-Server-Patches/{0174-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0172-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (94%)
 rename Spigot-Server-Patches/{0175-Cache-user-authenticator-threads.patch => 0173-Cache-user-authenticator-threads.patch} (97%)
 rename Spigot-Server-Patches/{0176-Optimize-Network-Queue.patch => 0174-Optimize-Network-Queue.patch} (91%)
 rename Spigot-Server-Patches/{0177-Optimise-NetworkManager.patch => 0175-Optimise-NetworkManager.patch} (98%)
 rename Spigot-Server-Patches/{0178-Optimise-removeQueue.patch => 0176-Optimise-removeQueue.patch} (91%)
 rename Spigot-Server-Patches/{0179-Allow-Reloading-of-Command-Aliases.patch => 0177-Allow-Reloading-of-Command-Aliases.patch} (86%)
 rename Spigot-Server-Patches/{0180-Add-source-to-PlayerExpChangeEvent.patch => 0178-Add-source-to-PlayerExpChangeEvent.patch} (96%)
 rename Spigot-Server-Patches/{0182-Optimize-World.isLoaded-BlockPosition-Z.patch => 0179-Optimize-World.isLoaded-BlockPosition-Z.patch} (89%)
 rename Spigot-Server-Patches/{0181-Speedup-BlockPos-by-fixing-inlining.patch => 0180-Speedup-BlockPos-by-fixing-inlining.patch} (64%)
 rename Spigot-Server-Patches/{0183-Don-t-let-fishinghooks-use-portals.patch => 0181-Don-t-let-fishinghooks-use-portals.patch} (83%)
 rename Spigot-Server-Patches/{0184-Add-ProjectileCollideEvent.patch => 0182-Add-ProjectileCollideEvent.patch} (96%)
 rename Spigot-Server-Patches/{0185-Vanished-players-don-t-have-rights.patch => 0183-Vanished-players-don-t-have-rights.patch} (94%)
 rename Spigot-Server-Patches/{0186-Prevent-Pathfinding-out-of-World-Border.patch => 0184-Prevent-Pathfinding-out-of-World-Border.patch} (93%)
 rename Spigot-Server-Patches/{0187-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch => 0185-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch} (93%)
 rename Spigot-Server-Patches/{0188-Bound-Treasure-Maps-to-World-Border.patch => 0186-Bound-Treasure-Maps-to-World-Border.patch} (94%)
 rename Spigot-Server-Patches/{0189-Configurable-Cartographer-Treasure-Maps.patch => 0187-Configurable-Cartographer-Treasure-Maps.patch} (94%)

diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index 0a9d064b5b..5e11cd8731 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From 9576b81c87a4dfb2e3f672f6435779e65468e671 Mon Sep 17 00:00:00 2001
+From 75d4b845b027f8df6561282a96dd6ede8c272b2f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:16:08 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 4b788b0..20159ad 100644
+index 65839cb..c32903b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -4,35 +4,37 @@
@@ -24,7 +24,7 @@ index 4b788b0..20159ad 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.11-R0.1-SNAPSHOT</version>
+     <version>1.11.1-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
@@ -133,5 +133,5 @@ index 4b788b0..20159ad 100644
                      <shadedArtifactAttached>true</shadedArtifactAttached>
                  </configuration>
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 16f4fec173..28fa2c91fa 100644
--- a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From 1fd8e7ad43cd1fd7602774dc31d963d1078406c6 Mon Sep 17 00:00:00 2001
+From ec0213d43bbad628561225629bda86b4cd9dc489 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,10 +37,10 @@ index 9b310d8..87648ae 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 eea7239..6c2366b 100644
+index eea7239..915d8a5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -239,6 +239,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -239,6 +239,26 @@ public interface Server extends PluginMessageRecipient {
       */
      public int broadcastMessage(String message);
  
@@ -50,24 +50,28 @@ index eea7239..6c2366b 100644
 +     *
 +     * @param component the component to send
 +     */
-+    public void broadcast(net.md_5.bungee.api.chat.BaseComponent component);
++    public default void broadcast(net.md_5.bungee.api.chat.BaseComponent component) {
++        spigot().broadcast(component);
++    }
 +
 +    /**
 +     * Sends an array of components as a single message to all online players.
 +     *
 +     * @param components the components to send
 +     */
-+    public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components);
++    public default void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
++        spigot().broadcast(components);
++    }
 +    // Paper end
 +
      /**
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bca09f0..3295674 100644
+index ebe727a..5f74d9d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -390,6 +390,30 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -390,6 +390,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void sendMap(MapView map);
  
@@ -77,14 +81,18 @@ index bca09f0..3295674 100644
 +     *
 +     * @param component the components to send
 +     */
-+    public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component);
++    public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
++        spigot().sendMessage(component);
++    }
 +
 +    /**
 +     * Sends an array of components as a single message to the player
 +     *
 +     * @param components the components to send
 +     */
-+    public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components);
++    public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
++        spigot().sendMessage(components);
++    }
 +
 +    /**
 +     * Sends an array of components as a single message to the specified screen position of this player
@@ -92,12 +100,14 @@ index bca09f0..3295674 100644
 +     * @param position the screen position
 +     * @param components the components to send
 +     */
-+    public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components);
++    public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
++        spigot().sendMessage(position, components);
++    }
 +    // Paper end
 +
      /**
       * Forces an update of the player's entire inventory.
       *
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
index 2eee7e7df3..6812579abf 100644
--- a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 20302a2aa7ce4804ef279e8c927a6915b7f59a15 Mon Sep 17 00:00:00 2001
+From fa2d6467d3483f75538099c4ce6cff68bd0a5c93 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
@@ -369,7 +369,7 @@ index 0000000..e1ecd44
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 27e0f07..50b4fb2 100644
+index 5f74d9d..8641bb9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -380,10 +380,10 @@ index 27e0f07..50b4fb2 100644
  import org.bukkit.Achievement;
  import org.bukkit.ChatColor;
  import org.bukkit.Effect;
-@@ -412,6 +413,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
-      * @param components the components to send
-      */
-     public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components);
+@@ -418,6 +419,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+     public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
+         spigot().sendMessage(position, components);
+     }
 +
 +    /**
 +     * Set the text displayed in the player list header and footer for this player
diff --git a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index ff079d685e..90aaa70f96 100644
--- a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@@ -1,4 +1,4 @@
-From b7c4b62a1912e41a56a29d095248312c8a8f2699 Mon Sep 17 00:00:00 2001
+From f48b3a42b4d30b888395ba3c184dcd9cf7cfd55c 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
@@ -40,7 +40,7 @@ index 148756b..4ad0028 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9f67d09..5b7ca6a 100644
+index 8641bb9..0a11a51 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -397,6 +397,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -48,17 +48,17 @@ index 9f67d09..5b7ca6a 100644
       * @param component the components to send
       */
 +    @Override
-     public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component);
- 
-     /**
-@@ -404,6 +405,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+     public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
+         spigot().sendMessage(component);
+     }
+@@ -406,6 +407,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *
       * @param components the components to send
       */
 +    @Override
-     public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components);
- 
-     /**
+     public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
+         spigot().sendMessage(components);
+     }
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
index bea3803265..a1ef708c10 100644
--- a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 699be1d39a7401d680acf2d47ab0defa3c33a536 Mon Sep 17 00:00:00 2001
+From 5865959ee46d30a03b7961c997a06ca7f0d022f8 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1fe4794..bf4c31b 100644
+index 0a11a51..083e60f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1166,7 +1166,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1172,7 +1172,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 1fe4794..bf4c31b 100644
      public void setResourcePack(String url);
  
      /**
-@@ -1509,6 +1511,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1515,6 +1517,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void setViewDistance(int viewDistance);
  
diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
index 324b17ff10..bab5a0fe12 100644
--- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From 72e6b053e69f99ec47de74886e42b95776a23ede Mon Sep 17 00:00:00 2001
+From 51b97e731012cb0fefc1a80e3b8805f38e3751fe 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
@@ -24,10 +24,10 @@ index 87648ae..1e98f39 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6c2366b..33e6080 100644
+index 915d8a5..1b682b5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1011,4 +1011,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1015,4 +1015,6 @@ public interface Server extends PluginMessageRecipient {
      }
  
      Spigot spigot();
@@ -105,5 +105,5 @@ index 1302773..9ce0a5d 100644
 +
  }
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch b/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
index 5f07461e3b..9baedbd130 100644
--- a/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
@@ -1,4 +1,4 @@
-From 578af17993c01766dadb6c7c005fa42d98a4fb7b Mon Sep 17 00:00:00 2001
+From d103b8d2293a1ceeb3ac328711f78cffe566098d Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Wed, 30 Mar 2016 01:19:51 -0500
 Subject: [PATCH] Add getEntity by UUID API
@@ -26,10 +26,10 @@ index 1e98f39..eb6fb2c 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 33e6080..0850009 100644
+index 1b682b5..c2b61f1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1013,4 +1013,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1017,4 +1017,12 @@ public interface Server extends PluginMessageRecipient {
      Spigot spigot();
  
      void reloadPermissions(); // Paper
@@ -43,5 +43,5 @@ index 33e6080..0850009 100644
 +    Entity getEntity(UUID uuid); // Paper
  }
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-API-Patches/0040-Add-EntityZapEvent.patch b/Spigot-API-Patches/0039-Add-EntityZapEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0040-Add-EntityZapEvent.patch
rename to Spigot-API-Patches/0039-Add-EntityZapEvent.patch
index 1c0bf576c5..3346101c7f 100644
--- a/Spigot-API-Patches/0040-Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/0039-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From 7a5e519b5a40b6210703aded7140542fbfbe9a9d Mon Sep 17 00:00:00 2001
+From 37aa6e6fb396fb0b13a380e9bba7993f3c7629b7 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
@@ -119,5 +119,5 @@ index aa80ebf..73844b8 100644
 +    // Paper end
  }
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-API-Patches/0039-Add-debug-logging-to-Timings-enable-setter.patch b/Spigot-API-Patches/0039-Add-debug-logging-to-Timings-enable-setter.patch
deleted file mode 100644
index f75f413ba7..0000000000
--- a/Spigot-API-Patches/0039-Add-debug-logging-to-Timings-enable-setter.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d20b34e3e83e6ed7d517b88c05bc77558641412 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 26 Oct 2016 15:49:28 -0500
-Subject: [PATCH] Add debug logging to Timings enable setter
-
-Potentially temporary, will be merged back into main Timings patch if not.
-`java -Dtimings.throwOnChange=true -jar paperclip.jar`
-
-diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
-index 4e5cf35..bef7cf7 100644
---- a/src/main/java/co/aikar/timings/Timings.java
-+++ b/src/main/java/co/aikar/timings/Timings.java
-@@ -128,6 +128,9 @@ public final class Timings {
-     public static void setTimingsEnabled(boolean enabled) {
-         timingsEnabled = enabled;
-         reset();
-+        if (Boolean.getBoolean("timings.throwOnChange")) {
-+            new RuntimeException("The enable state of timings has been changed to: " + enabled).printStackTrace();
-+        }
-     }
- 
-     /**
--- 
-2.10.2
-
diff --git a/Spigot-API-Patches/0041-Misc-Utils.patch b/Spigot-API-Patches/0040-Misc-Utils.patch
similarity index 94%
rename from Spigot-API-Patches/0041-Misc-Utils.patch
rename to Spigot-API-Patches/0040-Misc-Utils.patch
index 2dae46dda4..04e2dd1b82 100644
--- a/Spigot-API-Patches/0041-Misc-Utils.patch
+++ b/Spigot-API-Patches/0040-Misc-Utils.patch
@@ -1,4 +1,4 @@
-From 6e4c05b271039c42a798abb3db3d414d50b0111f Mon Sep 17 00:00:00 2001
+From e8be384aca64a96173cf48b19340a6a92573bbb1 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
@@ -42,5 +42,5 @@ index 0000000..d60ecbb
 +    }
 +}
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-API-Patches/0042-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0041-Allow-Reloading-of-Command-Aliases.patch
similarity index 95%
rename from Spigot-API-Patches/0042-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-API-Patches/0041-Allow-Reloading-of-Command-Aliases.patch
index b82be64378..42d54298b8 100644
--- a/Spigot-API-Patches/0042-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0041-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 9b519772c330599ddd6a645e9d619ab21ef7d4e0 Mon Sep 17 00:00:00 2001
+From b315acf6f03fd6fd14a9dfbcff844eae1fbf2d19 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
@@ -24,10 +24,10 @@ index eb6fb2c..e16a02c 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0850009..371e62a 100644
+index c2b61f1..09f3e20 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1021,4 +1021,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1025,4 +1025,6 @@ public interface Server extends PluginMessageRecipient {
       * @return The entity that is identified by the given UUID, or null if one isn't found
       */
      Entity getEntity(UUID uuid); // Paper
@@ -91,5 +91,5 @@ index 040509c..585bac7 100644
                  confirmed = true;
              } else {
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-API-Patches/0043-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0042-Add-source-to-PlayerExpChangeEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0043-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-API-Patches/0042-Add-source-to-PlayerExpChangeEvent.patch
index 965bb83a56..2fd8ba52ee 100644
--- a/Spigot-API-Patches/0043-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-API-Patches/0042-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From f57d12d51fc55db4fe7c81778e0390d69f62087c Mon Sep 17 00:00:00 2001
+From ad3832340e806dd7772de4ec8ae594767d2ad294 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
@@ -53,5 +53,5 @@ index f37491d..3088255 100644
       *
       * @return The amount of experience
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-API-Patches/0044-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0043-Add-ProjectileCollideEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0044-Add-ProjectileCollideEvent.patch
rename to Spigot-API-Patches/0043-Add-ProjectileCollideEvent.patch
index 14dd889412..209a7dd1fd 100644
--- a/Spigot-API-Patches/0044-Add-ProjectileCollideEvent.patch
+++ b/Spigot-API-Patches/0043-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 40cc96eda623cddf95322ad4ca1d0ae665625ba1 Mon Sep 17 00:00:00 2001
+From 5d1ab8bdc2d9069a20154ef1be9eb8fe3080cc68 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/0045-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0044-Add-String-based-Action-Bar-API.patch
similarity index 90%
rename from Spigot-API-Patches/0045-Add-String-based-Action-Bar-API.patch
rename to Spigot-API-Patches/0044-Add-String-based-Action-Bar-API.patch
index f7d7cbda20..298e3cd386 100644
--- a/Spigot-API-Patches/0045-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0044-Add-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 7b2810ce185f4805e505de6701cafb5ef86a5687 Mon Sep 17 00:00:00 2001
+From 096901560b7ced2820b8f131d8633ccfab953a57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bf4c31ba..5c38b3f3 100644
+index 083e60f..4d577a5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -392,6 +392,12 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -22,5 +22,5 @@ index bf4c31ba..5c38b3f3 100644
       * Sends the component to the player
       *
 -- 
-2.11.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 06763ec3bc..a37df60762 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 0e7f1c733e810fc4e95da50c1c21214b500ca44e Mon Sep 17 00:00:00 2001
+From 5369c4021cb5d9ddea75547f5357b4c6ed5e0885 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index c5fd4d0..2fa1925 100644
+index 2b0fc8f..4fe3d8c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -17,7 +17,7 @@ index c5fd4d0..2fa1925 100644
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.11-R0.1-SNAPSHOT</version>
+     <version>1.11.1-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>Paper</name>
@@ -194,5 +194,5 @@ index 9304637..674096c 100644
  
          if (stream != null) {
 -- 
-2.10.2
+2.9.3
 
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index d2b326df1e..67f0c7cf49 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -1,11 +1,11 @@
-From 061f2ed91f27177f156e65fc6762787aeb9616ff Mon Sep 17 00:00:00 2001
+From 41b25e73b7480b5af82b385e10674d7f21ebbaa3 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4542987..b651edc 100644
+index b0aba60..81fc04e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -675,6 +675,7 @@ public class Chunk {
@@ -222,19 +222,19 @@ index 0000000..fe7b476
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 154a2d5..b6a20c5 100644
+index 90d18f4..2a2f53c 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
-@@ -13,7 +13,7 @@ import javax.annotation.Nullable;
- 
+@@ -19,7 +19,7 @@ import org.apache.logging.log4j.Logger;
  public class NBTTagCompound extends NBTBase {
  
+     private static final Logger b = LogManager.getLogger();
 -    private final Map<String, NBTBase> map = Maps.newHashMap();
 +    public final Map<String, NBTBase> map = Maps.newHashMap(); // Paper
  
      public NBTTagCompound() {}
  
-@@ -85,11 +85,13 @@ public class NBTTagCompound extends NBTBase {
+@@ -91,11 +91,13 @@ public class NBTTagCompound extends NBTBase {
          this.map.put(s, new NBTTagLong(i));
      }
  
@@ -249,7 +249,7 @@ index 154a2d5..b6a20c5 100644
      public UUID a(String s) {
          return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index 13b93a4..ffe2353 100644
+index 370203b..ae7498c 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger;
@@ -262,5 +262,5 @@ index 13b93a4..ffe2353 100644
  
      public NBTTagList() {}
 -- 
-2.9.2.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index a4f1641fc7..21aa6fbafd 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,11 +1,11 @@
-From db1d411569fb974810f998de3b9cbe7ab4751961 Mon Sep 17 00:00:00 2001
+From b886700e69bed39ac24603f4797371680ba0ffab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
 diff --git a/pom.xml b/pom.xml
-index 2fa1925..911c0a9 100644
+index 4fe3d8c..d717dd8 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
@@ -425,7 +425,7 @@ index 3d0a005..f509bed 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 9d14403..da86874 100644
+index e8511ac..d3f1a4a 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -35,6 +35,15 @@ public class Block {
@@ -515,7 +515,7 @@ index b39937f..17d39bb 100644
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 15969b1..ca33899 100644
+index 69387ea..66d0022 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -555,7 +555,7 @@ index 15969b1..ca33899 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index f01bd35..51d6b3e 100644
+index c6a8345..363415f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -23,7 +23,7 @@ import java.io.PrintStream;
@@ -586,10 +586,10 @@ index f01bd35..51d6b3e 100644
  
      public boolean aa() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e148e37..e0276a6 100644
+index e89dd7b..f86fe82 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
+@@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
  import org.bukkit.entity.Hanging;
  import org.bukkit.entity.LivingEntity;
  import org.bukkit.entity.Vehicle;
@@ -599,7 +599,7 @@ index e148e37..e0276a6 100644
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
-@@ -142,7 +143,7 @@ public abstract class Entity implements ICommandListener {
+@@ -145,7 +146,7 @@ public abstract class Entity implements ICommandListener {
      public boolean valid; // CraftBukkit
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
      public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
@@ -608,7 +608,7 @@ index e148e37..e0276a6 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -471,7 +472,6 @@ public abstract class Entity implements ICommandListener {
+@@ -475,7 +476,6 @@ public abstract class Entity implements ICommandListener {
      }
  
      public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
@@ -616,7 +616,7 @@ index e148e37..e0276a6 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().d(d0, d1, d2));
              this.recalcPosition();
-@@ -820,7 +820,6 @@ public abstract class Entity implements ICommandListener {
+@@ -869,7 +869,6 @@ public abstract class Entity implements ICommandListener {
  
              this.world.methodProfiler.b();
          }
@@ -625,7 +625,7 @@ index e148e37..e0276a6 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 95b59ba..b328b25 100644
+index 9a3c573..9c0b889 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -727,7 +727,7 @@ index 347a2b6..aceb08c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0b790ab..81a69e8 100644
+index 4d3f403..f2b13b3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -47,7 +47,7 @@ import org.bukkit.Bukkit;
@@ -969,7 +969,7 @@ index a5a096b..c546139 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b583e9a..bc3af9b 100644
+index ec5d6ea..3330513 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -980,7 +980,7 @@ index b583e9a..bc3af9b 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1318,7 +1319,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1325,7 +1326,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -989,7 +989,7 @@ index b583e9a..bc3af9b 100644
         // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1329,22 +1330,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1336,22 +1337,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1017,7 +1017,7 @@ index b583e9a..bc3af9b 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5359e8c..04d6355 100644
+index 7be0135..9f52995 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1027,7 +1027,7 @@ index 5359e8c..04d6355 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1179,10 +1180,11 @@ public abstract class PlayerList {
+@@ -1172,10 +1173,11 @@ public abstract class PlayerList {
      }
  
      public void savePlayers() {
@@ -1083,7 +1083,7 @@ index f1f2065..fb350c4 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 8d54eb3..0f505ed 100644
+index 6958a2e..b3d3df4 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1103,7 +1103,7 @@ index 8d54eb3..0f505ed 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6ba7bbb..c058aa4 100644
+index dcd6fc1..f694bf5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -1137,7 +1137,7 @@ index 6ba7bbb..c058aa4 100644
                  this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
-@@ -1403,6 +1403,7 @@ public abstract class World implements IBlockAccess {
+@@ -1382,6 +1382,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.c("remove");
@@ -1145,7 +1145,7 @@ index 6ba7bbb..c058aa4 100644
          this.entityList.removeAll(this.f);
  
          int j;
-@@ -1423,6 +1424,7 @@ public abstract class World implements IBlockAccess {
+@@ -1402,6 +1403,7 @@ public abstract class World implements IBlockAccess {
  
          this.f.clear();
          this.l();
@@ -1153,7 +1153,7 @@ index 6ba7bbb..c058aa4 100644
          this.methodProfiler.c("regular");
  
          CrashReportSystemDetails crashreportsystemdetails1;
-@@ -1432,6 +1434,7 @@ public abstract class World implements IBlockAccess {
+@@ -1411,6 +1413,7 @@ public abstract class World implements IBlockAccess {
          timings.entityTick.startTiming(); // Spigot
          guardEntityList = true; // Spigot
          // CraftBukkit start - Use field for loop variable
@@ -1161,21 +1161,24 @@ index 6ba7bbb..c058aa4 100644
          int entitiesThisCycle = 0;
          if (tickPosition < 0) tickPosition = 0;
          for (entityLimiter.initTick();
-@@ -1453,10 +1456,11 @@ public abstract class World implements IBlockAccess {
+@@ -1432,10 +1435,14 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead && !(entity instanceof EntityPlayer)) {
                  try {
 -                    SpigotTimings.tickEntityTimer.startTiming(); // Spigot
 +                    entity.tickTimer.startTiming(); // Paper
-                     this.g(entity);
+                     this.h(entity);
 -                    SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
++                    entity.tickTimer.stopTiming(); // Paper
++                    entity.tickTimer.startTiming(); // Paper
++                    this.g(entity);
 +                    entity.tickTimer.stopTiming(); // Paper
                  } catch (Throwable throwable1) {
 +                    entity.tickTimer.stopTiming();
                      crashreport1 = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
                      entity.appendEntityCrashDetails(crashreportsystemdetails1);
-@@ -1589,6 +1593,7 @@ public abstract class World implements IBlockAccess {
+@@ -1568,6 +1575,7 @@ public abstract class World implements IBlockAccess {
          }
  
          timings.tileEntityPending.stopTiming(); // Spigot
@@ -1183,7 +1186,7 @@ index 6ba7bbb..c058aa4 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1641,7 +1646,6 @@ public abstract class World implements IBlockAccess {
+@@ -1620,7 +1628,6 @@ public abstract class World implements IBlockAccess {
              entity.ticksLived++;
              entity.inactiveTick();
          } else {
@@ -1191,7 +1194,7 @@ index 6ba7bbb..c058aa4 100644
              // CraftBukkit end
              entity.M = entity.locX;
              entity.N = entity.locY;
-@@ -1650,6 +1654,7 @@ public abstract class World implements IBlockAccess {
+@@ -1629,6 +1636,7 @@ public abstract class World implements IBlockAccess {
              entity.lastPitch = entity.pitch;
              if (flag && entity.aa) {
                  ++entity.ticksLived;
@@ -1199,7 +1202,7 @@ index 6ba7bbb..c058aa4 100644
                  if (entity.isPassenger()) {
                      entity.aw();
                  } else {
-@@ -1708,8 +1713,6 @@ public abstract class World implements IBlockAccess {
+@@ -1687,8 +1695,6 @@ public abstract class World implements IBlockAccess {
                      }
                  }
              }
@@ -1209,7 +1212,7 @@ index 6ba7bbb..c058aa4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f369b49..2817191 100644
+index 4713150..26627ce 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
index cf5b09f305..d4396e4f7f 100644
--- a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
+++ b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
@@ -1,4 +1,4 @@
-From 468154ec473f5c5111620f0c68e1f3ea8076128b Mon Sep 17 00:00:00 2001
+From d2e9e489fbf88f2b4b32be8b0c9125d5590409aa Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:14:11 -0600
 Subject: [PATCH] Configurable fishing time ranges
@@ -22,16 +22,16 @@ index ae3d0e4..7b2b95d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 0eb6207..96c3d66 100644
+index 472f367..0c528c6 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
-@@ -371,7 +371,7 @@ public class EntityFishingHook extends Entity {
+@@ -381,7 +381,7 @@ public class EntityFishingHook extends Entity {
                      this.at = MathHelper.nextInt(this.random, 20, 80);
                  }
              } else {
 -                this.h = MathHelper.nextInt(this.random, 100, 600);
-+                this.h = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper - Configurable fishing time range
-                 this.h -= EnchantmentManager.g(this.owner) * 20 * 5;
++                this.h = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper
+                 this.h -= this.ax * 20 * 5;
              }
          }
 -- 
diff --git a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
index 797000728e..4ff8131bf2 100644
--- a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
@@ -1,11 +1,11 @@
-From ee86791d8752389218a188dd920ff3eb860dd9f2 Mon Sep 17 00:00:00 2001
+From 066cd36ae439a3797d875ea96e09264bfdff58cd Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index a281c8d..f0a673f 100644
+index 82146de..f1823af 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index a281c8d..f0a673f 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 3f7eae1..a8f3645 100644
+index d3cf840..b6ecd02 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -617,7 +617,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -30,7 +30,7 @@ index 3f7eae1..a8f3645 100644
                  double d1 = entityhuman.locY - this.locY;
                  double d2 = entityhuman.locZ - this.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index fce2498..e2423c2 100644
+index 5af51cc..7531c9b 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -44,7 +44,7 @@ index fce2498..e2423c2 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index bec25e4..30aacc9 100644
+index 17bf3e4..a05fad5 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -52,7 +52,7 @@ public final class SpawnerCreature {
@@ -57,10 +57,10 @@ index bec25e4..30aacc9 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5e09117..11fbe27 100644
+index 36c2dfb..1a6803a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2743,7 +2743,7 @@ public abstract class World implements IBlockAccess {
+@@ -2725,7 +2725,7 @@ public abstract class World implements IBlockAccess {
          for (int i = 0; i < this.players.size(); ++i) {
              EntityHuman entityhuman = (EntityHuman) this.players.get(i);
  
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index cd5c9134b6..a908ab35aa 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From 11ba8a856ee1d222a3012b43949ac3e3d15a39f0 Mon Sep 17 00:00:00 2001
+From aab99807faf78b09a62df2570b2b70ea5551b67c Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e0276a6..6766166 100644
+index f86fe82..537adb5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -144,6 +144,7 @@ public abstract class Entity implements ICommandListener {
+@@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener {
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
      public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
      public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
@@ -16,7 +16,7 @@ index e0276a6..6766166 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1416,6 +1417,11 @@ public abstract class Entity implements ICommandListener {
+@@ -1469,6 +1470,11 @@ public abstract class Entity implements ICommandListener {
                  }
              }
  
@@ -28,7 +28,7 @@ index e0276a6..6766166 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1560,6 +1566,13 @@ public abstract class Entity implements ICommandListener {
+@@ -1613,6 +1619,13 @@ public abstract class Entity implements ICommandListener {
              }
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index e0276a6..6766166 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1584,6 +1597,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1637,6 +1650,7 @@ public abstract class Entity implements ICommandListener {
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -51,7 +51,7 @@ index e0276a6..6766166 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 2ed1fb1..042670b 100644
+index 4c168d3..307a44c 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -247,6 +247,14 @@ public class EntityFallingBlock extends Entity {
@@ -89,7 +89,7 @@ index fd07356..25e471d 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c8ba375..e73c9fb 100644
+index 1a6803a..629ea2e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
index f874653bf7..4277192ecc 100644
--- a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,11 +1,11 @@
-From 4b8c160adcef0468b38af857709f1a50f7a916ec Mon Sep 17 00:00:00 2001
+From 0861215886567d4dff9f6d534845572d9a0a1de6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 0f505ed..1f3e89b 100644
+index b3d3df4..d0c0371 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -175,7 +175,12 @@ public abstract class TileEntity {
@@ -23,10 +23,10 @@ index 0f505ed..1f3e89b 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0d917b6..536da4d 100644
+index 629ea2e..40b8bf3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1468,10 +1468,12 @@ public abstract class World implements IBlockAccess {
+@@ -1450,10 +1450,12 @@ public abstract class World implements IBlockAccess {
                      entity.tickTimer.stopTiming(); // Paper
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
@@ -43,7 +43,7 @@ index 0d917b6..536da4d 100644
                  }
              }
  
-@@ -1534,10 +1536,13 @@ public abstract class World implements IBlockAccess {
+@@ -1516,10 +1518,13 @@ public abstract class World implements IBlockAccess {
                          ((ITickable) tileentity).F_();
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
index 25119eb829..ec18bb16cc 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From 5b6b3194d535a25d2f22da2bef56abe47f10bcca Mon Sep 17 00:00:00 2001
+From 66a919e1275e53a9d28c58b412e473ab6e9baa78 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -20,10 +20,10 @@ index 06d1527..2767ffb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6766166..40398ca 100644
+index 537adb5..7f6d492 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -390,9 +390,15 @@ public abstract class Entity implements ICommandListener {
+@@ -394,9 +394,15 @@ public abstract class Entity implements ICommandListener {
              this.fallDistance *= 0.5F;
          }
  
@@ -39,7 +39,7 @@ index 6766166..40398ca 100644
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -402,6 +408,18 @@ public abstract class Entity implements ICommandListener {
+@@ -406,6 +412,18 @@ public abstract class Entity implements ICommandListener {
          this.world.methodProfiler.b();
      }
  
@@ -58,7 +58,7 @@ index 6766166..40398ca 100644
      protected void H() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -458,6 +476,7 @@ public abstract class Entity implements ICommandListener {
+@@ -462,6 +480,7 @@ public abstract class Entity implements ICommandListener {
          this.fireTicks = 0;
      }
  
diff --git a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
index 8d95de7d4a..8789c88fc8 100644
--- a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,14 +1,14 @@
-From 026b5acef75a274fa06375125444e828c071d629 Mon Sep 17 00:00:00 2001
+From 383074be770112c2b2dc2e9810fa50658b8c3e33 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index b6cb918..7c4c599 100644
+index caec568..30b54a5 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-@@ -166,7 +166,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
+@@ -167,7 +167,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
              File file = new File(this.playerDir, entityhuman.bf() + ".dat");
              // Spigot Start
              boolean usingWrongFile = false;
diff --git a/Spigot-Server-Patches/0029-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
index bb81fad832..e1497bc0ff 100644
--- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From c0b4ee8d6319a0fa582a082b881713ff96d27b2b Mon Sep 17 00:00:00 2001
+From ebb94ef7bf1505f81ec9c72e84b1b56ceb7970d6 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -20,10 +20,10 @@ index f7a0c18..31503e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5b88b7a..ca9e94a 100644
+index 12e4d95..dc02472 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -495,6 +495,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -512,6 +512,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return this.world.pvpMode;
      }
  
@@ -39,7 +39,7 @@ index 5b88b7a..ca9e94a 100644
      @Nullable
      public Entity c(int i) {
          // this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
-@@ -503,7 +512,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -520,7 +529,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.world.kill(this);
              if (!this.viewingCredits) {
                  this.viewingCredits = true;
diff --git a/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
index e927756bea..056c4acfb3 100644
--- a/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
@@ -1,4 +1,4 @@
-From 06a5cb408921635efb8416880126f0bc0c7e1233 Mon Sep 17 00:00:00 2001
+From ffe94e57efe10e54ab3dde6ffff89854ffb3cc46 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
@@ -19,10 +19,10 @@ index a6afdd3..57480f5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 5b41955..e523267 100644
+index 796b3e5..ce1db63 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-@@ -20,6 +20,7 @@ public abstract class MobSpawnerAbstract {
+@@ -19,6 +19,7 @@ public abstract class MobSpawnerAbstract {
      private int maxNearbyEntities = 6;
      private int requiredPlayerRange = 16;
      private int spawnRange = 4;
@@ -30,7 +30,7 @@ index 5b41955..e523267 100644
  
      public MobSpawnerAbstract() {}
  
-@@ -45,6 +46,10 @@ public abstract class MobSpawnerAbstract {
+@@ -43,6 +44,10 @@ public abstract class MobSpawnerAbstract {
      }
  
      public void c() {
@@ -41,7 +41,7 @@ index 5b41955..e523267 100644
          if (!this.h()) {
              this.e = this.d;
          } else {
-@@ -58,18 +63,18 @@ public abstract class MobSpawnerAbstract {
+@@ -56,18 +61,18 @@ public abstract class MobSpawnerAbstract {
                  this.a().addParticle(EnumParticle.SMOKE_NORMAL, d0, d1, d2, 0.0D, 0.0D, 0.0D, new int[0]);
                  this.a().addParticle(EnumParticle.FLAME, d0, d1, d2, 0.0D, 0.0D, 0.0D, new int[0]);
                  if (this.spawnDelay > 0) {
diff --git a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
index a8101d7dc3..9475f02a49 100644
--- a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From a0d114ddff46e2250c3550301b1aa355ef9366c9 Mon Sep 17 00:00:00 2001
+From 05da6da19a804f28d5a78f078ce02f86366013f9 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -19,7 +19,7 @@ index 57480f5..b2b94b8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1982749..9662ea0 100644
+index 80e7105..2c8a21e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -30,7 +30,7 @@ index 1982749..9662ea0 100644
  
      // CraftBukkit start
      public String displayName;
-@@ -210,7 +211,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -227,7 +228,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              --this.noDamageTicks;
          }
  
diff --git a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
index 28be9b2e93..75e0c7d682 100644
--- a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
@@ -1,14 +1,14 @@
-From e74bafb4d5cfe50bad8aeb59969cc28eaa9c8e35 Mon Sep 17 00:00:00 2001
+From 171cc5dd20887c2d3ebc13f3a7e08e8d42969911 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cf2bbba..82024a1 100644
+index 23aad3f..bfe0ee2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1445,10 +1445,10 @@ public abstract class World implements IBlockAccess {
+@@ -1424,10 +1424,10 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - Use field for loop variable
          co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
          int entitiesThisCycle = 0;
@@ -23,7 +23,7 @@ index cf2bbba..82024a1 100644
              tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
              entity = (Entity) this.entityList.get(this.tickPosition);
              // CraftBukkit end
-@@ -1514,9 +1514,7 @@ public abstract class World implements IBlockAccess {
+@@ -1496,9 +1496,7 @@ public abstract class World implements IBlockAccess {
          // Spigot start
          // Iterator iterator = this.tileEntityListTick.iterator();
          int tilesThisCycle = 0;
diff --git a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
index 83a2225e9b..b746854e72 100644
--- a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From b6c5618486f53dfafb58fd8b0699a2ebe145013c Mon Sep 17 00:00:00 2001
+From 16ce00684b1104998dcda574660c2ff0954f2de7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bc3af9b..878a79e 100644
+index 3330513..4d8c88a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1251,6 +1251,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1258,6 +1258,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
diff --git a/Spigot-Server-Patches/0056-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0056-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
deleted file mode 100644
index 1a7386dfc6..0000000000
--- a/Spigot-Server-Patches/0056-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d932ae0cc0bfac3a416351d0d9f847d7da9a2c82 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Thu, 3 Mar 2016 02:21:58 -0600
-Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b7a825a..b59b756 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1314,6 +1314,18 @@ public final class CraftServer implements Server {
-         return count;
-     }
- 
-+    // Paper start
-+    @Override
-+    public void broadcast(BaseComponent component) {
-+        this.spigot.broadcast(component);
-+    }
-+
-+    @Override
-+    public void broadcast(BaseComponent... components) {
-+        this.spigot.broadcast(components);
-+    }
-+    // Paper end
-+
-     @Override
-     @Deprecated
-     public OfflinePlayer getOfflinePlayer(String name) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 318b460..2108001 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         }
-     }
- 
-+    // Paper start
-+    @Override
-+    public void sendMessage(BaseComponent component) {
-+        this.spigot.sendMessage(component);
-+    }
-+
-+    @Override
-+    public void sendMessage(BaseComponent... components) {
-+        this.spigot.sendMessage(components);
-+    }
-+
-+    @Override
-+    public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent... components) {
-+        this.spigot.sendMessage(position, components);
-+    }
-+    // Paper end
-+
-     @Override
-     public String getDisplayName() {
-         return getHandle().displayName;
--- 
-2.9.3
-
diff --git a/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
similarity index 95%
rename from Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
index 1e2c7a04b1..f6f17eb50e 100644
--- a/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 7a2dcb0a133f45c7b66c88d85e5a048ea1306012 Mon Sep 17 00:00:00 2001
+From acfd952de5edfc46ee5f7933a12ec1dde9ff5def Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -78,7 +78,7 @@ index 7bcafa8..4f6c1c2 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2108001..7a4ceb3 100644
+index 318b460..b597ae2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -88,11 +88,11 @@ index 2108001..7a4ceb3 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.mojang.authlib.GameProfile;
-@@ -171,6 +172,83 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent... components) {
-         this.spigot.sendMessage(position, components);
+@@ -156,6 +157,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         }
      }
-+
+ 
++    // Paper start
 +    @Override
 +    public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
 +        PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
@@ -169,9 +169,11 @@ index 2108001..7a4ceb3 100644
 +    public void hideTitle() {
 +        getHandle().playerConnection.sendPacket(new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.CLEAR, (BaseComponent[]) null, 0, 0, 0));
 +    }
-     // Paper end
- 
++    // Paper end
++
      @Override
+     public String getDisplayName() {
+         return getHandle().displayName;
 -- 
 2.9.3
 
diff --git a/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
similarity index 93%
rename from Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
index c09b5e5d1b..9a1385201e 100644
--- a/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
@@ -1,4 +1,4 @@
-From 0cd5324300e158b0bde0ea0c1884835194f9bf85 Mon Sep 17 00:00:00 2001
+From d49248d0e6675ce7fc2b0d5b5a042e5dbf009366 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
diff --git a/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
similarity index 93%
rename from Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
index 7aaf72a158..00bb75cf1d 100644
--- a/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,14 +1,14 @@
-From 43bbb17f6b8f99158dace12ff84e61361b1fa421 Mon Sep 17 00:00:00 2001
+From 49586e9ce2c202a9c911d922c357b5914814c1eb Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 40398ca..10eb818 100644
+index 7f6d492..1b37b60 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -120,10 +120,10 @@ public abstract class Entity implements ICommandListener {
+@@ -121,10 +121,10 @@ public abstract class Entity implements ICommandListener {
      private static final DataWatcherObject<Boolean> aB = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
      private static final DataWatcherObject<Boolean> aC = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
      private static final DataWatcherObject<Boolean> aD = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
@@ -24,7 +24,7 @@ index 40398ca..10eb818 100644
      public boolean impulse;
      public int portalCooldown;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 82024a1..0e462ce 100644
+index bfe0ee2..ad8c031 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -53,7 +53,7 @@ index 82024a1..0e462ce 100644
      public final List<EntityHuman> players = Lists.newArrayList();
      public final List<Entity> j = Lists.newArrayList();
      protected final IntHashMap<Entity> entitiesById = new IntHashMap();
-@@ -1416,20 +1421,20 @@ public abstract class World implements IBlockAccess {
+@@ -1395,20 +1400,20 @@ public abstract class World implements IBlockAccess {
          this.entityList.removeAll(this.f);
  
          int j;
diff --git a/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
similarity index 97%
rename from Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
index 509921fa52..fce1e76c12 100644
--- a/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From c0c4191f67899e3143f6d575291a7a5e9db41293 Mon Sep 17 00:00:00 2001
+From c93f33417194cd9bcda84b504302b6fd80bb6134 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
diff --git a/Spigot-Server-Patches/0061-Add-velocity-warnings.patch b/Spigot-Server-Patches/0060-Add-velocity-warnings.patch
similarity index 95%
rename from Spigot-Server-Patches/0061-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0060-Add-velocity-warnings.patch
index 73ed9e32cd..4a47d969fb 100644
--- a/Spigot-Server-Patches/0061-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0060-Add-velocity-warnings.patch
@@ -1,4 +1,4 @@
-From 1eb36b44685655bc53589dcc93ac704000d8f3fa Mon Sep 17 00:00:00 2001
+From 3ae58c1044d54f764d2b82a402281b50f74d5be4 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
diff --git a/Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
similarity index 93%
rename from Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch
rename to Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
index d33ea6c32a..b0ad7d0dbb 100644
--- a/Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From 7e1a809697044e335aa5821b9b74887ff00c93de Mon Sep 17 00:00:00 2001
+From 1e37ab83bd78027f61a60f51dd2dc6207ffc0ca7 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -25,10 +25,10 @@ index ed63854..7005d69 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7a4ceb3..e7b04c2 100644
+index b597ae2..44d2698 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -592,7 +592,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -577,7 +577,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {
diff --git a/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
similarity index 98%
rename from Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
index cd94b05e09..f54077dff9 100644
--- a/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 419ba5a439fd82674ae83f25b6b3eecb462bb44e Mon Sep 17 00:00:00 2001
+From 2d7c77d02cb0f23577e767cc4d0d04b7634d08f0 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -244,7 +244,7 @@ index 933934f..19fbf9b 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 30aacc9..31bafc6 100644
+index a05fad5..29219ec 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -7,6 +7,7 @@ import java.util.Random;
@@ -292,7 +292,7 @@ index 7af5b7d..2b49802 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0e462ce..4cce4bf 100644
+index ad8c031..ceb0d71 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -303,7 +303,7 @@ index 0e462ce..4cce4bf 100644
  import com.google.common.base.Function;
  import com.google.common.base.Objects;
  import com.google.common.base.Predicate;
-@@ -1476,8 +1478,10 @@ public abstract class World implements IBlockAccess {
+@@ -1458,8 +1460,10 @@ public abstract class World implements IBlockAccess {
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
                      // Paper start - Prevent tile entity and entity crashes
@@ -315,7 +315,7 @@ index 0e462ce..4cce4bf 100644
                      entity.dead = true;
                      continue;
                      // Paper end
-@@ -1542,8 +1546,10 @@ public abstract class World implements IBlockAccess {
+@@ -1524,8 +1528,10 @@ public abstract class World implements IBlockAccess {
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
                          // Paper start - Prevent tile entity and entity crashes
diff --git a/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 95%
rename from Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 8603bd0838..6782f8cea8 100644
--- a/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From cce8316893f358e8804df5975fff98d9a57af614 Mon Sep 17 00:00:00 2001
+From 1cff86b001e1cbea670acc16a55ce94ef54334cf Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
diff --git a/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 93%
rename from Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
index d7c140c2ec..a424871c01 100644
--- a/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 6f05d80095233fccb6de27c6b01d1922759a6a3b Mon Sep 17 00:00:00 2001
+From e8122a81295e843f89f0360bf8362bec86163d8f 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
@@ -37,10 +37,10 @@ index 7af5d0a..ab9aa13 100644
  
                          if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 10eb818..875dcc8 100644
+index 1b37b60..453efd4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1950,6 +1950,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2003,6 +2003,7 @@ public abstract class Entity implements ICommandListener {
  
      @Nullable
      public ScoreboardTeamBase aQ() {
diff --git a/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 94%
rename from Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index e8cb54e578..7fff157b2c 100644
--- a/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,11 +1,11 @@
-From 81be8d010592ebcb1bf34ccb0168c779ce81c430 Mon Sep 17 00:00:00 2001
+From d4b532c8addb75217b3f2a8461df8dda9bb2f75c Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fe6fe3f..fbc20ba 100644
+index 885c108..42347e7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1379,10 +1379,12 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0067-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
index 9fed1a478b..d6d023a16f 100644
--- a/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 3a3b561fa65a9f3968be6fbf9e6a810da8930a8e Mon Sep 17 00:00:00 2001
+From b3c68d4badf919471ce40ff937ec2d383419c167 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 878a79e..687a8e6 100644
+index 4d8c88a..b42c0be 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1012,7 +1012,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1019,7 +1019,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
@@ -24,7 +24,7 @@ index 878a79e..687a8e6 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e7b04c2..9ef6ba2 100644
+index 44d2698..7a6609f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -38,7 +38,7 @@ index e7b04c2..9ef6ba2 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1574,6 +1578,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1559,6 +1563,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
      }
  
diff --git a/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
index cfef51e682..f623f2bd30 100644
--- a/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From 4b8f5ca789ee647a2dba593df65f22b8a76f411c Mon Sep 17 00:00:00 2001
+From b0e1a3ebf7a3ad709836a5edf63d391efc7f2d69 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -41,7 +41,7 @@ index 259e3b7..c1a8243 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 8828275..996e57f 100644
+index 9468c5e..b189ee4 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -12,14 +12,17 @@ import java.util.Map;
diff --git a/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
similarity index 96%
rename from Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
index 3709f77dba..476b1cf32b 100644
--- a/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 716634213d675f576b1e196476bcf4380267b36c Mon Sep 17 00:00:00 2001
+From 16847be93e8fcf69a05f8edf10ca923825a126ca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 996e57f..e2dd95b 100644
+index b189ee4..192705f 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -182,11 +182,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
similarity index 96%
rename from Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
index 22fc91eaf1..6f53846c95 100644
--- a/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From 62a1748fca01d80144e90defa25e5d9ff6fadc36 Mon Sep 17 00:00:00 2001
+From 00becfbfae18231f783587088d82d3f2d67a1965 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,7 +30,7 @@ index c1a8243..88b6778 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b59b756..7d2d9e2 100644
+index b7a825a..9913421 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -316,6 +316,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
similarity index 88%
rename from Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
index 98614b226a..f936ad3150 100644
--- a/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From ea764e7810887eefc6a4c52d4977bfd81adad442 Mon Sep 17 00:00:00 2001
+From 848e2dd10bcb00e9f5f874c93042fd96dfa693d7 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7d2d9e2..0693d12 100644
+index 9913421..f246426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1826,4 +1826,21 @@ public final class CraftServer implements Server {
+@@ -1814,4 +1814,21 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
diff --git a/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
similarity index 91%
rename from Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
index 6d7f878221..e50bdc29a0 100644
--- a/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From b6bf708e91cda0ce2d7cb923e75fc94dacdbdb2d Mon Sep 17 00:00:00 2001
+From 9ae1a095102acfba7a8241abd2d007d854d6cbe4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0693d12..f154248 100644
+index f246426..4fdb3cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -739,6 +739,14 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0073-Undead-horse-leashing.patch b/Spigot-Server-Patches/0072-Undead-horse-leashing.patch
similarity index 96%
rename from Spigot-Server-Patches/0073-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0072-Undead-horse-leashing.patch
index 99d5b27885..4f11fb965c 100644
--- a/Spigot-Server-Patches/0073-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0072-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 48c89f37527f39d4bc234b16769b8f482a35fbe5 Mon Sep 17 00:00:00 2001
+From 1e899a5dc8e3b0a2a2890efe028aa4e3446d721d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
diff --git a/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
similarity index 94%
rename from Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
index 4288315c0e..f21ab15241 100644
--- a/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From 07a7621aa33ff2427947824eb0dcafdc3fc77537 Mon Sep 17 00:00:00 2001
+From 4cf784e306e83da0b91985266d4e416dc3209a07 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug
diff --git a/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
similarity index 99%
rename from Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
index 00e7b50d96..606722b2b4 100644
--- a/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From f5f66d0d6388d120fe4e026e36ab0ebe9d02ece0 Mon Sep 17 00:00:00 2001
+From c97c3843fcad885235aa9f1f8f8ce5e010103cb6 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
diff --git a/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index fd167c7833..ce7d2f06bf 100644
--- a/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 875d996f5eb2cd385f95f957e18f97a3ac5f68f0 Mon Sep 17 00:00:00 2001
+From 00cc28aaa400c28ac06cbaecf0220a12b25fa3ed Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -24,7 +24,7 @@ index 029eb39..9cce672 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index f2317e5..4b01cc0 100644
+index 65689f2..8cda475 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0077-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
index b154d02683..78e1b02d0e 100644
--- a/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From 948d3ade5648c450c629839997c0982280f8d8e5 Mon Sep 17 00:00:00 2001
+From cc7e1be187d727327679ca18327de968873e14cf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ad6ad75..7d3770d 100644
+index ceb0d71..e0e563c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
similarity index 98%
rename from Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
index ca98ea96aa..44f1924cec 100644
--- a/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From 94e2ca15762051fb10c5b1fd3c20d0010320a799 Mon Sep 17 00:00:00 2001
+From 2c91ef56fe5b0b2247685411e0c557e7c9166f16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -91,7 +91,7 @@ index c74b628..bb96e16 100644
  
              if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index b5c5437..a281957 100644
+index 3ee5213..59d8bb6 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -118,17 +118,17 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
diff --git a/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
similarity index 95%
rename from Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
index 338eaa76be..4e8996ae6e 100644
--- a/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From bea3556fa7b29fdf1627b7acd61e4f5f48ea2c59 Mon Sep 17 00:00:00 2001
+From 6b5bbe53cb6015924619ad76fb68c59ac1d3a14d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
diff --git a/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
similarity index 93%
rename from Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
index 06bcfa3bd7..516677f817 100644
--- a/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
@@ -1,11 +1,11 @@
-From 45328410f1076259957edf11907b79c1c284db35 Mon Sep 17 00:00:00 2001
+From 3360292df03b152c1c4f6d3088c87e3122b70732 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fbc20ba..539d016 100644
+index 42347e7..0f2f250 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2340,7 +2340,20 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0081-Set-health-before-death-event.patch b/Spigot-Server-Patches/0080-Set-health-before-death-event.patch
similarity index 96%
rename from Spigot-Server-Patches/0081-Set-health-before-death-event.patch
rename to Spigot-Server-Patches/0080-Set-health-before-death-event.patch
index b6bacb9892..03137d5ab5 100644
--- a/Spigot-Server-Patches/0081-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0080-Set-health-before-death-event.patch
@@ -1,4 +1,4 @@
-From 9ef19d23fd92041aa9c5da721b7253f09c5e64e3 Mon Sep 17 00:00:00 2001
+From 7616559613d65192dcd5fc9ab8b685a37c8960ca Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
diff --git a/Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 92%
rename from Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 2cd9102b52..01a54f7ed1 100644
--- a/Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,11 +1,11 @@
-From 04b8471c6a6152c2658e668e0431e5e76bc212d9 Mon Sep 17 00:00:00 2001
+From e8411f0e9e51027d876e84d3d0a810ff187f89b3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 539d016..1eee8a3 100644
+index 0f2f250..7e0d509 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -481,7 +481,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,10 +44,10 @@ index 539d016..1eee8a3 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9ef6ba2..eba73cf 100644
+index 7a6609f..1ea595d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1412,6 +1412,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1397,6 +1397,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
diff --git a/Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
similarity index 93%
rename from Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
index 8d229458ef..92a7f46938 100644
--- a/Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From 2ac0bf359dd04900d5cc9abe28b618ee3cd65177 Mon Sep 17 00:00:00 2001
+From 1900cc9dee6a460ba8d87fd73ee25b43e73af49c Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
diff --git a/Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
similarity index 98%
rename from Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch
rename to Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
index 4507a71c92..93ad89b24b 100644
--- a/Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,4 +1,4 @@
-From bba6f36ded9d5541b4a9370962bddafe36f8f22a Mon Sep 17 00:00:00 2001
+From d29f3b17dee0a6d823ebfc0debd4aaff105a339d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
diff --git a/Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
similarity index 94%
rename from Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch
rename to Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
index 9a8e037f78..413b7ac44f 100644
--- a/Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
@@ -1,4 +1,4 @@
-From aa51369f8e36ad18e7879bacbb6928a4b09523cb Mon Sep 17 00:00:00 2001
+From d3bda3ae7d53809fd81ce89d15389679d8ecc6f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
diff --git a/Spigot-Server-Patches/0086-Waving-banner-workaround.patch b/Spigot-Server-Patches/0085-Waving-banner-workaround.patch
similarity index 95%
rename from Spigot-Server-Patches/0086-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0085-Waving-banner-workaround.patch
index 1912a4cfb8..3cd2baa647 100644
--- a/Spigot-Server-Patches/0086-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0085-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 06895d6610c5ade61bdc43016d06e08322d3dbf2 Mon Sep 17 00:00:00 2001
+From c672f11a21481edf3e49ef4c09cf3b402350b29f Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
diff --git a/Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
similarity index 83%
rename from Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
index 44e370d170..7f88dc9e71 100644
--- a/Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 7c112d4d93a3caf178493739c38a195c33160c3d Mon Sep 17 00:00:00 2001
+From 519f8952226e95dde8e2083bb16103c81e35e4bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,10 +6,10 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 875dcc8..ae16663 100644
+index 453efd4..64b682e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -45,6 +45,7 @@ public abstract class Entity implements ICommandListener {
+@@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener {
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
@@ -17,7 +17,7 @@ index 875dcc8..ae16663 100644
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -160,7 +161,7 @@ public abstract class Entity implements ICommandListener {
+@@ -163,7 +164,7 @@ public abstract class Entity implements ICommandListener {
          this.width = 0.6F;
          this.length = 1.8F;
          this.ax = 1;
diff --git a/Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
similarity index 84%
rename from Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
index beb2b9ce42..d0cef60f71 100644
--- a/Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 9b15cb205ed349c2902591124e6b009f844aecdc Mon Sep 17 00:00:00 2001
+From 26efaa8237ce8a3753a799211df5ad4c20625141 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 ae16663..d8ebe11 100644
+index 64b682e..0612618 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2216,7 +2216,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2269,7 +2269,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      public Entity teleportTo(Location exit, boolean portal) {
diff --git a/Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
similarity index 96%
rename from Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
index 8a76212ebe..4c4ac8d9d3 100644
--- a/Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 7391498a32290021322cfe4879630dcc591308ae Mon Sep 17 00:00:00 2001
+From 840d96d545551835d72adbdf512de70cf5a22b00 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
diff --git a/Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 95%
rename from Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
index 8791ab370e..cd7f697393 100644
--- a/Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From 7cd6c9e03ab94fa8b8bf44c9bdceef268dec51e1 Mon Sep 17 00:00:00 2001
+From f956cdf7c0c12d09a95d78745f88a0a884771142 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -19,7 +19,7 @@ index 9cce672..d92ccc7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 52b70e7..2c75c15 100644
+index 696f659..564ef79 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -435,7 +435,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 96%
rename from Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index a52a6abcc1..d0daf9542f 100644
--- a/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 9e70da2e8763df71e160fd166200a81608332ba5 Mon Sep 17 00:00:00 2001
+From 630e43a63942dbef4177ad3354f9fdf677bc4823 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -31,10 +31,10 @@ index d60e755..f772c7c 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 5cea6f1..1852972 100644
+index 67b476b..008ed20 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
-@@ -343,6 +343,16 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition {
          protected int b;
          protected int c;
          protected int d;
@@ -98,7 +98,7 @@ index 3d784d0..afdc4a7 100644
      private NibbleArray skyLight;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 06fb88d..60a55fc 100644
+index e0e563c..bfb30d9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess {
@@ -227,7 +227,7 @@ index 06fb88d..60a55fc 100644
  
      public boolean B() {
          return this.J < 4;
-@@ -2038,7 +2047,7 @@ public abstract class World implements IBlockAccess {
+@@ -2020,7 +2029,7 @@ public abstract class World implements IBlockAccess {
      public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
      @Nullable
      public TileEntity getTileEntity(BlockPosition blockposition) {
@@ -236,7 +236,7 @@ index 06fb88d..60a55fc 100644
              return null;
          } else {
              // CraftBukkit start
-@@ -2079,7 +2088,7 @@ public abstract class World implements IBlockAccess {
+@@ -2061,7 +2070,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@@ -245,7 +245,7 @@ index 06fb88d..60a55fc 100644
              if (tileentity != null && !tileentity.y()) {
              // CraftBukkit start
              if (captureBlockStates) {
-@@ -2142,7 +2151,7 @@ public abstract class World implements IBlockAccess {
+@@ -2124,7 +2133,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean d(BlockPosition blockposition, boolean flag) {
diff --git a/Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
similarity index 94%
rename from Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
index ede286f4db..96f4ce2c43 100644
--- a/Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From 27aa9e04eed7118c83df555e0f0509e38094f18d Mon Sep 17 00:00:00 2001
+From e78b091f4fbf7ba12b78cb0bde720c17554d5578 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
diff --git a/Spigot-Server-Patches/0094-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
similarity index 97%
rename from Spigot-Server-Patches/0094-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
index def9a3b0ca..a512302ed7 100644
--- a/Spigot-Server-Patches/0094-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From 24bd2ba47631a8ddefd94a7d2822b5a22d2813e7 Mon Sep 17 00:00:00 2001
+From e2b0e859ad84a39b58e2b1299ffdd07896afde1e Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
diff --git a/Spigot-Server-Patches/0095-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
similarity index 94%
rename from Spigot-Server-Patches/0095-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
index de02071a37..d84f52153d 100644
--- a/Spigot-Server-Patches/0095-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
@@ -1,11 +1,11 @@
-From 05023155fb6a414d96f5b04f20ceec957c5e4a3b Mon Sep 17 00:00:00 2001
+From 4ed00e05204021c2c1d17fd0f5b30812c6eebaf1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159
 
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 31bafc6..f6e330c 100644
+index 29219ec..c95fb7f 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -40,6 +40,7 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0093-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch b/Spigot-Server-Patches/0093-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
deleted file mode 100644
index e908ab024a..0000000000
--- a/Spigot-Server-Patches/0093-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 0af5380a6a18ec3d7c06e7fb4501909b55d2da7b Mon Sep 17 00:00:00 2001
-From: DemonWav <demonwav@gmail.com>
-Date: Sat, 26 Mar 2016 21:36:05 -0500
-Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
-
-
-diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 1852972..93b65cd 100644
---- a/src/main/java/net/minecraft/server/BlockPosition.java
-+++ b/src/main/java/net/minecraft/server/BlockPosition.java
-@@ -158,15 +158,17 @@ public class BlockPosition extends BaseBlockPosition {
- 
-                     protected BlockPosition a() {
-                         if (this.b == null) {
--                            this.b = blockposition;
-+                            this.b = blockposition2; // Paper - use blockposition2 instead of blockposition to prevent infinite loops
-                             return this.b;
--                        } else if (this.b.equals(blockposition1)) {
-+                        } else if (this.b.equals(blockposition3)) { // Paper - use blockposition3 instead of blockposition1 to prevent infinite loops
-                             return (BlockPosition) this.endOfData();
-                         } else {
-                             int i = this.b.getX();
-                             int j = this.b.getY();
-                             int k = this.b.getZ();
- 
-+                            // Paper start - use blockposition2 and blockposition3 to prevent infinite loops
-+                            /*
-                             if (i < blockposition1.getX()) {
-                                 ++i;
-                             } else if (j < blockposition1.getY()) {
-@@ -177,6 +179,18 @@ public class BlockPosition extends BaseBlockPosition {
-                                 j = blockposition.getY();
-                                 ++k;
-                             }
-+                            */
-+                            if (i < blockposition3.getX()) {
-+                                ++i;
-+                            } else if (j < blockposition3.getY()) {
-+                                i = blockposition2.getX();
-+                                ++j;
-+                            } else if (k < blockposition3.getZ()) {
-+                                i = blockposition2.getX();
-+                                j = blockposition2.getY();
-+                                ++k;
-+                            }
-+                            // Paper end
- 
-                             this.b = new BlockPosition(i, j, k);
-                             return this.b;
-@@ -206,15 +220,17 @@ public class BlockPosition extends BaseBlockPosition {
- 
-                     protected BlockPosition.MutableBlockPosition a() {
-                         if (this.b == null) {
--                            this.b = new BlockPosition.MutableBlockPosition(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+                            this.b = new BlockPosition.MutableBlockPosition(blockposition2.getX(), blockposition2.getY(), blockposition2.getZ()); // Paper - use blockposition2 instead of blockposition to prevent infinite loops
-                             return this.b;
--                        } else if (this.b.equals(blockposition1)) {
-+                        } else if (this.b.equals(blockposition3)) { // Paper - use blockposition3 instead of blockposition1 to prevent infinite loops
-                             return (BlockPosition.MutableBlockPosition) this.endOfData();
-                         } else {
-                             int i = this.b.getX();
-                             int j = this.b.getY();
-                             int k = this.b.getZ();
- 
-+                            // Paper start - use blockposition2 and blockposition3 to prevent infinite loops
-+                            /*
-                             if (i < blockposition1.getX()) {
-                                 ++i;
-                             } else if (j < blockposition1.getY()) {
-@@ -225,6 +241,18 @@ public class BlockPosition extends BaseBlockPosition {
-                                 j = blockposition.getY();
-                                 ++k;
-                             }
-+                            */
-+                            if (i < blockposition3.getX()) {
-+                                ++i;
-+                            } else if (j < blockposition3.getY()) {
-+                                i = blockposition2.getX();
-+                                ++j;
-+                            } else if (k < blockposition3.getZ()) {
-+                                i = blockposition2.getX();
-+                                j = blockposition2.getY();
-+                                ++k;
-+                            }
-+                            // Paper end
- 
-                             this.b.b = i;
-                             this.b.c = j;
--- 
-2.9.3
-
diff --git a/Spigot-Server-Patches/0096-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 96%
rename from Spigot-Server-Patches/0096-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index b507cf474d..1b195727b1 100644
--- a/Spigot-Server-Patches/0096-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 8152281862b9dd18cd83d50a25445213da0aa6d4 Mon Sep 17 00:00:00 2001
+From 982998dd8173683b1421ad89314de7661077d332 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -25,7 +25,7 @@ index d92ccc7..298c48f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8ca33d0..019b185 100644
+index bfb30d9..1f12ff5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess {
@@ -38,7 +38,7 @@ index 8ca33d0..019b185 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2c75c15..f04486e 100644
+index 564ef79..5bf7df7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
diff --git a/Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 91%
rename from Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
index 3e44b0cdfb..41d033e78f 100644
--- a/Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,11 +1,11 @@
-From 3c45541cf46e3cf358d90f9ddb03777d75f6afe0 Mon Sep 17 00:00:00 2001
+From e09b7acbdcfdb399602433af50a246e2bcbfb276 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6ac16a8..b0f369d 100644
+index 1f12ff5..dd4634e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1180,6 +1180,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0098-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
similarity index 95%
rename from Spigot-Server-Patches/0098-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
index bf0ab1f770..47eb01efc2 100644
--- a/Spigot-Server-Patches/0098-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From a965153e8399e27c9de94c80a44bb9ddefa2fcec Mon Sep 17 00:00:00 2001
+From de134ec4838b131a802ae6e75f7d805bb54b0566 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
diff --git a/Spigot-Server-Patches/0099-EntityPathfindEvent.patch b/Spigot-Server-Patches/0097-EntityPathfindEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0099-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0097-EntityPathfindEvent.patch
index 713ca2f5ab..d68d2ac426 100644
--- a/Spigot-Server-Patches/0099-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0097-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From bfadeb0838decd794069106ce6357842b140ea06 Mon Sep 17 00:00:00 2001
+From 3dc7b052ab904452c72af7ec8494566f09c289dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
diff --git a/Spigot-Server-Patches/0100-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0100-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index e78205c354..bf2881889e 100644
--- a/Spigot-Server-Patches/0100-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From cf17689530a155b1d3d0e45c72430be7d603cde0 Mon Sep 17 00:00:00 2001
+From eb71eace887b2e0a81bc89f494f250fc0a37a4f5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
diff --git a/Spigot-Server-Patches/0101-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 96%
rename from Spigot-Server-Patches/0101-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
index 8caff018c1..0fff452015 100644
--- a/Spigot-Server-Patches/0101-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 26ec2b878c8559f55150b3df075119d3ef289f25 Mon Sep 17 00:00:00 2001
+From dc00f1adf650e8c591f1c67718fb12cabcf1d18b Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
diff --git a/Spigot-Server-Patches/0102-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 98%
rename from Spigot-Server-Patches/0102-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
index 03f3b6c83b..9e7fab42ec 100644
--- a/Spigot-Server-Patches/0102-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From 90af70dc2eb3165b306dab7c34fcb4f2c04646ba Mon Sep 17 00:00:00 2001
+From fd306dc01da01d4bbcaa757e79a5bfacfad90509 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
diff --git a/Spigot-Server-Patches/0103-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0101-Add-getEntity-by-UUID-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0103-Add-getEntity-by-UUID-API.patch
rename to Spigot-Server-Patches/0101-Add-getEntity-by-UUID-API.patch
index b2d6c6b194..f18e1929ff 100644
--- a/Spigot-Server-Patches/0103-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0101-Add-getEntity-by-UUID-API.patch
@@ -1,11 +1,11 @@
-From 74b44807f14bbcfb54136ec5af81eaa1e061a950 Mon Sep 17 00:00:00 2001
+From 8ddafeefaeaf97373c2a76e463716b223bd730fa Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a872e76..3339985 100644
+index 2456e33..fc433f9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1521,6 +1521,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -26,7 +26,7 @@ index a872e76..3339985 100644
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f154248..5614147 100644
+index 4fdb3cc..764b6d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -53,6 +53,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
@@ -37,7 +37,7 @@ index f154248..5614147 100644
  import org.bukkit.craftbukkit.entity.CraftPlayer;
  import org.bukkit.craftbukkit.generator.CraftChunkData;
  import org.bukkit.craftbukkit.help.SimpleHelpMap;
-@@ -1850,5 +1851,14 @@ public final class CraftServer implements Server {
+@@ -1838,5 +1839,14 @@ public final class CraftServer implements Server {
              });
          }
      }
diff --git a/Spigot-Server-Patches/0104-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0102-Use-Optimized-Collections.patch
similarity index 97%
rename from Spigot-Server-Patches/0104-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0102-Use-Optimized-Collections.patch
index 973371439b..bf114ddbb3 100644
--- a/Spigot-Server-Patches/0104-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0102-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 5f74f4b584ca2388c4e5aed9dfb08cac40f941f1 Mon Sep 17 00:00:00 2001
+From bcf0f8cce8edf3181863e5e35b2879c2d884de24 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
diff --git a/Spigot-Server-Patches/0105-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0103-Do-not-load-chunks-for-light-checks.patch
similarity index 90%
rename from Spigot-Server-Patches/0105-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0103-Do-not-load-chunks-for-light-checks.patch
index f6773c7c08..809a2762ec 100644
--- a/Spigot-Server-Patches/0105-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0103-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 73380b1eaea2bd41dc6e9f792b06c45ff1c5661d Mon Sep 17 00:00:00 2001
+From ea74d4759a983c7da708fbf2e930381ab2b54228 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2f92c78..2374a14 100644
+index dd4634e..26166bd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -759,6 +759,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0106-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0106-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch
index 30f0c4cb95..b25a546539 100644
--- a/Spigot-Server-Patches/0106-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From e8e000b9e0e53bc3834ae69d60d59bcbbf27755f Mon Sep 17 00:00:00 2001
+From 6a3f20ec137e08c421a3351213338b0d35610016 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index c67cb54..521f462 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 687a8e6..1f0047b 100644
+index b42c0be..a376a0e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1598,6 +1598,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1605,6 +1605,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
diff --git a/Spigot-Server-Patches/0107-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0105-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 92%
rename from Spigot-Server-Patches/0107-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0105-Fix-reducedDebugInfo-not-initialized-on-client.patch
index acdbdd069f..b412b4fc2e 100644
--- a/Spigot-Server-Patches/0107-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0105-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From 18bd0f26a2508867740717cd8c4f44dd74c94558 Mon Sep 17 00:00:00 2001
+From efdd99dd7957200659226404af74d6ac7199ce2c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 954d035..87740c2 100644
+index 54762ff..2af702c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -154,6 +154,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0108-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0106-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 96%
rename from Spigot-Server-Patches/0108-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0106-Configurable-Grass-Spread-Tick-Rate.patch
index 8b871978a4..8d6d6b72c9 100644
--- a/Spigot-Server-Patches/0108-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0106-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From 5db46b601603e6d1968ec56ed2c3f898d1704700 Mon Sep 17 00:00:00 2001
+From 6f9b0a8a2bb769a5403e218228873df3833f2dc3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
diff --git a/Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 95%
rename from Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 3e273d8bf0..1869818aa0 100644
--- a/Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 6e335d3055b2dea8a69d1f3a1bf95ec6fd83d341 Mon Sep 17 00:00:00 2001
+From 8f7a21dbb05376414fe4a0dd515a4f28856fcea9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -21,7 +21,7 @@ index 615a6af..6517c32 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3339985..4cb71eb 100644
+index fc433f9..2fc3e94 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -352,8 +352,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -39,10 +39,10 @@ index 3339985..4cb71eb 100644
  
                      if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0716198..01058a9 100644
+index 26166bd..fa92054 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3215,8 +3215,9 @@ public abstract class World implements IBlockAccess {
+@@ -3197,8 +3197,9 @@ public abstract class World implements IBlockAccess {
          int k = i * 16 + 8 - blockposition.getX();
          int l = j * 16 + 8 - blockposition.getZ();
          boolean flag = true;
@@ -54,7 +54,7 @@ index 0716198..01058a9 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5614147..f107221 100644
+index 764b6d7..79ee561 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -951,7 +951,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0110-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 89%
rename from Spigot-Server-Patches/0110-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index fb62713c24..5a4ae45f63 100644
--- a/Spigot-Server-Patches/0110-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,11 +1,11 @@
-From 3fdb1dae891799dd98d2a288e12a3efc279ae9d6 Mon Sep 17 00:00:00 2001
+From ae73bd2fe9bb25c99c9998c1894dd500fa831836 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 841a6c7..46b1323 100644
+index fa92054..70cd195 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -532,6 +532,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 88%
rename from Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index a7bb7dc80a..d8d60bf0a0 100644
--- a/Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,14 +1,14 @@
-From 4feb279f6e509fd05c7527eb936a534168481a71 Mon Sep 17 00:00:00 2001
+From c15ffc7835e107600a83dacbdf2265e7287e5905 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e52791e..0c460b1 100644
+index 70cd195..2e686ae 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3211,6 +3211,7 @@ public abstract class World implements IBlockAccess {
+@@ -3193,6 +3193,7 @@ public abstract class World implements IBlockAccess {
          return this.N;
      }
  
diff --git a/Spigot-Server-Patches/0112-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0110-Remove-Debug-checks-from-DataBits.patch
similarity index 96%
rename from Spigot-Server-Patches/0112-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0110-Remove-Debug-checks-from-DataBits.patch
index 9ba7126e33..5bc99b5c57 100644
--- a/Spigot-Server-Patches/0112-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0110-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From de9aae490f42cda27e08d99884b4b4e4fe6b1d0d Mon Sep 17 00:00:00 2001
+From f5052f0ab3d6f3dca63bde76e1219434619430e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
diff --git a/Spigot-Server-Patches/0113-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 91%
rename from Spigot-Server-Patches/0113-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index aa8ba4cbdc..d527ceed9d 100644
--- a/Spigot-Server-Patches/0113-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 9f87cd16312f919435c50acadbc36a728e503a08 Mon Sep 17 00:00:00 2001
+From 770da0e07c4eab5c4420fde8e767ba9e4e18d80f 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
@@ -19,10 +19,10 @@ index 6517c32..ea254a7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d8ebe11..2d0e132 100644
+index 0612618..d594dd6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1949,6 +1949,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2002,6 +2002,7 @@ public abstract class Entity implements ICommandListener {
          return this.getFlag(5);
      }
  
@@ -31,10 +31,10 @@ index d8ebe11..2d0e132 100644
      public ScoreboardTeamBase aQ() {
          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 1f0047b..00135cc 100644
+index a376a0e..3a99311 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1331,7 +1331,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1338,7 +1338,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
diff --git a/Spigot-Server-Patches/0114-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0112-Workaround-for-setting-passengers-on-players.patch
similarity index 86%
rename from Spigot-Server-Patches/0114-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0112-Workaround-for-setting-passengers-on-players.patch
index bb4651e6d8..8790d29552 100644
--- a/Spigot-Server-Patches/0114-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0112-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 1fa6dccda9721bf0c1eb8aecb6440b914c6f37ad Mon Sep 17 00:00:00 2001
+From cddf4caa7f3d36be3b5de9afd725b6b6cceb4b42 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eba73cf..f16fe84 100644
+index 1ea595d..eaf7954 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -602,6 +602,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -587,6 +587,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
diff --git a/Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch
similarity index 88%
rename from Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch
index 45b3ee2235..90c9ce2e19 100644
--- a/Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 71f1926723e388cc370e8b45ee1f65836a99cc61 Mon Sep 17 00:00:00 2001
+From 7b9087f509a179e0f0f8ccff52552ac94970a8ba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0c460b1..0e2176e 100644
+index 2e686ae..7ab4f45 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@@ -18,7 +18,7 @@ index 0c460b1..0e2176e 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> b = Lists.newArrayList();
      private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
-@@ -1590,7 +1590,7 @@ public abstract class World implements IBlockAccess {
+@@ -1572,7 +1572,7 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - From below, clean up tile entities before ticking them
          if (!this.tileEntityListUnload.isEmpty()) {
              this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@@ -27,7 +27,7 @@ index 0c460b1..0e2176e 100644
              this.tileEntityListUnload.clear();
          }
          // CraftBukkit end
-@@ -1641,7 +1641,7 @@ public abstract class World implements IBlockAccess {
+@@ -1623,7 +1623,7 @@ public abstract class World implements IBlockAccess {
              if (tileentity.y()) {
                  tilesThisCycle--;
                  this.tileEntityListTick.remove(tileTickPosition--);
@@ -36,7 +36,7 @@ index 0c460b1..0e2176e 100644
                  if (this.isLoaded(tileentity.getPosition())) {
                      this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
                  }
-@@ -1679,7 +1679,7 @@ public abstract class World implements IBlockAccess {
+@@ -1661,7 +1661,7 @@ public abstract class World implements IBlockAccess {
                          this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
                          // CraftBukkit start
                          // From above, don't screw this up - SPIGOT-1746
@@ -45,7 +45,7 @@ index 0c460b1..0e2176e 100644
                              this.a(tileentity1);
                          }
                          // CraftBukkit end
-@@ -1699,9 +1699,9 @@ public abstract class World implements IBlockAccess {
+@@ -1681,9 +1681,9 @@ public abstract class World implements IBlockAccess {
      protected void l() {}
  
      public boolean a(TileEntity tileentity) {
@@ -57,7 +57,7 @@ index 0c460b1..0e2176e 100644
              this.tileEntityListTick.add(tileentity);
          }
  
-@@ -2135,7 +2135,7 @@ public abstract class World implements IBlockAccess {
+@@ -2117,7 +2117,7 @@ public abstract class World implements IBlockAccess {
          } else {
              if (tileentity != null) {
                  this.b.remove(tileentity);
diff --git a/Spigot-Server-Patches/0116-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0114-Don-t-tick-Skulls-unused-code.patch
similarity index 92%
rename from Spigot-Server-Patches/0116-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0114-Don-t-tick-Skulls-unused-code.patch
index 4a7a7c42b7..0f3517a85a 100644
--- a/Spigot-Server-Patches/0116-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0114-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From e07b3c609ad811d3fce71bafc7ccc0694b3289ce Mon Sep 17 00:00:00 2001
+From 4f5fa0bf7fb883ea2d79b49add0e696be0adfeaf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
diff --git a/Spigot-Server-Patches/0117-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
similarity index 95%
rename from Spigot-Server-Patches/0117-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
index 7526b3932c..b02f137fb6 100644
--- a/Spigot-Server-Patches/0117-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From 3ed2f46a1d5ad43cef080a52b198425b73458377 Mon Sep 17 00:00:00 2001
+From 024f56067df9c81b3dc1b69836311755d59d7680 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
@@ -37,7 +37,7 @@ index ab9aa13..f9f59e5 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4cb71eb..6f2cf4b 100644
+index 2fc3e94..8b94120 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -327,6 +327,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -75,7 +75,7 @@ index d8ec504..eb45d3c 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 87740c2..981c31f 100644
+index 2af702c..b14d4cb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -71,6 +71,7 @@ public abstract class PlayerList {
@@ -86,7 +86,7 @@ index 87740c2..981c31f 100644
  
      public PlayerList(MinecraftServer minecraftserver) {
          this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
-@@ -236,6 +237,12 @@ public abstract class PlayerList {
+@@ -228,6 +229,12 @@ public abstract class PlayerList {
          }
  
          entityplayer.syncInventory();
@@ -99,7 +99,7 @@ index 87740c2..981c31f 100644
          // CraftBukkit - Moved from above, added world
          PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
      }
-@@ -406,6 +413,16 @@ public abstract class PlayerList {
+@@ -399,6 +406,16 @@ public abstract class PlayerList {
          entityplayer.playerTick();// SPIGOT-924
          // CraftBukkit end
  
@@ -116,7 +116,7 @@ index 87740c2..981c31f 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getVehicle();
-@@ -1319,7 +1336,13 @@ public abstract class PlayerList {
+@@ -1312,7 +1329,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end
diff --git a/Spigot-Server-Patches/0118-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 96%
rename from Spigot-Server-Patches/0118-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index c5ebf1785a..b3cb09d926 100644
--- a/Spigot-Server-Patches/0118-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From e5e479460bd567fb43957512e40870585b5e1ff6 Mon Sep 17 00:00:00 2001
+From f803c68f46d30c10dda07eacea30e5c60243b658 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index d29796a..d84ac87 100644
+index c1ed460..492a0c5 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
diff --git a/Spigot-Server-Patches/0119-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0117-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 94%
rename from Spigot-Server-Patches/0119-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0117-Water-mobs-should-only-spawn-in-the-water.patch
index 6abe47f876..5a65afee48 100644
--- a/Spigot-Server-Patches/0119-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0117-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From 7ea77c7bbcea4714f13d0aaed96d3ca96fc56bac Mon Sep 17 00:00:00 2001
+From 5a9cea8d05b30aecdb586a5c81fd6eeb5c107fdf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
diff --git a/Spigot-Server-Patches/0120-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 96%
rename from Spigot-Server-Patches/0120-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index bfb1950cd8..9fb6755998 100644
--- a/Spigot-Server-Patches/0120-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From 80459847413a5107bc062d6f65b2da71fdd32eac Mon Sep 17 00:00:00 2001
+From a9fd44ef1436a725ebe60a5ca1230e01c231560b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -27,7 +27,7 @@ index 61d34fc..a6cf1d8 100644
          if (entity instanceof EntityItem) {
              itemCounts[i]--;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index f6e330c..c1f6e63 100644
+index c95fb7f..0a7a310 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -23,6 +23,15 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0121-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0119-Configurable-RCON-IP-address.patch
similarity index 93%
rename from Spigot-Server-Patches/0121-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0119-Configurable-RCON-IP-address.patch
index 3efac90d42..7d0bbec3ae 100644
--- a/Spigot-Server-Patches/0121-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0119-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 003148da08b283ba0b1696222927cd1c8fe77207 Mon Sep 17 00:00:00 2001
+From 6853c3611af7ac1107959451fcf1d33684853f97 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
diff --git a/Spigot-Server-Patches/0122-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0120-Prevent-Fire-from-loading-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0122-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0120-Prevent-Fire-from-loading-chunks.patch
index f3923926b8..c121ddf22b 100644
--- a/Spigot-Server-Patches/0122-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0120-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 8b872363b4ed115d482f83f4328fa444192dfe17 Mon Sep 17 00:00:00 2001
+From 1e7f0732a42a20adb87656e9223e1f5923d28912 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
diff --git a/Spigot-Server-Patches/0123-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0123-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
index 1d0a5c5f3f..dd3815b717 100644
--- a/Spigot-Server-Patches/0123-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From 99367ba5827ada166fb56b27aaad03f3ed4290db Mon Sep 17 00:00:00 2001
+From 952a91604c23b7d171c80d06e38235a38e9bfae4 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9662ea0..518283f 100644
+index 2c8a21e..182c0bb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -28,7 +28,7 @@ import org.bukkit.inventory.MainHand;
@@ -17,7 +17,7 @@ index 9662ea0..518283f 100644
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
-@@ -1071,7 +1071,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1088,7 +1088,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.server.server.getPluginManager().callEvent(event);
          }
          // CraftBukkit end
@@ -34,10 +34,10 @@ index 9662ea0..518283f 100644
          this.ch = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f16fe84..72bf7fd 100644
+index eaf7954..3edeb49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1705,7 +1705,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1690,7 +1690,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
diff --git a/Spigot-Server-Patches/0124-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0122-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0124-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0122-EntityRegainHealthEvent-isFastRegen-API.patch
index f9bab020ee..3813277a48 100644
--- a/Spigot-Server-Patches/0124-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0122-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 21c7e1d110079977290a2966af83b112bce373a5 Mon Sep 17 00:00:00 2001
+From 2817475c6f24e5080e7172f6f4e2faf8748dceb1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1eee8a3..9a86d84 100644
+index 7e0d509..87c39c9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -761,10 +761,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0125-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0123-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 97%
rename from Spigot-Server-Patches/0125-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0123-Add-ability-to-configure-frosted_ice-properties.patch
index 18c82f1aad..d44083e2c1 100644
--- a/Spigot-Server-Patches/0125-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0123-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 301c48afe1476bca3793c13900cd0ee0e431d9f1 Mon Sep 17 00:00:00 2001
+From c12af4cb4b783527f0836975ede8f153756bfb9a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
diff --git a/Spigot-Server-Patches/0126-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch
similarity index 89%
rename from Spigot-Server-Patches/0126-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch
index 3444d78258..7d7f6f2f8a 100644
--- a/Spigot-Server-Patches/0126-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch
@@ -1,14 +1,14 @@
-From 08a96c69d9c2893a37e6bd71b65f1c48096b8485 Mon Sep 17 00:00:00 2001
+From 0ad7ae5cfa417df14a045c10ebc7891bc3978d09 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 2d0e132..b0cdce1 100644
+index d594dd6..78b3b3a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1754,6 +1754,10 @@ public abstract class Entity implements ICommandListener {
+@@ -1807,6 +1807,10 @@ public abstract class Entity implements ICommandListener {
              }
          }
  
@@ -19,7 +19,7 @@ index 2d0e132..b0cdce1 100644
          if (!flag && (!this.n(entity) || !entity.q(this))) {
              return false;
          } else {
-@@ -1762,7 +1766,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1815,7 +1819,7 @@ public abstract class Entity implements ICommandListener {
              }
  
              this.au = entity;
@@ -28,7 +28,7 @@ index 2d0e132..b0cdce1 100644
              return true;
          }
      }
-@@ -1789,12 +1793,20 @@ public abstract class Entity implements ICommandListener {
+@@ -1842,12 +1846,20 @@ public abstract class Entity implements ICommandListener {
      }
  
      protected void o(Entity entity) {
@@ -49,7 +49,7 @@ index 2d0e132..b0cdce1 100644
              CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
              Entity orig = craft == null ? null : craft.getHandle();
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used
-@@ -1817,6 +1829,8 @@ public abstract class Entity implements ICommandListener {
+@@ -1870,6 +1882,8 @@ public abstract class Entity implements ICommandListener {
                  return;
              }
              // Spigot end
@@ -58,7 +58,7 @@ index 2d0e132..b0cdce1 100644
              if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) {
                  this.passengers.add(0, entity);
              } else {
-@@ -1842,16 +1856,29 @@ public abstract class Entity implements ICommandListener {
+@@ -1895,16 +1909,29 @@ public abstract class Entity implements ICommandListener {
                  CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
                  Entity n = craftn == null ? null : craftn.getHandle();
                  if (event.isCancelled() || n != orig) {
diff --git a/Spigot-Server-Patches/0127-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0125-Arrow-pickup-rule-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0127-Arrow-pickup-rule-API.patch
rename to Spigot-Server-Patches/0125-Arrow-pickup-rule-API.patch
index d50f24fff6..e8d91930d7 100644
--- a/Spigot-Server-Patches/0127-Arrow-pickup-rule-API.patch
+++ b/Spigot-Server-Patches/0125-Arrow-pickup-rule-API.patch
@@ -1,4 +1,4 @@
-From d5f47de464e17bc91048e94aaf1de0b539729527 Mon Sep 17 00:00:00 2001
+From f4417caf2ef943f482ec13ee77a622de815326e0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:16:11 -0500
 Subject: [PATCH] Arrow pickup rule API
diff --git a/Spigot-Server-Patches/0128-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0126-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 95%
rename from Spigot-Server-Patches/0128-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to Spigot-Server-Patches/0126-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index 8c16ca9b07..306ab94b2a 100644
--- a/Spigot-Server-Patches/0128-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0126-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,11 +1,11 @@
-From 8c8623d2c519cc80308a33c53a1729667d3703fe Mon Sep 17 00:00:00 2001
+From 050a5a2a340eb01af624a481460399b67380736c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockDispenser.java b/src/main/java/net/minecraft/server/BlockDispenser.java
-index 958c9bd..f82dbf8 100644
+index f8eaf2a..8e78844 100644
 --- a/src/main/java/net/minecraft/server/BlockDispenser.java
 +++ b/src/main/java/net/minecraft/server/BlockDispenser.java
 @@ -20,6 +20,9 @@ public class BlockDispenser extends BlockTileEntity {
@@ -28,7 +28,7 @@ index 958c9bd..f82dbf8 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/BlockFurnace.java b/src/main/java/net/minecraft/server/BlockFurnace.java
-index cb70d2c..b8750fb 100644
+index 5280054..b0d03e4 100644
 --- a/src/main/java/net/minecraft/server/BlockFurnace.java
 +++ b/src/main/java/net/minecraft/server/BlockFurnace.java
 @@ -18,6 +18,9 @@ public class BlockFurnace extends BlockTileEntity {
diff --git a/Spigot-Server-Patches/0129-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0127-Improve-Minecraft-Hopper-Performance.patch
similarity index 95%
rename from Spigot-Server-Patches/0129-Improve-Minecraft-Hopper-Performance.patch
rename to Spigot-Server-Patches/0127-Improve-Minecraft-Hopper-Performance.patch
index 75467d3816..b1df393473 100644
--- a/Spigot-Server-Patches/0129-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0127-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From 429958c34916bf78a6dadf07580c77dc6feef1a7 Mon Sep 17 00:00:00 2001
+From 8021c1dc974999e3f717f4f181a3623f188be45b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Improve Minecraft Hopper Performance
@@ -7,7 +7,7 @@ Removes unnecessary extra calls to .update() that are very expensive
 Also reset cooldown each hopper tick that a hopper is full.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 1f3e89b..b2122a9 100644
+index d0c0371..d2662ae 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -33,6 +33,7 @@ public abstract class TileEntity {
diff --git a/Spigot-Server-Patches/0130-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0128-remove-null-possibility-for-getServer-singleton.patch
similarity index 95%
rename from Spigot-Server-Patches/0130-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0128-remove-null-possibility-for-getServer-singleton.patch
index babe8d0ed1..920a643bdd 100644
--- a/Spigot-Server-Patches/0130-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0128-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 920f7a5b371eba7af0aec239feb3f6142026da9c Mon Sep 17 00:00:00 2001
+From 64924f639844d7e20e1d4f407aa36fd96d0f3deb 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 6f2cf4b..7446a3d 100644
+index 8b94120..db77a88 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -51,6 +51,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0129-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 98%
rename from Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0129-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 1cca4cc41b..f29d7ab54d 100644
--- a/Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0129-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 8889b730cf6740f9b01b57cef074c2ea37bde2df Mon Sep 17 00:00:00 2001
+From 5f0e2802ad1a126163c565c9ab79abf9c087e4e9 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 f0a673f..fd08195 100644
+index f1823af..130da0e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -597,6 +597,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -48,7 +48,7 @@ index 370cb9c..91af48f 100644
                  Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0e2176e..b1671b9 100644
+index 7ab4f45..8aaea1d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1217,6 +1217,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0132-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0130-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0132-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0130-LootTable-API-Replenishable-Lootables-Feature.patch
index e9045eb4ee..176319026a 100644
--- a/Spigot-Server-Patches/0132-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0130-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From db2393fe957ad48a95af27ef2fb0a1afb0489835 Mon Sep 17 00:00:00 2001
+From f33d6b1eda7baf6811cc5baeb03b4442668cb85c 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
diff --git a/Spigot-Server-Patches/0133-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0131-Do-not-load-chunks-for-pathfinding.patch
similarity index 92%
rename from Spigot-Server-Patches/0133-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0131-Do-not-load-chunks-for-pathfinding.patch
index fd75f81eae..e08df6bad7 100644
--- a/Spigot-Server-Patches/0133-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0131-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From ffbc2adc678c6a312bbbe4a0339c09e2df31e4bb Mon Sep 17 00:00:00 2001
+From 8190faebc8d1708af184119afe147214abb30d94 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/Spigot-Server-Patches/0134-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0132-Entity-Tracking-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0134-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0132-Entity-Tracking-Improvements.patch
index 9bd2f74884..5cf1575569 100644
--- a/Spigot-Server-Patches/0134-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0132-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 23fbb29c66bd4230c74d39d5e22f26a4c1855c98 Mon Sep 17 00:00:00 2001
+From 4910b3733b5f7cba9d48e801b1e3f6f2f64a84fe 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,10 +7,10 @@ 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 b0cdce1..5675757 100644
+index 78b3b3a..4907b24 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -52,6 +52,7 @@ public abstract class Entity implements ICommandListener {
+@@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener {
  
      protected CraftEntity bukkitEntity;
  
diff --git a/Spigot-Server-Patches/0135-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0133-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 96%
rename from Spigot-Server-Patches/0135-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0133-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 9e8bfb9d23..5cb95d1965 100644
--- a/Spigot-Server-Patches/0135-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0133-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,4 +1,4 @@
-From f1569bcf73f70605748c582e26ba156b6590cba5 Mon Sep 17 00:00:00 2001
+From 8999daf8a073c7e48f7a966c4d055c30a2773304 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/Spigot-Server-Patches/0136-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0134-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0136-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0134-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 93346e4a81..9dbdef689a 100644
--- a/Spigot-Server-Patches/0136-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0134-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From b5b474513ed052e0f84f21e9847dd047c24c42b3 Mon Sep 17 00:00:00 2001
+From dffb73da6b48f17f82bbc3983a492e16a7097d6b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
diff --git a/Spigot-Server-Patches/0137-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0135-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0137-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0135-Fix-Chunk-Unload-Queue-Issues.patch
index 9d96167e59..e78297b599 100644
--- a/Spigot-Server-Patches/0137-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0135-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From abbb57231054c88533d9c6bc71a9c285f68e6796 Mon Sep 17 00:00:00 2001
+From e2321d441dfdd9d390b0a045f4003bf316b565ff 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
diff --git a/Spigot-Server-Patches/0138-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0136-System-property-for-disabling-watchdoge.patch
similarity index 93%
rename from Spigot-Server-Patches/0138-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0136-System-property-for-disabling-watchdoge.patch
index a396beb74c..bc07ed1fa9 100644
--- a/Spigot-Server-Patches/0138-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0136-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From fca52889e122cb2a7e1d30d4c731afc95e5fe003 Mon Sep 17 00:00:00 2001
+From 5c26aa79b72482d6d92a7dd0bf0966d1930a591d 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/Spigot-Server-Patches/0139-Optimize-EAR.patch b/Spigot-Server-Patches/0137-Optimize-EAR.patch
similarity index 97%
rename from Spigot-Server-Patches/0139-Optimize-EAR.patch
rename to Spigot-Server-Patches/0137-Optimize-EAR.patch
index d009bd2b09..b945772a05 100644
--- a/Spigot-Server-Patches/0139-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0137-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 3e6aa58cb66df97b3c7b25d993e4663547beb44e Mon Sep 17 00:00:00 2001
+From 531225cb5aa8c1c3aa9fdcaf6da93e6d938b40a7 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/Spigot-Server-Patches/0140-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0138-Optimize-UserCache-Thread-Safe.patch
similarity index 97%
rename from Spigot-Server-Patches/0140-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0138-Optimize-UserCache-Thread-Safe.patch
index a273cbc02e..78320d8096 100644
--- a/Spigot-Server-Patches/0140-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0138-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From 8571493e3b678c1ca405585135fae9531db6e730 Mon Sep 17 00:00:00 2001
+From 63b38db571f308ba674ebf72599455094f837f4c 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 7446a3d..968b0ec 100644
+index db77a88..184cb72 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -523,7 +523,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
diff --git a/Spigot-Server-Patches/0141-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0139-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0141-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0139-Avoid-blocking-on-Network-Manager-creation.patch
index 88df315e57..19e0cf1b50 100644
--- a/Spigot-Server-Patches/0141-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0139-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 3031261e1677d694e061cb2ec675db49bcce5485 Mon Sep 17 00:00:00 2001
+From e9ddf37579577e78b12a5e2d704ff1b898149cdd 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
diff --git a/Spigot-Server-Patches/0142-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0140-Optional-old-TNT-cannon-behaviors.patch
similarity index 98%
rename from Spigot-Server-Patches/0142-Optional-old-TNT-cannon-behaviors.patch
rename to Spigot-Server-Patches/0140-Optional-old-TNT-cannon-behaviors.patch
index aff558cd75..643e6d57eb 100644
--- a/Spigot-Server-Patches/0142-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0140-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From afe40afde371d88195c7a5d2f027f6483961aa2c Mon Sep 17 00:00:00 2001
+From b2b00d76f826e798b5f3f1051957d1c43959f1ea 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 old TNT cannon behaviors
@@ -207,10 +207,10 @@ index dbfb8ab..537408a 100644
                     world.getServer().getPluginManager().callEvent(event);
                  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5675757..a262eda 100644
+index 4907b24..a6f6313 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -994,6 +994,12 @@ public abstract class Entity implements ICommandListener {
+@@ -1043,6 +1043,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean ak() {
@@ -223,7 +223,7 @@ index 5675757..a262eda 100644
          if (this.bB() instanceof EntityBoat) {
              this.inWater = false;
          } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) {
-@@ -1195,6 +1201,12 @@ public abstract class Entity implements ICommandListener {
+@@ -1248,6 +1254,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public double e(double d0, double d1, double d2) {
@@ -236,7 +236,7 @@ index 5675757..a262eda 100644
          double d3 = this.locX - d0;
          double d4 = this.locY - d1;
          double d5 = this.locZ - d2;
-@@ -1249,6 +1261,11 @@ public abstract class Entity implements ICommandListener {
+@@ -1302,6 +1314,11 @@ public abstract class Entity implements ICommandListener {
      }
  
      public void f(double d0, double d1, double d2) {
@@ -248,7 +248,7 @@ index 5675757..a262eda 100644
          this.motX += d0;
          this.motY += d1;
          this.motZ += d2;
-@@ -2424,6 +2441,12 @@ public abstract class Entity implements ICommandListener {
+@@ -2477,6 +2494,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean bg() {
@@ -262,7 +262,7 @@ index 5675757..a262eda 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 042670b..613af99 100644
+index 307a44c..bb01929 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -280,4 +280,19 @@ public class EntityFallingBlock extends Entity {
diff --git a/Spigot-Server-Patches/0143-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0141-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 96%
rename from Spigot-Server-Patches/0143-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0141-Faster-redstone-torch-rapid-clock-removal.patch
index ba02deee99..385b62751a 100644
--- a/Spigot-Server-Patches/0143-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0141-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From b5d4ed058bc016b7cca1e61844e0b0448dcb38a8 Mon Sep 17 00:00:00 2001
+From e899fdb8ab3eee687e6d42cbbae4b1d59d20d448 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
diff --git a/Spigot-Server-Patches/0144-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0142-Ensure-Chunks-never-ever-load-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0144-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0142-Ensure-Chunks-never-ever-load-async.patch
index 4309d84232..14e6115719 100644
--- a/Spigot-Server-Patches/0144-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0142-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 1b21610eaf17642ea4a6646bf2a1f96d2b7a8fb2 Mon Sep 17 00:00:00 2001
+From 787ac468018431afcfd3a955b13d668b162dd072 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
diff --git a/Spigot-Server-Patches/0145-Add-server-name-parameter.patch b/Spigot-Server-Patches/0143-Add-server-name-parameter.patch
similarity index 90%
rename from Spigot-Server-Patches/0145-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0143-Add-server-name-parameter.patch
index b8cb3519f6..0d620d24bc 100644
--- a/Spigot-Server-Patches/0145-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0143-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From c48bda8426ca36a49183e7ddac0a2fb4390390e6 Mon Sep 17 00:00:00 2001
+From 7fc2f0caeb2545a79414f3a84128ae1499e227cc 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 788bf66..4ac4e6f 100644
+index 30b6f34..507390c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -134,6 +134,14 @@ public class Main {
diff --git a/Spigot-Server-Patches/0146-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0144-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 94%
rename from Spigot-Server-Patches/0146-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0144-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 8fdf4e4b17..aaf8a9cd94 100644
--- a/Spigot-Server-Patches/0146-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0144-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From ea1c3932b75a5b0deb939bddb7a421265a1ee915 Mon Sep 17 00:00:00 2001
+From 0d8fec691662cb2933243c2b4ca6841c4637a821 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 7eea3bb..6d3a212 100644
+index e24be3c..e93819f 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,10 +25,10 @@ index 7eea3bb..6d3a212 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 f56dabb..73c7d01 100644
+index 9af34ba..0315075 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
-@@ -206,8 +206,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+@@ -211,8 +211,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
  
                  // CraftBukkit start - Use relative location for far away sounds
                  // this.world.a(1023, new BlockPosition(this), 0);
diff --git a/Spigot-Server-Patches/0147-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0145-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 96%
rename from Spigot-Server-Patches/0147-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0145-Fix-FallingBlocks-being-stuck-on-fences.patch
index a3497da159..40534c66d1 100644
--- a/Spigot-Server-Patches/0147-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0145-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From 073e8dab73fd83b045137ae4328389343ce66fc2 Mon Sep 17 00:00:00 2001
+From a8eee67a428457a0fad9e6b9f7033d2c1bd9086e Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
@@ -42,7 +42,7 @@ index dcdae99..3c77741 100644
  
      public void b(World world, BlockPosition blockposition) {}
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 613af99..edc817a 100644
+index bb01929..8059e6d 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -2,7 +2,9 @@ package net.minecraft.server;
@@ -94,7 +94,7 @@ index 613af99..edc817a 100644
 +
 +    // OBFHELPER
 +    private void addCollisions(IBlockData blockData, World world, BlockPosition where, AxisAlignedBB collider, List<AxisAlignedBB> list, Entity entity) {
-+        blockData.a(world, where, collider, list, entity);
++        blockData.a(world, where, collider, list, entity, false);
 +    }
 +    // Paper end
 +
diff --git a/Spigot-Server-Patches/0148-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0146-Make-entities-look-for-hoppers.patch
similarity index 97%
rename from Spigot-Server-Patches/0148-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0146-Make-entities-look-for-hoppers.patch
index 2dc159e1cb..1e0de4cbd4 100644
--- a/Spigot-Server-Patches/0148-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0146-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From a582afd2c6b4ee60c8fc5f15effdacb98bb50bdf Mon Sep 17 00:00:00 2001
+From 2804df4eb136c34688021eec0187d06408d507d1 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sat, 18 Jun 2016 01:01:37 -0500
 Subject: [PATCH] Make entities look for hoppers
@@ -116,10 +116,10 @@ index 857ae9d..25d012b 100644
              EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ()));
              world.getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 93b65cd..6c14061 100644
+index 008ed20..b3c1f55 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
-@@ -282,6 +282,7 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -250,6 +250,7 @@ public class BlockPosition extends BaseBlockPosition {
              super(i, j, k);
          }
  
@@ -127,7 +127,7 @@ index 93b65cd..6c14061 100644
          public static BlockPosition.PooledBlockPosition s() {
              return e(0, 0, 0);
          }
-@@ -308,6 +309,7 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -276,6 +277,7 @@ public class BlockPosition extends BaseBlockPosition {
              return new BlockPosition.PooledBlockPosition(i, j, k);
          }
  
@@ -135,7 +135,7 @@ index 93b65cd..6c14061 100644
          public void t() {
              List list = BlockPosition.PooledBlockPosition.g;
  
-@@ -425,6 +427,7 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -393,6 +395,7 @@ public class BlockPosition extends BaseBlockPosition {
              return this.d;
          }
  
@@ -144,10 +144,10 @@ index 93b65cd..6c14061 100644
              this.b = i;
              this.c = j;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a262eda..7de4b5b 100644
+index a6f6313..26ab72c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -79,6 +79,19 @@ public abstract class Entity implements ICommandListener {
+@@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener {
      public double locX;
      public double locY;
      public double locZ;
@@ -168,7 +168,7 @@ index a262eda..7de4b5b 100644
      public double motY;
      public double motZ;
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6fc56f4..cdb3586 100644
+index 9742afc..95ca1b8 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -5,8 +5,15 @@ import javax.annotation.Nullable;
diff --git a/Spigot-Server-Patches/0149-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0147-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 99%
rename from Spigot-Server-Patches/0149-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0147-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 38f2fbb23e..00d33030a6 100644
--- a/Spigot-Server-Patches/0149-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0147-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From b263076a8df188ebeb031782d0e2496865b3a3ab Mon Sep 17 00:00:00 2001
+From 1e9573a2fb6f8757a7f5ef540d162b19a40f0e4b 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
diff --git a/Spigot-Server-Patches/0150-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0148-Toggleable-Elytra-Wall-Damage.patch
similarity index 95%
rename from Spigot-Server-Patches/0150-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0148-Toggleable-Elytra-Wall-Damage.patch
index bf5b4bfe4b..45c98a5af6 100644
--- a/Spigot-Server-Patches/0150-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0148-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From 7a4e4543459cf3c2cc1c08cc49c60be4ee384c26 Mon Sep 17 00:00:00 2001
+From 961f75590f7005e54499c7c9cb884efc9624f6df Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -21,7 +21,7 @@ index cda516f..965edc9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9a86d84..1f2f08c 100644
+index 87c39c9..132e03f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1689,6 +1689,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0151-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0149-Fix-Double-World-Add-issues.patch
similarity index 93%
rename from Spigot-Server-Patches/0151-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0149-Fix-Double-World-Add-issues.patch
index a035495c56..2f3cbd573d 100644
--- a/Spigot-Server-Patches/0151-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0149-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 3319f24b69ed6fac4f653727251bea9fbe11d8b1 Mon Sep 17 00:00:00 2001
+From 82ddaaf2cda9494934ab537cdb655401b7d5a29e 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 e2dd95b..ff7b406 100644
+index 192705f..ef17262 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -525,7 +525,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -21,7 +21,7 @@ index e2dd95b..ff7b406 100644
              Iterator iterator = entity.bx().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ec03572..a349f19 100644
+index 8aaea1d..e833657 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1098,6 +1098,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0152-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0150-Fix-Old-Sign-Conversion.patch
similarity index 96%
rename from Spigot-Server-Patches/0152-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0150-Fix-Old-Sign-Conversion.patch
index fbc6e4357f..8d9dc91a3d 100644
--- a/Spigot-Server-Patches/0152-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0150-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 947accab1055de16aa50071129c49ad660672491 Mon Sep 17 00:00:00 2001
+From 6000f8d9744b00e80973c25ab50a4fbfe52eda28 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 20e25c2..d59c6cd 100644
+index ca63f0d..92d643a 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -203,9 +203,11 @@ public class DefinedStructure {
@@ -34,7 +34,7 @@ index 20e25c2..d59c6cd 100644
  
          public Iterator<IBlockData> iterator() {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index b2122a9..7545d60 100644
+index d2662ae..e6b79a5 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
diff --git a/Spigot-Server-Patches/0153-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0151-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 93%
rename from Spigot-Server-Patches/0153-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0151-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 3f60b9774c..63c72214bc 100644
--- a/Spigot-Server-Patches/0153-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0151-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From de73581742fc9d712a3678771c7ac2a3a5209afd Mon Sep 17 00:00:00 2001
+From 0b54e3df6edce5b98f2ea62790d0eb1f34e055b8 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/Spigot-Server-Patches/0154-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0152-More-informative-vehicle-moved-wrongly-message.patch
similarity index 91%
rename from Spigot-Server-Patches/0154-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0152-More-informative-vehicle-moved-wrongly-message.patch
index a1b6e362aa..22ca790e6f 100644
--- a/Spigot-Server-Patches/0154-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0152-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 2975f17e0c9b0cbc6dcf8e62ee5a1ef9feedeb73 Mon Sep 17 00:00:00 2001
+From 425bfeb499e1f29e74c49fca27ee75fbe7584ce5 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 00135cc..a78de71 100644
+index 3a99311..216f9d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -342,7 +342,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0155-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0153-Re-track-players-that-dismount-from-other-players.patch
similarity index 86%
rename from Spigot-Server-Patches/0155-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0153-Re-track-players-that-dismount-from-other-players.patch
index 5a1373f2f7..ac5ce5dbf9 100644
--- a/Spigot-Server-Patches/0155-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0153-Re-track-players-that-dismount-from-other-players.patch
@@ -1,14 +1,14 @@
-From 65fe44f929ec83d9ace94054c2ea9b4fea7f7290 Mon Sep 17 00:00:00 2001
+From 0c118bac13def5894ecd0de2da3c21e8e358728e 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 518283f..722367b 100644
+index 182c0bb..de2d439 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -632,6 +632,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -649,6 +649,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (entity1 != entity && this.playerConnection != null) {
              this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
          }
diff --git a/Spigot-Server-Patches/0156-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0154-Add-setting-for-proxy-online-mode-status.patch
similarity index 94%
rename from Spigot-Server-Patches/0156-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0154-Add-setting-for-proxy-online-mode-status.patch
index a3a7bb86d3..f82a8317f9 100644
--- a/Spigot-Server-Patches/0156-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0154-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From 78094035d641f06c1577126fe0a5e28101a82de4 Mon Sep 17 00:00:00 2001
+From 70af4f6d5854528247d6fa68445f7c926e73379f 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
@@ -33,10 +33,10 @@ index 2ff8a6d..52e7360 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 f107221..b24ed68 100644
+index 79ee561..326943d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1347,7 +1347,8 @@ public final class CraftServer implements Server {
+@@ -1335,7 +1335,8 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
diff --git a/Spigot-Server-Patches/0157-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0155-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 97%
rename from Spigot-Server-Patches/0157-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0155-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 1fc83f86bb..1ba28cb27c 100644
--- a/Spigot-Server-Patches/0157-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0155-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From b36278d8482f8e2ad609e67966a8acba61d90409 Mon Sep 17 00:00:00 2001
+From 607787d43c469d332ce9b605ab539ca4a0893cd0 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/Spigot-Server-Patches/0158-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0156-Disable-ticking-of-snow-blocks.patch
similarity index 94%
rename from Spigot-Server-Patches/0158-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0156-Disable-ticking-of-snow-blocks.patch
index 5d40597634..741b44805d 100644
--- a/Spigot-Server-Patches/0158-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0156-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From 3f339afac842c6557f2d5413e65520cf7f1a834f Mon Sep 17 00:00:00 2001
+From f4904a19ccbf2be223e4570817b311016e551776 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/Spigot-Server-Patches/0159-Convert-new-health-to-a-float-during-set.patch b/Spigot-Server-Patches/0157-Convert-new-health-to-a-float-during-set.patch
similarity index 94%
rename from Spigot-Server-Patches/0159-Convert-new-health-to-a-float-during-set.patch
rename to Spigot-Server-Patches/0157-Convert-new-health-to-a-float-during-set.patch
index 348890297f..617e48f802 100644
--- a/Spigot-Server-Patches/0159-Convert-new-health-to-a-float-during-set.patch
+++ b/Spigot-Server-Patches/0157-Convert-new-health-to-a-float-during-set.patch
@@ -1,4 +1,4 @@
-From 4c2a8f6a654bef3d63c3b05fb00bee8d4008fc5b Mon Sep 17 00:00:00 2001
+From 0dc7ffdb7fb618484810f936215f90ddfee961c7 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 1 Sep 2016 09:51:31 +0000
 Subject: [PATCH] Convert new health to a float during set
diff --git a/Spigot-Server-Patches/0160-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0158-Fix-AIOOBE-in-inventory-handling.patch
similarity index 85%
rename from Spigot-Server-Patches/0160-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0158-Fix-AIOOBE-in-inventory-handling.patch
index 29a8ab6555..d4a3555a15 100644
--- a/Spigot-Server-Patches/0160-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0158-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,14 +1,14 @@
-From 757065596779575a761dbef641c6681137cfd1ac Mon Sep 17 00:00:00 2001
+From 4ab54d15d2b56c57ade5c0211e7302e3aa0f1da3 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 a78de71..93e427b 100644
+index 216f9d0..b8b7142 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1798,7 +1798,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1805,7 +1805,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.c() == 2) {
                              click = ClickType.MIDDLE;
diff --git a/Spigot-Server-Patches/0161-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0159-Configurable-packet-in-spam-threshold.patch
similarity index 93%
rename from Spigot-Server-Patches/0161-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0159-Configurable-packet-in-spam-threshold.patch
index ccb442f9a8..63db5ca2d6 100644
--- a/Spigot-Server-Patches/0161-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0159-Configurable-packet-in-spam-threshold.patch
@@ -1,4 +1,4 @@
-From 52365310cbd9ae56ee0c8d3c2e1d982c5fb6cb54 Mon Sep 17 00:00:00 2001
+From 3d294e4801614aecabf8cdd51824c2d3dde56e69 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
@@ -23,10 +23,10 @@ index 91546b6..211b88a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 93e427b..b0de8c1 100644
+index b8b7142..9da3bc7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -855,13 +855,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -862,13 +862,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
diff --git a/Spigot-Server-Patches/0162-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0160-Configurable-flying-kick-messages.patch
similarity index 96%
rename from Spigot-Server-Patches/0162-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0160-Configurable-flying-kick-messages.patch
index 0929bb59a1..e2c6f9c1a2 100644
--- a/Spigot-Server-Patches/0162-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0160-Configurable-flying-kick-messages.patch
@@ -1,4 +1,4 @@
-From b98dae283d6664e510c3a228773269f0fe35ceee Mon Sep 17 00:00:00 2001
+From b2c3de274721f42c2d24cd152655e57232c62758 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
@@ -21,7 +21,7 @@ index 211b88a..3161dad 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b0de8c1..ae05dd8 100644
+index 9da3bc7..c57ab1a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -142,7 +142,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0163-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0161-Auto-Save-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0163-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0161-Auto-Save-Improvements.patch
index f03f8cb70c..9afebc2bff 100644
--- a/Spigot-Server-Patches/0163-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0161-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From f6f085b91684ff9af51b4eda4e829176022473dd Mon Sep 17 00:00:00 2001
+From dd5d1ed559dd433fe9651af7c83591e1a9b08efd 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
@@ -80,7 +80,7 @@ index 7a56a64..5c5a56c 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 968b0ec..683ace3 100644
+index 184cb72..b307b2b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -117,6 +117,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -122,7 +122,7 @@ index 968b0ec..683ace3 100644
          this.methodProfiler.a("tallying");
          this.h[this.ticks % 100] = System.nanoTime() - i;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f04486e..2ac1d74 100644
+index 5bf7df7..bfa87d7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1002,8 +1002,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0164-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0162-Chunk-registration-fixes.patch
similarity index 84%
rename from Spigot-Server-Patches/0164-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0162-Chunk-registration-fixes.patch
index b1784373a5..0c96678fd1 100644
--- a/Spigot-Server-Patches/0164-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0162-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 8c5a12dbae5e897671abbc9e4d47df08d0ed864a Mon Sep 17 00:00:00 2001
+From b54ce0d0711f6df62b08b6cb02c5837ea7ee3601 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,10 +8,10 @@ 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 498f7f7..caae311 100644
+index e833657..5d64d55 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1784,7 +1784,7 @@ public abstract class World implements IBlockAccess {
+@@ -1766,7 +1766,7 @@ public abstract class World implements IBlockAccess {
              }
  
              int k = MathHelper.floor(entity.locX / 16.0D);
diff --git a/Spigot-Server-Patches/0165-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0163-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 93%
rename from Spigot-Server-Patches/0165-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0163-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 5adb193b6b..c0ef006fc3 100644
--- a/Spigot-Server-Patches/0165-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0163-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From 062823349d1c7c2d979bc1dd58c555d31c3281cc Mon Sep 17 00:00:00 2001
+From 8ebea26c362ecf59f556a57c5cc27c5ffbb36408 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/Spigot-Server-Patches/0166-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0164-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 89%
rename from Spigot-Server-Patches/0166-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0164-Auto-fix-bad-Y-levels-on-player-login.patch
index d9976c108d..c8ed78c16d 100644
--- a/Spigot-Server-Patches/0166-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0164-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 975d1e30b6bc0a7822d57b05e674ac1e1c9970db Mon Sep 17 00:00:00 2001
+From e154ac33d32fa8d2f4d82281fcada3d6b738416d 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 722367b..e72d6bb 100644
+index de2d439..00fca19 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -126,6 +126,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0167-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0165-Raise-string-limit-for-packet-serialization.patch
similarity index 95%
rename from Spigot-Server-Patches/0167-Raise-string-limit-for-packet-serialization.patch
rename to Spigot-Server-Patches/0165-Raise-string-limit-for-packet-serialization.patch
index 0d25648a13..12e4c31efd 100644
--- a/Spigot-Server-Patches/0167-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0165-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From bf0f64529fc9a67c460a0e9d7b8a792f6c64cd67 Mon Sep 17 00:00:00 2001
+From ec45ece6dbc0adbc16b500c3ede7b8128383a782 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:54:20 -0400
 Subject: [PATCH] Raise string limit for packet serialization
diff --git a/Spigot-Server-Patches/0168-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0166-Disable-Vanilla-Chunk-GC.patch
similarity index 93%
rename from Spigot-Server-Patches/0168-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0166-Disable-Vanilla-Chunk-GC.patch
index 4e9cb4b9c6..60e96cee78 100644
--- a/Spigot-Server-Patches/0168-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0166-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 86471e6b7d50c7eaede6b71e0a41a5db85f796c1 Mon Sep 17 00:00:00 2001
+From 33d75f77d6a91694dea3eef2e927deace3cbf106 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 2ac1d74..4d4828a 100644
+index bfa87d7..be432ce 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1019,7 +1019,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0169-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0167-Option-to-remove-corrupt-tile-entities.patch
similarity index 96%
rename from Spigot-Server-Patches/0169-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0167-Option-to-remove-corrupt-tile-entities.patch
index be90bb9baa..0237b379fb 100644
--- a/Spigot-Server-Patches/0169-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0167-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From 52bcd237dd2f33a1d95ad2374913ac47072c48ea Mon Sep 17 00:00:00 2001
+From 1100761ef831d5b3c3a022991f858062cd1c33f6 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/Spigot-Server-Patches/0170-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0168-Add-EntityZapEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0170-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0168-Add-EntityZapEvent.patch
index 7192087fbc..a66e20d046 100644
--- a/Spigot-Server-Patches/0170-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0168-Add-EntityZapEvent.patch
@@ -1,14 +1,14 @@
-From e59da3c1ae54fc9575a8fe78b4e2e02911ef4aaf Mon Sep 17 00:00:00 2001
+From 6ed3e4050d429f36188a9ae13a421e172122719c 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 5279a60..c5f5b57 100644
+index 813e18b..691871b 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
-@@ -146,6 +146,12 @@ public class EntityPig extends EntityAnimal {
+@@ -158,6 +158,12 @@ public class EntityPig extends EntityAnimal {
          if (!this.world.isClientSide && !this.dead) {
              EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
  
@@ -22,7 +22,7 @@ index 5279a60..c5f5b57 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 a2e68c5..4a6b3da 100644
+index ee11691..4ad7546 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -616,6 +616,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
diff --git a/Spigot-Server-Patches/0171-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0169-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 94%
rename from Spigot-Server-Patches/0171-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0169-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 8ce98d0294..9b87fa1b01 100644
--- a/Spigot-Server-Patches/0171-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0169-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 4f4987f6b528ad216c6333f56420bea5c6f64ebd Mon Sep 17 00:00:00 2001
+From d156c65d1f6e36f3c12eaae2564a5b733decb10f 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 9d4c15f..9470dd6 100644
+index 9c4d1c9..dd1c1a3 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -339,7 +339,13 @@ public class BlockChest extends BlockTileEntity {
diff --git a/Spigot-Server-Patches/0172-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0170-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 97%
rename from Spigot-Server-Patches/0172-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0170-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 4dbc13c12e..c548417ec7 100644
--- a/Spigot-Server-Patches/0172-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0170-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 1d460293480cc0ff1c566c76030cb785237c6558 Mon Sep 17 00:00:00 2001
+From 270947537e25d82d761e7cd11ef51ad149306f6a 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
@@ -51,7 +51,7 @@ index 5c5a56c..b7afcb2 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ff7b406..2fbcf8d 100644
+index ef17262..9689e69 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -33,6 +33,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0173-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0171-Chunk-Save-Stats-Debug-Option.patch
similarity index 97%
rename from Spigot-Server-Patches/0173-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0171-Chunk-Save-Stats-Debug-Option.patch
index 5958be9a98..438de97578 100644
--- a/Spigot-Server-Patches/0173-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0171-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From dfe1497fc2ac075ba6d29fecdabe9c044e2be997 Mon Sep 17 00:00:00 2001
+From 8bb8f8bd55f712dd4285e2e735163dafc2adc4a5 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
@@ -55,7 +55,7 @@ index b7afcb2..3b82627 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 2fbcf8d..519c527 100644
+index 9689e69..eb6ded6 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -33,7 +33,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0174-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0172-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 94%
rename from Spigot-Server-Patches/0174-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0172-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index d7c53f361a..9640cf275a 100644
--- a/Spigot-Server-Patches/0174-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0172-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From d123edc59a7c7b62a20d7aeaa292b0e422806888 Mon Sep 17 00:00:00 2001
+From db92f996bf62c9b3e5d6627dd6628559d7c8d24b 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
@@ -22,7 +22,7 @@ index 4ad072a..73bf744 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index edc817a..df63f8f 100644
+index 8059e6d..a4f465e 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -251,6 +251,14 @@ public class EntityFallingBlock extends Entity {
@@ -41,10 +41,10 @@ index edc817a..df63f8f 100644
          Block block = this.block.getBlock();
  
 diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-index 69caabb..143b94f 100644
+index 1a01a57..f914ad4 100644
 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-@@ -103,7 +103,14 @@ public class ItemMonsterEgg extends Item {
+@@ -102,7 +102,14 @@ public class ItemMonsterEgg extends Item {
                  NBTTagCompound nbttagcompound1 = entity.e(new NBTTagCompound());
                  UUID uuid = entity.getUniqueID();
  
diff --git a/Spigot-Server-Patches/0175-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0173-Cache-user-authenticator-threads.patch
similarity index 97%
rename from Spigot-Server-Patches/0175-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0173-Cache-user-authenticator-threads.patch
index 0b92268d19..e048545a9c 100644
--- a/Spigot-Server-Patches/0175-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0173-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From b5dc2c592ec57e8974173e45eced1a439344d6ae Mon Sep 17 00:00:00 2001
+From ce8cd597317a3339b24a33890c3b6a0f096726ce 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/Spigot-Server-Patches/0176-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0174-Optimize-Network-Queue.patch
similarity index 91%
rename from Spigot-Server-Patches/0176-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0174-Optimize-Network-Queue.patch
index 091f8c9091..8d7a19182d 100644
--- a/Spigot-Server-Patches/0176-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0174-Optimize-Network-Queue.patch
@@ -1,11 +1,11 @@
-From 3fba45b9eb3981b09236148fdabed903902441c6 Mon Sep 17 00:00:00 2001
+From 333871348332318601fb1e6da93dd754b7afa538 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 683ace3..b4adf7e 100644
+index b307b2b..4ee102e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -102,7 +102,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
diff --git a/Spigot-Server-Patches/0177-Optimise-NetworkManager.patch b/Spigot-Server-Patches/0175-Optimise-NetworkManager.patch
similarity index 98%
rename from Spigot-Server-Patches/0177-Optimise-NetworkManager.patch
rename to Spigot-Server-Patches/0175-Optimise-NetworkManager.patch
index 6c3e2cac2e..8b001b5149 100644
--- a/Spigot-Server-Patches/0177-Optimise-NetworkManager.patch
+++ b/Spigot-Server-Patches/0175-Optimise-NetworkManager.patch
@@ -1,4 +1,4 @@
-From 309c65ed4c85fcef396a9760689b73fed7f3d30f Mon Sep 17 00:00:00 2001
+From 6bd399756bebc822f5e100617d1cb76b346d4516 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 20:35:05 +0000
 Subject: [PATCH] Optimise NetworkManager
diff --git a/Spigot-Server-Patches/0178-Optimise-removeQueue.patch b/Spigot-Server-Patches/0176-Optimise-removeQueue.patch
similarity index 91%
rename from Spigot-Server-Patches/0178-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0176-Optimise-removeQueue.patch
index 40f29d21bb..2b8d8de678 100644
--- a/Spigot-Server-Patches/0178-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0176-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From c09a7a1252ec41640f7b2db574506c408386a41d Mon Sep 17 00:00:00 2001
+From a6f36055caaf81e45853ce81401361fa9d4b4254 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 e72d6bb..3e81336 100644
+index 00fca19..523d916 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@@ -27,7 +27,7 @@ index e72d6bb..3e81336 100644
      private final ServerStatisticManager bU;
      private float bV = Float.MIN_VALUE;
      private int bW = Integer.MIN_VALUE;
-@@ -229,10 +231,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -246,10 +248,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              Iterator iterator = this.removeQueue.iterator();
              int j = 0;
  
@@ -46,7 +46,7 @@ index e72d6bb..3e81336 100644
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -969,7 +978,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -986,7 +995,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.lastSentExp = -1;
          this.lastHealthSent = -1.0F;
          this.cc = -1;
diff --git a/Spigot-Server-Patches/0179-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0177-Allow-Reloading-of-Command-Aliases.patch
similarity index 86%
rename from Spigot-Server-Patches/0179-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0177-Allow-Reloading-of-Command-Aliases.patch
index 353b861672..fd44f2b517 100644
--- a/Spigot-Server-Patches/0179-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0177-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 8d7a0fcafd8d44f7f731f8692c4604b5eaaeb09e Mon Sep 17 00:00:00 2001
+From e3099a832e5bcc6d28bb2e84ee485db989d2e2eb Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b24ed68..5559532 100644
+index 326943d..87ba9f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1861,5 +1861,15 @@ public final class CraftServer implements Server {
+@@ -1849,5 +1849,15 @@ public final class CraftServer implements Server {
          }
          return entity.getBukkitEntity();
      }
diff --git a/Spigot-Server-Patches/0180-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0178-Add-source-to-PlayerExpChangeEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0180-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0178-Add-source-to-PlayerExpChangeEvent.patch
index a72308d0b9..6345bf2d79 100644
--- a/Spigot-Server-Patches/0180-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0178-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From 6425ecdf2a259ee782ecf49027cb3e5cf17c74fb Mon Sep 17 00:00:00 2001
+From 14b344c4b3f5677c3c3f49258b6e60f7e23dc620 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 9da8ae4..11f3b31 100644
+index 4b38164..14431b8 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0182-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0179-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 89%
rename from Spigot-Server-Patches/0182-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0179-Optimize-World.isLoaded-BlockPosition-Z.patch
index 57561a8b92..b9bba7b96c 100644
--- a/Spigot-Server-Patches/0182-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0179-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 1dc1dbf8e9df3b78ca88142163f86d32db46574b Mon Sep 17 00:00:00 2001
+From e63ed90138fed92776e2b7ab5375cbd59d6145ba 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 cd127e9..d8c8ca0 100644
+index 5d64d55..11824ba 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -286,7 +286,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0181-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0180-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 64%
rename from Spigot-Server-Patches/0181-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0180-Speedup-BlockPos-by-fixing-inlining.patch
index 4c22e1e93c..082df91aa6 100644
--- a/Spigot-Server-Patches/0181-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0180-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 87622de2cffd52a880392eb3c7c861c7d07f1023 Mon Sep 17 00:00:00 2001
+From 6593c8f93e61d4081080be004a777d32bc20c332 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,10 +21,10 @@ 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 f772c7c..bfb47e4 100644
+index f772c7c..f5dc144 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-@@ -7,22 +7,23 @@ import javax.annotation.concurrent.Immutable;
+@@ -7,11 +7,12 @@ import javax.annotation.concurrent.Immutable;
  public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
  
      public static final BaseBlockPosition ZERO = new BaseBlockPosition(0, 0, 0);
@@ -33,75 +33,75 @@ index f772c7c..bfb47e4 100644
 -    private final int c;
 -    // Paper start
 -    public boolean isValidLocation() {
--        return a >= -30000000 && c >= -30000000 && a < 30000000 && c < 30000000 && b >= 0 && b < 256;
 +    // Paper start - Make mutable and protected for MutableBlockPos and PooledBlockPos
-+    protected int x;
-+    protected int y;
-+    protected int z;
++    protected int a;
++    protected int b;
++    protected int c;
 +
 +    public final boolean isValidLocation() {
-+        return x >= -30000000 && z >= -30000000 && x < 30000000 && z < 30000000 && y >= 0 && y < 256;
+         return a >= -30000000 && c >= -30000000 && a < 30000000 && c < 30000000 && b >= 0 && b < 256;
      }
      public boolean isInvalidYLocation() {
--        return b < 0 || b >= 256;
-+        return y < 0 || y >= 256;
-     }
-     // Paper end
- 
-     public BaseBlockPosition(int i, int j, int k) {
--        this.a = i;
--        this.b = j;
--        this.c = k;
-+        this.x = i;
-+        this.y = j;
-+        this.z = k;
-     }
- 
-     public BaseBlockPosition(double d0, double d1, double d2) {
 @@ -49,17 +50,19 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
          return this.getY() == baseblockposition.getY() ? (this.getZ() == baseblockposition.getZ() ? this.getX() - baseblockposition.getX() : this.getZ() - baseblockposition.getZ()) : this.getY() - baseblockposition.getY();
      }
  
 -    public int getX() {
--        return this.a;
 +    // Paper start - Only allow a single implementation
 +    public final int getX() {
-+        return this.x;
+         return this.a;
      }
  
 -    public int getY() {
--        return this.b;
 +    public final int getY() {
-+        return this.y;
+         return this.b;
      }
  
 -    public int getZ() {
--        return this.c;
 +    public final int getZ() {
-+        return this.z;
+         return this.c;
      }
 +    // Paper end
  
      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 6c14061..9757f09 100644
+index b3c1f55..6f6eef9 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
-@@ -254,9 +254,9 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -211,19 +211,21 @@ public class BlockPosition extends BaseBlockPosition {
+                         if (this.b == null) {
+                             this.b = new BlockPosition.MutableBlockPosition(i, j, k);
+                             return this.b;
+-                        } else if (this.b.b == l && this.b.c == i1 && this.b.d == j1) {
++                        // Paper start - b, c, d, refer to x, y, z, and as such, a, b, c of BaseBlockPosition
++                        } else if (((BaseBlockPosition)this.b).a == l && ((BaseBlockPosition)this.b).b == i1 && ((BaseBlockPosition)this.b).c == j1) {
+                             return (BlockPosition.MutableBlockPosition) this.endOfData();
+                         } else {
+-                            if (this.b.b < l) {
+-                                ++this.b.b;
+-                            } else if (this.b.c < i1) {
+-                                this.b.b = i;
+-                                ++this.b.c;
+-                            } else if (this.b.d < j1) {
+-                                this.b.b = i;
+-                                this.b.c = j;
+-                                ++this.b.d;
++                            if (((BaseBlockPosition)this.b).a < l) {
++                                ++((BaseBlockPosition)this.b).a;
++                            } else if (((BaseBlockPosition)this.b).b < i1) {
++                                ((BaseBlockPosition)this.b).a = i;
++                                ++((BaseBlockPosition)this.b).b;
++                            } else if (((BaseBlockPosition)this.b).c < j1) {
++                                ((BaseBlockPosition) this.b).a = i;
++                                ((BaseBlockPosition) this.b).b = j;
++                                ++((BaseBlockPosition) this.b).c;
                              }
-                             // Paper end
++                            // Paper end
  
--                            this.b.b = i;
--                            this.b.c = j;
--                            this.b.d = k;
-+                            ((BaseBlockPosition) this.b).x = i;
-+                            ((BaseBlockPosition) this.b).y = j;
-+                            ((BaseBlockPosition) this.b).z = k;
                              return this.b;
                          }
-                     }
-@@ -370,6 +370,8 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -338,6 +340,8 @@ public class BlockPosition extends BaseBlockPosition {
  
      public static class MutableBlockPosition extends BlockPosition {
  
@@ -110,7 +110,7 @@ index 6c14061..9757f09 100644
          protected int b;
          protected int c;
          protected int d;
-@@ -382,6 +384,7 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -350,6 +354,7 @@ public class BlockPosition extends BaseBlockPosition {
          public boolean isInvalidYLocation() {
              return c < 0 || c >= 256;
          }
@@ -118,7 +118,7 @@ index 6c14061..9757f09 100644
          // Paper end
  
          public MutableBlockPosition() {
-@@ -394,9 +397,11 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -362,9 +367,11 @@ public class BlockPosition extends BaseBlockPosition {
  
          public MutableBlockPosition(int i, int j, int k) {
              super(0, 0, 0);
@@ -126,14 +126,14 @@ index 6c14061..9757f09 100644
 -            this.c = j;
 -            this.d = k;
 +            // Paper start - Modify base position variables
-+            ((BaseBlockPosition) this).x = i;
-+            ((BaseBlockPosition) this).y = j;
-+            ((BaseBlockPosition) this).z = k;
++            ((BaseBlockPosition) this).a = i;
++            ((BaseBlockPosition) this).b = j;
++            ((BaseBlockPosition) this).c = k;
 +            // Paper end
          }
  
          public BlockPosition a(double d0, double d1, double d2) {
-@@ -415,6 +420,8 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -383,6 +390,8 @@ public class BlockPosition extends BaseBlockPosition {
              return super.a(enumblockrotation).h();
          }
  
@@ -142,7 +142,7 @@ index 6c14061..9757f09 100644
          public int getX() {
              return this.b;
          }
-@@ -426,12 +433,16 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -394,12 +403,16 @@ public class BlockPosition extends BaseBlockPosition {
          public int getZ() {
              return this.d;
          }
@@ -155,14 +155,14 @@ index 6c14061..9757f09 100644
 -            this.c = j;
 -            this.d = k;
 +            // Paper start - Modify base position variables
-+            ((BaseBlockPosition) this).x = i;
-+            ((BaseBlockPosition) this).y = j;
-+            ((BaseBlockPosition) this).z = k;
++            ((BaseBlockPosition) this).a = i;
++            ((BaseBlockPosition) this).b = j;
++            ((BaseBlockPosition) this).c = k;
 +            // Paper end
              return this;
          }
  
-@@ -448,11 +459,11 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -416,11 +429,11 @@ public class BlockPosition extends BaseBlockPosition {
          }
  
          public BlockPosition.MutableBlockPosition c(EnumDirection enumdirection, int i) {
@@ -172,7 +172,7 @@ index 6c14061..9757f09 100644
  
          public void p(int i) {
 -            this.c = i;
-+            ((BaseBlockPosition) this).y = i; // Paper - Modify base variable
++            ((BaseBlockPosition) this).b = i; // Paper - Modify base variable
          }
  
          public BlockPosition h() {
diff --git a/Spigot-Server-Patches/0183-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0181-Don-t-let-fishinghooks-use-portals.patch
similarity index 83%
rename from Spigot-Server-Patches/0183-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0181-Don-t-let-fishinghooks-use-portals.patch
index 5d43f985e2..3907c4bc22 100644
--- a/Spigot-Server-Patches/0183-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0181-Don-t-let-fishinghooks-use-portals.patch
@@ -1,14 +1,14 @@
-From 930615771bf5693250b512cc194c239d69198b08 Mon Sep 17 00:00:00 2001
+From 00bf7d4060fd4642d356819568af3f9ebb400564 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 7de4b5b..79bbc8e 100644
+index 26ab72c..b278f18 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -142,7 +142,7 @@ public abstract class Entity implements ICommandListener {
+@@ -143,7 +143,7 @@ public abstract class Entity implements ICommandListener {
      public boolean ah;
      public boolean impulse;
      public int portalCooldown;
@@ -18,10 +18,10 @@ index 7de4b5b..79bbc8e 100644
      public int dimension;
      protected BlockPosition an;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 96c3d66..5a8ab54 100644
+index 0c528c6..606160a 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
-@@ -175,6 +175,12 @@ public class EntityFishingHook extends Entity {
+@@ -185,6 +185,12 @@ public class EntityFishingHook extends Entity {
              this.motY *= 0.92D;
              this.motZ *= 0.92D;
              this.setPosition(this.locX, this.locY, this.locZ);
diff --git a/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0182-Add-ProjectileCollideEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0182-Add-ProjectileCollideEvent.patch
index 0c7f800f40..6cd6ed87e2 100644
--- a/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0182-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 0c01da83c0c8d228c09d21e987401ebff2666725 Mon Sep 17 00:00:00 2001
+From 9bdcb0cae331dd9dd53a4718350f8e8ab9b4dd4f Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 4b01cc0..0c8597d 100644
+index 8cda475..79ca071 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -45,10 +45,10 @@ index 789de85..d5c9d24 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 5a8ab54..9e09b14 100644
+index 606160a..b78e0e4 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
-@@ -230,6 +230,16 @@ public class EntityFishingHook extends Entity {
+@@ -240,6 +240,16 @@ public class EntityFishingHook extends Entity {
  
          vec3d = new Vec3D(this.locX, this.locY, this.locZ);
          vec3d1 = new Vec3D(this.locX + this.motX, this.locY + this.motY, this.locZ + this.motZ);
diff --git a/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0183-Vanished-players-don-t-have-rights.patch
similarity index 94%
rename from Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0183-Vanished-players-don-t-have-rights.patch
index eb35cec3a9..d0ffbe732b 100644
--- a/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0183-Vanished-players-don-t-have-rights.patch
@@ -1,14 +1,14 @@
-From 569bc3d87de11c7857fc9cb17422b6699a76c5e2 Mon Sep 17 00:00:00 2001
+From 66c5ebb38b7af48e9e573cdad699574000ebdda3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 79bbc8e..a6c806b 100644
+index b278f18..1600997 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -67,7 +67,7 @@ public abstract class Entity implements ICommandListener {
+@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
      private static double f = 1.0D;
      private static int entityCount;
      private int id;
@@ -31,10 +31,10 @@ index eb32871..a380e61 100644
              IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cacdafe..02f2bdc 100644
+index 11824ba..66828f9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1820,6 +1820,33 @@ public abstract class World implements IBlockAccess {
+@@ -1802,6 +1802,33 @@ public abstract class World implements IBlockAccess {
          return this.a(axisalignedbb, (Entity) null);
      }
  
@@ -68,7 +68,7 @@ index cacdafe..02f2bdc 100644
      public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
          List list = this.getEntities((Entity) null, axisalignedbb);
  
-@@ -2704,7 +2731,7 @@ public abstract class World implements IBlockAccess {
+@@ -2686,7 +2713,7 @@ public abstract class World implements IBlockAccess {
          AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().c(this, blockposition);
  
          // CraftBukkit start - store default return
diff --git a/Spigot-Server-Patches/0186-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0184-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 93%
rename from Spigot-Server-Patches/0186-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0184-Prevent-Pathfinding-out-of-World-Border.patch
index 39547c4d03..d794ffcf2e 100644
--- a/Spigot-Server-Patches/0186-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0184-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From ca15bd658a68075f26bd4c3e72404098614579ed Mon Sep 17 00:00:00 2001
+From b4666a298506e14b79e6ef8cabd09b7fc332f14a 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 c0ef2400b..74d1fd6b2 100644
+index c0ef240..74d1fd6 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
@@ -26,7 +26,7 @@ index c0ef2400b..74d1fd6b2 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 9038d52eb..632eb1c9d 100644
+index 9038d52..632eb1c 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 {
@@ -39,5 +39,5 @@ index 9038d52eb..632eb1c9d 100644
      }
  
 -- 
-2.11.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0187-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch b/Spigot-Server-Patches/0185-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
similarity index 93%
rename from Spigot-Server-Patches/0187-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
rename to Spigot-Server-Patches/0185-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
index 5599a21029..0869d0fb99 100644
--- a/Spigot-Server-Patches/0187-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
+++ b/Spigot-Server-Patches/0185-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch
@@ -1,4 +1,4 @@
-From 3a254afb4fdeca00e5807e50eea6384e76969546 Mon Sep 17 00:00:00 2001
+From 9e85bec82e6b9e681153c8ed97bdeac3e3f61b0d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:38:57 -0500
 Subject: [PATCH] Ignore invalid Marker Icon ID's in maps
@@ -6,7 +6,7 @@ Subject: [PATCH] Ignore invalid Marker Icon ID's in maps
 Replace with the red marker. Should of only happened by creative abuse.
 
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index dbe6a80f2..dfd8e4d84 100644
+index dbe6a80..dfd8e4d 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -194,7 +194,11 @@ public class WorldMap extends PersistentBase {
@@ -23,5 +23,5 @@ index dbe6a80f2..dfd8e4d84 100644
                  }
              }
 -- 
-2.11.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0188-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0186-Bound-Treasure-Maps-to-World-Border.patch
similarity index 94%
rename from Spigot-Server-Patches/0188-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0186-Bound-Treasure-Maps-to-World-Border.patch
index fefbd3b920..33e3b817b0 100644
--- a/Spigot-Server-Patches/0188-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0186-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From 88232050bb78c98f3d59307724cc71f3983d1424 Mon Sep 17 00:00:00 2001
+From 3973a234a54d46a8c925e2fc4fdafab7e205d5b5 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 9c1605b14..b566d5eee 100644
+index 9c1605b..b566d5e 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -233,6 +233,9 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -25,7 +25,7 @@ index 9c1605b14..b566d5eee 100644
                              if (!flag1 || !world.b(l2, i3)) {
                                  return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 632eb1c9d..1bb172bbf 100644
+index 632eb1c..1bb172b 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 {
@@ -48,5 +48,5 @@ index 632eb1c9d..1bb172bbf 100644
          return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
      }
 -- 
-2.11.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0189-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0187-Configurable-Cartographer-Treasure-Maps.patch
similarity index 94%
rename from Spigot-Server-Patches/0189-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0187-Configurable-Cartographer-Treasure-Maps.patch
index fa909e4935..28d52d2115 100644
--- a/Spigot-Server-Patches/0189-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0187-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 038707bc4a005f8f2d465a48ea4144cd3d41b058 Mon Sep 17 00:00:00 2001
+From 323a4f68296eb3449642cc7dbb14e5b3e5a30518 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 73bf74422..a655b3310 100644
+index 73bf744..a655b33 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -399,4 +399,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 73bf74422..a655b3310 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 4a6b3da1b..35675d9a5 100644
+index 4ad7546..ac6e2a9 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -761,7 +761,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -42,5 +42,5 @@ index 4a6b3da1b..35675d9a5 100644
              if (blockposition != null) {
                  ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.11.0
+2.9.3
 
diff --git a/work/BuildData b/work/BuildData
index 77931c01e7..bc05720eba 160000
--- a/work/BuildData
+++ b/work/BuildData
@@ -1 +1 @@
-Subproject commit 77931c01e72ff84c004a310b121a72b52f0efdd5
+Subproject commit bc05720eba5ca92c3f0da3b21314876c509111a1
diff --git a/work/Bukkit b/work/Bukkit
index 55fa63e8b9..506e941126 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 55fa63e8b9c8f5f315f3d631fad2096a008074df
+Subproject commit 506e9411267240a81a016a47b2c093bedad50a81
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c8ff65136f..8ea0c87f51 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c8ff65136f23a3c2770b8d9ca508f61927f8acba
+Subproject commit 8ea0c87f515290c35baf0029f7b2e046c1ff49cb
diff --git a/work/Spigot b/work/Spigot
index 6f7aabf0f7..9deaa4c15e 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 6f7aabf0f73188de2433ec4570412235772f8fba
+Subproject commit 9deaa4c15ed177075d5b3906878a888571ab1a5e