From b170e8cedbfc5abbbd03f5620dd777ada1d0cb2b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 27 Aug 2016 18:41:58 -0500
Subject: [PATCH] Update upstream B/CB/S

Remove two features added upstream
---
 Spigot-API-Patches/0003-Timings-v2.patch      |  30 +-
 ...port-to-tab-completers-vanilla-featu.patch | 169 --------
 ...ade-EntityDismountEvent-Cancellable.patch} |   4 +-
 ...y-disable-plugins-that-fail-to-load.patch} |   8 +-
 ...ch => 0015-Expose-server-CommandMap.patch} |   4 +-
 ...ord-chat-API-from-spigot-subclasses.patch} |   4 +-
 ...0017-Player-Tab-List-and-Title-APIs.patch} |   4 +-
 ... 0018-Add-exception-reporting-event.patch} |   8 +-
 ...rverListPingEvent-flagging-as-Async.patch} |   4 +-
 ...-sendMessage-methods-to-CommandSend.patch} |   4 +-
 ...orking-with-arrows-stuck-in-living-.patch} |   2 +-
 ... => 0022-Complete-resource-pack-API.patch} |   4 +-
 ...=> 0023-Use-ASM-for-event-executors.patch} |  10 +-
 ... => 0024-Add-a-call-helper-to-Event.patch} |   4 +-
 ...er-name-to-commands.yml-replacement.patch} |   4 +-
 ...load-permissions.yml-and-require-co.patch} |  10 +-
 ...-Custom-replacement-for-eaten-items.patch} |   4 +-
 ... 0028-Access-items-by-EquipmentSlot.patch} |   4 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |   4 +-
 ...t.patch => 0030-EntityPathfindEvent.patch} |   4 +-
 ...ynchronization-in-MetadataStoreBase.patch} |   4 +-
 ...-MetadataStoreBase.removeAll-Plugin.patch} |   4 +-
 ...h => 0033-Add-getEntity-by-UUID-API.patch} |   8 +-
 ...034-Add-PlayerUseUnknownEntityEvent.patch} |   4 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |   4 +-
 ...patch => 0036-Arrow-pickup-rule-API.patch} |   4 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |   4 +-
 ...ble-API.patch => 0038-LootTable-API.patch} |   4 +-
 .../0002-Paper-config-files.patch             |  10 +-
 Spigot-Server-Patches/0005-Timings-v2.patch   | 361 +-----------------
 ...ient-crashes-server-lists-and-Mojang.patch |  10 +-
 ...023-Further-improve-server-tick-loop.patch |   8 +-
 .../0031-Lighting-Queue.patch                 |  18 +-
 .../0035-Generator-Settings.patch             |  10 +-
 ...55-Ensure-commands-are-not-ran-async.patch |  10 +-
 ...port-to-tab-completers-vanilla-featu.patch | 160 --------
 ....patch => 0057-Optimize-Pathfinding.patch} |   4 +-
 ...pper-searches-if-there-are-no-items.patch} |   4 +-
 ...ch => 0059-Expose-server-CommandMap.patch} |   6 +-
 ...-informative-in-maxHealth-exception.patch} |   4 +-
 ...ord-chat-API-from-spigot-subclasses.patch} |   8 +-
 ...0062-Player-Tab-List-and-Title-APIs.patch} |   6 +-
 ...> 0063-Ensure-inv-drag-is-in-bounds.patch} |   2 +-
 ...ntation-of-tile-entity-removal-list.patch} |   2 +-
 ...d-configurable-portal-search-radius.patch} |  12 +-
 ...patch => 0066-Add-velocity-warnings.patch} |   6 +-
 ...-inter-world-teleportation-glitches.patch} |  10 +-
 ... 0068-Add-exception-reporting-event.patch} |   4 +-
 ...don-t-need-to-when-cerealising-text.patch} |   4 +-
 ...reboards-for-non-players-by-default.patch} |   6 +-
 ...orking-with-arrows-stuck-in-living-.patch} |   2 +-
 ... => 0072-Complete-resource-pack-API.patch} |   6 +-
 ... 0073-Chunk-save-queue-improvements.patch} |  25 +-
 ....patch => 0074-Chunk-Save-Reattempt.patch} |   4 +-
 ...ding-permissions.yml-before-plugins.patch} |  10 +-
 ...low-Reloading-of-Custom-Permissions.patch} |   6 +-
 ...h => 0077-Remove-Metadata-on-reload.patch} |   8 +-
 ...patch => 0078-Undead-horse-leashing.patch} |   8 +-
 ...h => 0079-Fix-Furnace-cook-time-bug.patch} |   4 +-
 ...80-Handle-Item-Meta-Inconsistencies.patch} |   4 +-
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |   8 +-
 ...atch => 0082-Add-World-Util-Methods.patch} |   4 +-
 ...3-Optimized-Light-Level-Comparisons.patch} |   4 +-
 ...0084-Pass-world-to-Village-creation.patch} |   4 +-
 ...-Custom-replacement-for-eaten-items.patch} |   4 +-
 ... 0086-Set-health-before-death-event.patch} |   4 +-
 ...h-absorb-values-and-repair-bad-data.patch} |   6 +-
 ...tch-Async-PlayerChunkMap-operations.patch} |   2 +-
 ...e-mode-in-whitelist-command-as-well.patch} |   4 +-
 ...tch => 0090-Fix-SkullCache-case-bug.patch} |   4 +-
 ...ch => 0091-Waving-banner-workaround.patch} |   4 +-
 ...92-Use-a-Shared-Random-for-Entities.patch} |   2 +-
 ...> 0093-Don-t-teleport-dead-entities.patch} |   2 +-
 ...patch => 0094-Optimize-Chunk-Access.patch} |   4 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |   8 +-
 ...ocation-getType-and-getBlockData-fo.patch} |   4 +-
 ...-correct-item-in-arrow-pickup-event.patch} |   4 +-
 ... 0098-Fix-cooked-fish-legacy-import.patch} |   4 +-
 ...infinite-loop-in-BlockPosition-iter.patch} |   4 +-
 ... 0100-Access-items-by-EquipmentSlot.patch} |   4 +-
 ...eck-async-remove-unused-vars-GH-159.patch} |   4 +-
 ...able-BlockPhysicsEvent-for-Redstone.patch} |   8 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |   4 +-
 ...-Configurable-Chunk-Inhabited-Timer.patch} |  12 +-
 ...t.patch => 0105-EntityPathfindEvent.patch} |   4 +-
 ...-BlockFromToEvent-from-loading-chun.patch} |   4 +-
 ... 0107-Minecart-drop-name-workaround.patch} |   4 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |   4 +-
 ...gionFileCache-and-make-configurable.patch} |   4 +-
 ...h => 0110-Add-getEntity-by-UUID-API.patch} |  10 +-
 ...h => 0111-Use-Optimized-Collections.patch} |   4 +-
 ...Do-not-load-chunks-for-light-checks.patch} |   4 +-
 ...113-Add-PlayerUseUnknownEntityEvent.patch} |   4 +-
 ...DebugInfo-not-initialized-on-client.patch} |   6 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |   8 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  12 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |   4 +-
 ...m-reload-spawn-chunks-in-nether-end.patch} |   4 +-
 ...9-Remove-Debug-checks-from-DataBits.patch} |   4 +-
 ...illa-per-world-scoreboard-coloring-.patch} |   6 +-
 ...d-for-setting-passengers-on-players.patch} |   6 +-
 ...e-PlayerConnection-on-teleporting-p.patch} |   2 +-
 ...emove-unused-World-Tile-Entity-List.patch} |   4 +-
 ... 0124-Don-t-tick-Skulls-unused-code.patch} |   4 +-
 ... 0125-Configurable-Player-Collision.patch} |   4 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |   4 +-
 ...players-not-being-kicked-on-shutdown.patch |  27 --
 ...mobs-should-only-spawn-in-the-water.patch} |   4 +-
 ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} |   4 +-
 ...> 0129-Configurable-RCON-IP-address.patch} |   4 +-
 ...30-Prevent-Fire-from-loading-chunks.patch} |   4 +-
 ...1-Implement-PlayerLocaleChangeEvent.patch} |   6 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |   4 +-
 ...to-configure-frosted_ice-properties.patch} |   8 +-
 ...-Vehicle-Event-Cancellation-Changes.patch} |   2 +-
 ...patch => 0135-Arrow-pickup-rule-API.patch} |   4 +-
 ...dispenser-dropper-furnace-placement.patch} |   4 +-
 ...mprove-Minecraft-Hopper-Performance.patch} |   2 +-
 ...possibility-for-getServer-singleton.patch} |   6 +-
 ...tem-frames-performance-and-bug-fixe.patch} |   2 +-
 ...API-Replenishable-Lootables-Feature.patch} |   6 +-
 ...-Do-not-load-chunks-for-pathfinding.patch} |   4 +-
 ...> 0142-Entity-Tracking-Improvements.patch} |   2 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |   4 +-
 ...unks-as-active-for-neighbor-updates.patch} |  12 +-
 ... 0145-Fix-Chunk-Unload-Queue-Issues.patch} |   2 +-
 ...em-property-for-disabling-watchdoge.patch} |   4 +-
 ...mize-EAR.patch => 0147-Optimize-EAR.patch} |   4 +-
 ...0148-Optimize-UserCache-Thread-Safe.patch} |   6 +-
 ...locking-on-Network-Manager-creation.patch} |   2 +-
 ...0-Optional-old-TNT-cannon-behaviors.patch} |   8 +-
 ...-redstone-torch-rapid-clock-removal.patch} |   2 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |   8 +-
 ...h => 0153-Add-server-name-parameter.patch} |   4 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |   4 +-
 ...FallingBlocks-being-stuck-on-fences.patch} |   8 +-
 ...0156-Make-entities-look-for-hoppers.patch} |   6 +-
 ...rom-the-correct-hand-when-spawn-egg.patch} |   2 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |   6 +-
 ... 0159-Toggleable-Elytra-Wall-Damage.patch} |   8 +-
 ...=> 0160-Fix-Double-World-Add-issues.patch} |  10 +-
 ...tch => 0161-Fix-Old-Sign-Conversion.patch} |   4 +-
 ...ix-TileEntities-as-they-are-removed.patch} |   4 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |   4 +-
 ...ative-vehicle-moved-wrongly-message.patch} |   2 +-
 ...rs-that-dismount-from-other-players.patch} |   4 +-
 ...etting-for-proxy-online-mode-status.patch} |   6 +-
 ...> 0167-Optimise-hashCode-and-equals.patch} |   2 +-
 work/Bukkit                                   |   2 +-
 work/CraftBukkit                              |   2 +-
 work/Spigot                                   |   2 +-
 151 files changed, 420 insertions(+), 1094 deletions(-)
 delete mode 100644 Spigot-API-Patches/0013-Add-Location-support-to-tab-completers-vanilla-featu.patch
 rename Spigot-API-Patches/{0014-Made-EntityDismountEvent-Cancellable.patch => 0013-Made-EntityDismountEvent-Cancellable.patch} (94%)
 rename Spigot-API-Patches/{0015-Automatically-disable-plugins-that-fail-to-load.patch => 0014-Automatically-disable-plugins-that-fail-to-load.patch} (84%)
 rename Spigot-API-Patches/{0016-Expose-server-CommandMap.patch => 0015-Expose-server-CommandMap.patch} (96%)
 rename Spigot-API-Patches/{0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch => 0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch} (97%)
 rename Spigot-API-Patches/{0018-Player-Tab-List-and-Title-APIs.patch => 0017-Player-Tab-List-and-Title-APIs.patch} (99%)
 rename Spigot-API-Patches/{0019-Add-exception-reporting-event.patch => 0018-Add-exception-reporting-event.patch} (99%)
 rename Spigot-API-Patches/{0020-Fix-ServerListPingEvent-flagging-as-Async.patch => 0019-Fix-ServerListPingEvent-flagging-as-Async.patch} (96%)
 rename Spigot-API-Patches/{0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch => 0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch} (96%)
 rename Spigot-API-Patches/{0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (93%)
 rename Spigot-API-Patches/{0023-Complete-resource-pack-API.patch => 0022-Complete-resource-pack-API.patch} (98%)
 rename Spigot-API-Patches/{0024-Use-ASM-for-event-executors.patch => 0023-Use-ASM-for-event-executors.patch} (98%)
 rename Spigot-API-Patches/{0025-Add-a-call-helper-to-Event.patch => 0024-Add-a-call-helper-to-Event.patch} (93%)
 rename Spigot-API-Patches/{0026-Add-sender-name-to-commands.yml-replacement.patch => 0025-Add-sender-name-to-commands.yml-replacement.patch} (95%)
 rename Spigot-API-Patches/{0027-Add-command-to-reload-permissions.yml-and-require-co.patch => 0026-Add-command-to-reload-permissions.yml-and-require-co.patch} (96%)
 rename Spigot-API-Patches/{0028-Custom-replacement-for-eaten-items.patch => 0027-Custom-replacement-for-eaten-items.patch} (95%)
 rename Spigot-API-Patches/{0029-Access-items-by-EquipmentSlot.patch => 0028-Access-items-by-EquipmentSlot.patch} (93%)
 rename Spigot-API-Patches/{0030-Entity-AddTo-RemoveFrom-World-Events.patch => 0029-Entity-AddTo-RemoveFrom-World-Events.patch} (96%)
 rename Spigot-API-Patches/{0031-EntityPathfindEvent.patch => 0030-EntityPathfindEvent.patch} (96%)
 rename Spigot-API-Patches/{0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch => 0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch} (98%)
 rename Spigot-API-Patches/{0033-Add-MetadataStoreBase.removeAll-Plugin.patch => 0032-Add-MetadataStoreBase.removeAll-Plugin.patch} (94%)
 rename Spigot-API-Patches/{0034-Add-getEntity-by-UUID-API.patch => 0033-Add-getEntity-by-UUID-API.patch} (90%)
 rename Spigot-API-Patches/{0035-Add-PlayerUseUnknownEntityEvent.patch => 0034-Add-PlayerUseUnknownEntityEvent.patch} (95%)
 rename Spigot-API-Patches/{0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (98%)
 rename Spigot-API-Patches/{0037-Arrow-pickup-rule-API.patch => 0036-Arrow-pickup-rule-API.patch} (93%)
 rename Spigot-API-Patches/{0038-EntityRegainHealthEvent-isFastRegen-API.patch => 0037-EntityRegainHealthEvent-isFastRegen-API.patch} (95%)
 rename Spigot-API-Patches/{0039-LootTable-API.patch => 0038-LootTable-API.patch} (99%)
 delete mode 100644 Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch
 rename Spigot-Server-Patches/{0058-Optimize-Pathfinding.patch => 0057-Optimize-Pathfinding.patch} (95%)
 rename Spigot-Server-Patches/{0059-Avoid-hopper-searches-if-there-are-no-items.patch => 0058-Avoid-hopper-searches-if-there-are-no-items.patch} (98%)
 rename Spigot-Server-Patches/{0060-Expose-server-CommandMap.patch => 0059-Expose-server-CommandMap.patch} (77%)
 rename Spigot-Server-Patches/{0061-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0060-Be-a-bit-more-informative-in-maxHealth-exception.patch} (92%)
 rename Spigot-Server-Patches/{0062-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch => 0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch} (90%)
 rename Spigot-Server-Patches/{0063-Player-Tab-List-and-Title-APIs.patch => 0062-Player-Tab-List-and-Title-APIs.patch} (98%)
 rename Spigot-Server-Patches/{0064-Ensure-inv-drag-is-in-bounds.patch => 0063-Ensure-inv-drag-is-in-bounds.patch} (93%)
 rename Spigot-Server-Patches/{0065-Change-implementation-of-tile-entity-removal-list.patch => 0064-Change-implementation-of-tile-entity-removal-list.patch} (98%)
 rename Spigot-Server-Patches/{0066-Add-configurable-portal-search-radius.patch => 0065-Add-configurable-portal-search-radius.patch} (88%)
 rename Spigot-Server-Patches/{0067-Add-velocity-warnings.patch => 0066-Add-velocity-warnings.patch} (91%)
 rename Spigot-Server-Patches/{0068-Fix-inter-world-teleportation-glitches.patch => 0067-Fix-inter-world-teleportation-glitches.patch} (92%)
 rename Spigot-Server-Patches/{0069-Add-exception-reporting-event.patch => 0068-Add-exception-reporting-event.patch} (99%)
 rename Spigot-Server-Patches/{0070-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (94%)
 rename Spigot-Server-Patches/{0071-Disable-Scoreboards-for-non-players-by-default.patch => 0070-Disable-Scoreboards-for-non-players-by-default.patch} (94%)
 rename Spigot-Server-Patches/{0072-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (96%)
 rename Spigot-Server-Patches/{0073-Complete-resource-pack-API.patch => 0072-Complete-resource-pack-API.patch} (96%)
 rename Spigot-Server-Patches/{0074-Chunk-save-queue-improvements.patch => 0073-Chunk-save-queue-improvements.patch} (90%)
 rename Spigot-Server-Patches/{0075-Chunk-Save-Reattempt.patch => 0074-Chunk-Save-Reattempt.patch} (96%)
 rename Spigot-Server-Patches/{0076-Default-loading-permissions.yml-before-plugins.patch => 0075-Default-loading-permissions.yml-before-plugins.patch} (91%)
 rename Spigot-Server-Patches/{0077-Allow-Reloading-of-Custom-Permissions.patch => 0076-Allow-Reloading-of-Custom-Permissions.patch} (88%)
 rename Spigot-Server-Patches/{0078-Remove-Metadata-on-reload.patch => 0077-Remove-Metadata-on-reload.patch} (84%)
 rename Spigot-Server-Patches/{0079-Undead-horse-leashing.patch => 0078-Undead-horse-leashing.patch} (89%)
 rename Spigot-Server-Patches/{0080-Fix-Furnace-cook-time-bug.patch => 0079-Fix-Furnace-cook-time-bug.patch} (93%)
 rename Spigot-Server-Patches/{0081-Handle-Item-Meta-Inconsistencies.patch => 0080-Handle-Item-Meta-Inconsistencies.patch} (99%)
 rename Spigot-Server-Patches/{0082-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (91%)
 rename Spigot-Server-Patches/{0083-Add-World-Util-Methods.patch => 0082-Add-World-Util-Methods.patch} (97%)
 rename Spigot-Server-Patches/{0084-Optimized-Light-Level-Comparisons.patch => 0083-Optimized-Light-Level-Comparisons.patch} (99%)
 rename Spigot-Server-Patches/{0085-Pass-world-to-Village-creation.patch => 0084-Pass-world-to-Village-creation.patch} (94%)
 rename Spigot-Server-Patches/{0086-Custom-replacement-for-eaten-items.patch => 0085-Custom-replacement-for-eaten-items.patch} (95%)
 rename Spigot-Server-Patches/{0087-Set-health-before-death-event.patch => 0086-Set-health-before-death-event.patch} (95%)
 rename Spigot-Server-Patches/{0088-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (95%)
 rename Spigot-Server-Patches/{0089-Catch-Async-PlayerChunkMap-operations.patch => 0088-Catch-Async-PlayerChunkMap-operations.patch} (93%)
 rename Spigot-Server-Patches/{0090-Support-offline-mode-in-whitelist-command-as-well.patch => 0089-Support-offline-mode-in-whitelist-command-as-well.patch} (98%)
 rename Spigot-Server-Patches/{0091-Fix-SkullCache-case-bug.patch => 0090-Fix-SkullCache-case-bug.patch} (92%)
 rename Spigot-Server-Patches/{0092-Waving-banner-workaround.patch => 0091-Waving-banner-workaround.patch} (94%)
 rename Spigot-Server-Patches/{0093-Use-a-Shared-Random-for-Entities.patch => 0092-Use-a-Shared-Random-for-Entities.patch} (95%)
 rename Spigot-Server-Patches/{0094-Don-t-teleport-dead-entities.patch => 0093-Don-t-teleport-dead-entities.patch} (93%)
 rename Spigot-Server-Patches/{0095-Optimize-Chunk-Access.patch => 0094-Optimize-Chunk-Access.patch} (95%)
 rename Spigot-Server-Patches/{0096-Configurable-spawn-chances-for-skeleton-horses.patch => 0095-Configurable-spawn-chances-for-skeleton-horses.patch} (91%)
 rename Spigot-Server-Patches/{0097-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (99%)
 rename Spigot-Server-Patches/{0098-Use-correct-item-in-arrow-pickup-event.patch => 0097-Use-correct-item-in-arrow-pickup-event.patch} (95%)
 rename Spigot-Server-Patches/{0099-Fix-cooked-fish-legacy-import.patch => 0098-Fix-cooked-fish-legacy-import.patch} (93%)
 rename Spigot-Server-Patches/{0100-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch => 0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch} (98%)
 rename Spigot-Server-Patches/{0101-Access-items-by-EquipmentSlot.patch => 0100-Access-items-by-EquipmentSlot.patch} (96%)
 rename Spigot-Server-Patches/{0102-Check-async-remove-unused-vars-GH-159.patch => 0101-Check-async-remove-unused-vars-GH-159.patch} (95%)
 rename Spigot-Server-Patches/{0103-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (95%)
 rename Spigot-Server-Patches/{0104-Entity-AddTo-RemoveFrom-World-Events.patch => 0103-Entity-AddTo-RemoveFrom-World-Events.patch} (92%)
 rename Spigot-Server-Patches/{0105-Configurable-Chunk-Inhabited-Timer.patch => 0104-Configurable-Chunk-Inhabited-Timer.patch} (85%)
 rename Spigot-Server-Patches/{0106-EntityPathfindEvent.patch => 0105-EntityPathfindEvent.patch} (95%)
 rename Spigot-Server-Patches/{0107-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch => 0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch} (97%)
 rename Spigot-Server-Patches/{0108-Minecart-drop-name-workaround.patch => 0107-Minecart-drop-name-workaround.patch} (92%)
 rename Spigot-Server-Patches/{0109-Reduce-IO-ops-opening-a-new-region-file.patch => 0108-Reduce-IO-ops-opening-a-new-region-file.patch} (95%)
 rename Spigot-Server-Patches/{0110-Sanitise-RegionFileCache-and-make-configurable.patch => 0109-Sanitise-RegionFileCache-and-make-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0111-Add-getEntity-by-UUID-API.patch => 0110-Add-getEntity-by-UUID-API.patch} (89%)
 rename Spigot-Server-Patches/{0112-Use-Optimized-Collections.patch => 0111-Use-Optimized-Collections.patch} (96%)
 rename Spigot-Server-Patches/{0113-Do-not-load-chunks-for-light-checks.patch => 0112-Do-not-load-chunks-for-light-checks.patch} (92%)
 rename Spigot-Server-Patches/{0114-Add-PlayerUseUnknownEntityEvent.patch => 0113-Add-PlayerUseUnknownEntityEvent.patch} (95%)
 rename Spigot-Server-Patches/{0115-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0114-Fix-reducedDebugInfo-not-initialized-on-client.patch} (90%)
 rename Spigot-Server-Patches/{0116-Configurable-Grass-Spread-Tick-Rate.patch => 0115-Configurable-Grass-Spread-Tick-Rate.patch} (91%)
 rename Spigot-Server-Patches/{0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (94%)
 rename Spigot-Server-Patches/{0118-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (90%)
 rename Spigot-Server-Patches/{0119-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (94%)
 rename Spigot-Server-Patches/{0120-Remove-Debug-checks-from-DataBits.patch => 0119-Remove-Debug-checks-from-DataBits.patch} (95%)
 rename Spigot-Server-Patches/{0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (95%)
 rename Spigot-Server-Patches/{0122-Workaround-for-setting-passengers-on-players.patch => 0121-Workaround-for-setting-passengers-on-players.patch} (90%)
 rename Spigot-Server-Patches/{0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch => 0122-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch} (95%)
 rename Spigot-Server-Patches/{0124-Remove-unused-World-Tile-Entity-List.patch => 0123-Remove-unused-World-Tile-Entity-List.patch} (97%)
 rename Spigot-Server-Patches/{0125-Don-t-tick-Skulls-unused-code.patch => 0124-Don-t-tick-Skulls-unused-code.patch} (90%)
 rename Spigot-Server-Patches/{0127-Configurable-Player-Collision.patch => 0125-Configurable-Player-Collision.patch} (96%)
 rename Spigot-Server-Patches/{0128-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0126-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (97%)
 delete mode 100644 Spigot-Server-Patches/0126-Fix-some-players-not-being-kicked-on-shutdown.patch
 rename Spigot-Server-Patches/{0129-Water-mobs-should-only-spawn-in-the-water.patch => 0127-Water-mobs-should-only-spawn-in-the-water.patch} (93%)
 rename Spigot-Server-Patches/{0130-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch => 0128-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} (97%)
 rename Spigot-Server-Patches/{0131-Configurable-RCON-IP-address.patch => 0129-Configurable-RCON-IP-address.patch} (92%)
 rename Spigot-Server-Patches/{0132-Prevent-Fire-from-loading-chunks.patch => 0130-Prevent-Fire-from-loading-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0133-Implement-PlayerLocaleChangeEvent.patch => 0131-Implement-PlayerLocaleChangeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0134-EntityRegainHealthEvent-isFastRegen-API.patch => 0132-EntityRegainHealthEvent-isFastRegen-API.patch} (96%)
 rename Spigot-Server-Patches/{0135-Add-ability-to-configure-frosted_ice-properties.patch => 0133-Add-ability-to-configure-frosted_ice-properties.patch} (93%)
 rename Spigot-Server-Patches/{0136-Vehicle-Event-Cancellation-Changes.patch => 0134-Vehicle-Event-Cancellation-Changes.patch} (98%)
 rename Spigot-Server-Patches/{0137-Arrow-pickup-rule-API.patch => 0135-Arrow-pickup-rule-API.patch} (95%)
 rename Spigot-Server-Patches/{0138-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch => 0136-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch} (97%)
 rename Spigot-Server-Patches/{0139-Improve-Minecraft-Hopper-Performance.patch => 0137-Improve-Minecraft-Hopper-Performance.patch} (97%)
 rename Spigot-Server-Patches/{0140-remove-null-possibility-for-getServer-singleton.patch => 0138-remove-null-possibility-for-getServer-singleton.patch} (94%)
 rename Spigot-Server-Patches/{0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0139-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (99%)
 rename Spigot-Server-Patches/{0142-LootTable-API-Replenishable-Lootables-Feature.patch => 0140-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0143-Do-not-load-chunks-for-pathfinding.patch => 0141-Do-not-load-chunks-for-pathfinding.patch} (90%)
 rename Spigot-Server-Patches/{0144-Entity-Tracking-Improvements.patch => 0142-Entity-Tracking-Improvements.patch} (98%)
 rename Spigot-Server-Patches/{0145-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0143-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (95%)
 rename Spigot-Server-Patches/{0146-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0144-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (89%)
 rename Spigot-Server-Patches/{0147-Fix-Chunk-Unload-Queue-Issues.patch => 0145-Fix-Chunk-Unload-Queue-Issues.patch} (96%)
 rename Spigot-Server-Patches/{0148-System-property-for-disabling-watchdoge.patch => 0146-System-property-for-disabling-watchdoge.patch} (92%)
 rename Spigot-Server-Patches/{0149-Optimize-EAR.patch => 0147-Optimize-EAR.patch} (96%)
 rename Spigot-Server-Patches/{0150-Optimize-UserCache-Thread-Safe.patch => 0148-Optimize-UserCache-Thread-Safe.patch} (97%)
 rename Spigot-Server-Patches/{0151-Avoid-blocking-on-Network-Manager-creation.patch => 0149-Avoid-blocking-on-Network-Manager-creation.patch} (97%)
 rename Spigot-Server-Patches/{0152-Optional-old-TNT-cannon-behaviors.patch => 0150-Optional-old-TNT-cannon-behaviors.patch} (99%)
 rename Spigot-Server-Patches/{0153-Faster-redstone-torch-rapid-clock-removal.patch => 0151-Faster-redstone-torch-rapid-clock-removal.patch} (96%)
 rename Spigot-Server-Patches/{0154-Ensure-Chunks-never-ever-load-async.patch => 0152-Ensure-Chunks-never-ever-load-async.patch} (93%)
 rename Spigot-Server-Patches/{0155-Add-server-name-parameter.patch => 0153-Add-server-name-parameter.patch} (92%)
 rename Spigot-Server-Patches/{0156-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0154-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%)
 rename Spigot-Server-Patches/{0157-Fix-FallingBlocks-being-stuck-on-fences.patch => 0155-Fix-FallingBlocks-being-stuck-on-fences.patch} (96%)
 rename Spigot-Server-Patches/{0158-Make-entities-look-for-hoppers.patch => 0156-Make-entities-look-for-hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch => 0157-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch} (96%)
 rename Spigot-Server-Patches/{0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (97%)
 rename Spigot-Server-Patches/{0161-Toggleable-Elytra-Wall-Damage.patch => 0159-Toggleable-Elytra-Wall-Damage.patch} (91%)
 rename Spigot-Server-Patches/{0162-Fix-Double-World-Add-issues.patch => 0160-Fix-Double-World-Add-issues.patch} (89%)
 rename Spigot-Server-Patches/{0163-Fix-Old-Sign-Conversion.patch => 0161-Fix-Old-Sign-Conversion.patch} (98%)
 rename Spigot-Server-Patches/{0164-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch => 0162-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch} (98%)
 rename Spigot-Server-Patches/{0165-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0163-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (92%)
 rename Spigot-Server-Patches/{0166-More-informative-vehicle-moved-wrongly-message.patch => 0164-More-informative-vehicle-moved-wrongly-message.patch} (94%)
 rename Spigot-Server-Patches/{0167-Re-track-players-that-dismount-from-other-players.patch => 0165-Re-track-players-that-dismount-from-other-players.patch} (93%)
 rename Spigot-Server-Patches/{0168-Add-setting-for-proxy-online-mode-status.patch => 0166-Add-setting-for-proxy-online-mode-status.patch} (94%)
 rename Spigot-Server-Patches/{0169-Optimise-hashCode-and-equals.patch => 0167-Optimise-hashCode-and-equals.patch} (97%)

diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index ded341329..03743c9f0 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From bb78dbc2059b4beee7c9d8a36ebcba8c5bd53e0b Mon Sep 17 00:00:00 2001
+From 3772e09053af9dd7d76f320160f2bd0cb38ea155 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -2933,10 +2933,10 @@ index 69720e9..f82cbaf 100644
           * Sends the component to the player
           *
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 0ba9b1c..548d570 100644
+index ffbe5dd..4c86694 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
-@@ -31,7 +31,8 @@ public abstract class Command {
+@@ -32,7 +32,8 @@ public abstract class Command {
      protected String usageMessage;
      private String permission;
      private String permissionMessage;
@@ -2946,7 +2946,7 @@ index 0ba9b1c..548d570 100644
  
      protected Command(String name) {
          this(name, "", "/" + name, new ArrayList<String>());
-@@ -45,7 +46,6 @@ public abstract class Command {
+@@ -46,7 +47,6 @@ public abstract class Command {
          this.usageMessage = usageMessage;
          this.aliases = aliases;
          this.activeAliases = new ArrayList<String>(aliases);
@@ -2954,7 +2954,7 @@ index 0ba9b1c..548d570 100644
      }
  
      /**
-@@ -229,7 +229,6 @@ public abstract class Command {
+@@ -250,7 +250,6 @@ public abstract class Command {
      public boolean setLabel(String name) {
          this.nextLabel = name;
          if (!isRegistered()) {
@@ -2985,10 +2985,10 @@ index 3f07d7f..f89ad07 100644
          return i >= j && i <= k;
      }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index e2fc282..66385c4 100644
+index 5965514..466757b 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -30,7 +30,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
          register("bukkit", new VersionCommand("version"));
          register("bukkit", new ReloadCommand("reload"));
          register("bukkit", new PluginsCommand("plugins"));
@@ -2997,7 +2997,7 @@ index e2fc282..66385c4 100644
      }
  
      public void setFallbackCommands() {
-@@ -59,6 +59,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -60,6 +60,7 @@ public class SimpleCommandMap implements CommandMap {
       * {@inheritDoc}
       */
      public boolean register(String label, String fallbackPrefix, Command command) {
@@ -3005,7 +3005,7 @@ index e2fc282..66385c4 100644
          label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
          fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
          boolean registered = register(label, command, false, fallbackPrefix);
-@@ -134,6 +135,12 @@ public class SimpleCommandMap implements CommandMap {
+@@ -135,6 +136,12 @@ public class SimpleCommandMap implements CommandMap {
              return false;
          }
  
@@ -3351,10 +3351,10 @@ index 1056186..4ee123e 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 7bf2fa6..4983ea8 100644
+index a1d174f..6b159ed 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -39,7 +39,6 @@ import org.bukkit.plugin.PluginLoader;
+@@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
  import org.bukkit.plugin.RegisteredListener;
  import org.bukkit.plugin.TimedRegisteredListener;
  import org.bukkit.plugin.UnknownDependencyException;
@@ -3362,15 +3362,15 @@ index 7bf2fa6..4983ea8 100644
  import org.yaml.snakeyaml.error.YAMLException;
  
  /**
-@@ -50,7 +49,6 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -51,7 +50,6 @@ public final class JavaPluginLoader implements PluginLoader {
      private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
      private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
-     private final Map<String, PluginClassLoader> loaders = new LinkedHashMap<String, PluginClassLoader>();
+     private final Map<String, PluginClassLoader> loaders = Collections.synchronizedMap(new LinkedHashMap<String, PluginClassLoader>());
 -    public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot
  
      /**
       * This class was not meant to be constructed explicitly
-@@ -293,26 +291,20 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -291,26 +289,20 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  
@@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644
 -    }
  }
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0013-Add-Location-support-to-tab-completers-vanilla-featu.patch b/Spigot-API-Patches/0013-Add-Location-support-to-tab-completers-vanilla-featu.patch
deleted file mode 100644
index b3e7e2ad0..000000000
--- a/Spigot-API-Patches/0013-Add-Location-support-to-tab-completers-vanilla-featu.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 18a7c61b49b65c2a682a9b8274e0d81e11975cae Mon Sep 17 00:00:00 2001
-From: DemonWav <demonwav@gmail.com>
-Date: Mon, 29 Feb 2016 19:37:41 -0600
-Subject: [PATCH] Add Location support to tab completers (vanilla feature
- missing in CraftBukkit)
-
-
-diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 548d570..18c54b3 100644
---- a/src/main/java/org/bukkit/command/Command.java
-+++ b/src/main/java/org/bukkit/command/Command.java
-@@ -8,6 +8,7 @@ import java.util.Set;
- import org.apache.commons.lang.Validate;
- import org.bukkit.Bukkit;
- import org.bukkit.ChatColor;
-+import org.bukkit.Location;
- import org.bukkit.Server;
- import org.bukkit.entity.Player;
- import org.bukkit.entity.minecart.CommandMinecart;
-@@ -109,6 +110,31 @@ public abstract class Command {
-         return matchedPlayers;
-     }
- 
-+    // Paper start - location tab-completes
-+
-+    /**
-+     * Executed on tab completion for this command, returning a list of options the player can tab through. This method
-+     * returns the {@link Location} of the block the player is looking at at the time of the tab complete.
-+     * <p>
-+     * Commands that want to use the Location information in their tab-complete implementations need to override this
-+     * method. The Location provided by this method is the block that the player is currently looking at when the player
-+     * attempts the tab complete. For this to be valid, the block must be highlighted by the player (i.e. the player is
-+     * close enough to interact with the block).
-+     *
-+     * @param sender   Source object which is executing this command
-+     * @param alias    the alias being used
-+     * @param args     All arguments passed to the command, split via ' '
-+     * @param location the location of the block the player is looking at
-+     * @return a list of tab-completions for the specified arguments. This
-+     * will never be null. List may be immutable.
-+     * @throws IllegalArgumentException if sender, alias, or args is null
-+     */
-+    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
-+        // Simply default to the standard tab-complete, subclasses can override this if needed
-+        return tabComplete(sender, alias, args);
-+    }
-+    // Paper end
-+
-     /**
-      * Returns the name of this command
-      *
-diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 3bfa31f..9b93872 100644
---- a/src/main/java/org/bukkit/command/PluginCommand.java
-+++ b/src/main/java/org/bukkit/command/PluginCommand.java
-@@ -3,6 +3,7 @@ package org.bukkit.command;
- import java.util.List;
- 
- import org.apache.commons.lang.Validate;
-+import org.bukkit.Location;
- import org.bukkit.plugin.Plugin;
- 
- /**
-@@ -122,6 +123,15 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
-      */
-     @Override
-     public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args) throws CommandException, IllegalArgumentException {
-+        return tabComplete(sender, alias, args, null); // Paper - The code from this method has been (slightly modified) moved to the Location method.
-+    }
-+
-+    // PaperSpigot start - location tab-completes
-+    /**
-+     * This code was copied from tabComplete(CommandSender sender, String alias, String[] args)
-+     */
-+    @Override
-+    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws CommandException, IllegalArgumentException {
-         Validate.notNull(sender, "Sender cannot be null");
-         Validate.notNull(args, "Arguments cannot be null");
-         Validate.notNull(alias, "Alias cannot be null");
-@@ -129,10 +139,10 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
-         List<String> completions = null;
-         try {
-             if (completer != null) {
--                completions = completer.onTabComplete(sender, this, alias, args);
-+                completions = completer.onTabComplete(sender, this, alias, args, location); // Paper - add location argument
-             }
-             if (completions == null && executor instanceof TabCompleter) {
--                completions = ((TabCompleter) executor).onTabComplete(sender, this, alias, args);
-+                completions = ((TabCompleter) executor).onTabComplete(sender, this, alias, args, location); // Paper - add location argument
-             }
-         } catch (Throwable ex) {
-             StringBuilder message = new StringBuilder();
-@@ -149,6 +159,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
-         }
-         return completions;
-     }
-+    // Paper end
- 
-     @Override
-     public String toString() {
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 66385c4..ba4d45c 100644
---- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -11,6 +11,7 @@ import java.util.Map;
- import java.util.regex.Pattern;
- 
- import org.apache.commons.lang.Validate;
-+import org.bukkit.Location;
- import org.bukkit.Server;
- import org.bukkit.command.defaults.*;
- import org.bukkit.entity.Player;
-@@ -172,6 +173,14 @@ public class SimpleCommandMap implements CommandMap {
-     }
- 
-     public List<String> tabComplete(CommandSender sender, String cmdLine) {
-+        return tabComplete(sender, cmdLine, null); // Paper - location tab-completes, code moved below
-+    }
-+
-+    // Paper start - location tab-completes
-+    /**
-+     * This code was copied, except for the noted change, from tabComplete(CommandSender sender, String cmdLine)
-+     */
-+    public List<String> tabComplete(CommandSender sender, String cmdLine, Location location) {
-         Validate.notNull(sender, "Sender cannot be null");
-         Validate.notNull(cmdLine, "Command line cannot null");
- 
-@@ -216,13 +225,14 @@ public class SimpleCommandMap implements CommandMap {
-         String[] args = PATTERN_ON_SPACE.split(argLine, -1);
- 
-         try {
--            return target.tabComplete(sender, commandName, args);
-+            return target.tabComplete(sender, commandName, args, location); // Paper - add location argument
-         } catch (CommandException ex) {
-             throw ex;
-         } catch (Throwable ex) {
-             throw new CommandException("Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target, ex);
-         }
-     }
-+    // Paper end
- 
-     public Collection<Command> getCommands() {
-         return Collections.unmodifiableCollection(knownCommands.values());
-diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
-index 6d61e3a..85b10e5 100644
---- a/src/main/java/org/bukkit/command/TabCompleter.java
-+++ b/src/main/java/org/bukkit/command/TabCompleter.java
-@@ -1,5 +1,7 @@
- package org.bukkit.command;
- 
-+import org.bukkit.Location;
-+
- import java.util.List;
- 
- /**
-@@ -19,4 +21,10 @@ public interface TabCompleter {
-      *     to default to the command executor
-      */
-     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args);
-+
-+    // Paper start - location tab-completes
-+    default List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args, Location location) {
-+        return onTabComplete(sender, command, alias, args);
-+    }
-+    // Paper end
- }
--- 
-2.9.2.windows.1
-
diff --git a/Spigot-API-Patches/0014-Made-EntityDismountEvent-Cancellable.patch b/Spigot-API-Patches/0013-Made-EntityDismountEvent-Cancellable.patch
similarity index 94%
rename from Spigot-API-Patches/0014-Made-EntityDismountEvent-Cancellable.patch
rename to Spigot-API-Patches/0013-Made-EntityDismountEvent-Cancellable.patch
index 9efcf8a04..5e3a5c90e 100644
--- a/Spigot-API-Patches/0014-Made-EntityDismountEvent-Cancellable.patch
+++ b/Spigot-API-Patches/0013-Made-EntityDismountEvent-Cancellable.patch
@@ -1,4 +1,4 @@
-From 72bedfe51658b0464677c52347151e5525b85307 Mon Sep 17 00:00:00 2001
+From c5908bf5ae2b8e9dc4058efb952dc182561ec098 Mon Sep 17 00:00:00 2001
 From: Nik Gil <nikmanG@users.noreply.github.com>
 Date: Mon, 29 Feb 2016 19:42:10 -0600
 Subject: [PATCH] Made EntityDismountEvent Cancellable
@@ -43,5 +43,5 @@ index 24d4942..ce989bb 100644
 +    // Paper end
  }
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0015-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch
similarity index 84%
rename from Spigot-API-Patches/0015-Automatically-disable-plugins-that-fail-to-load.patch
rename to Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch
index 41650100a..e2ad6bdae 100644
--- a/Spigot-API-Patches/0015-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch
@@ -1,14 +1,14 @@
-From 9b9ccba2ed63a98b146b388fd175e9d350e05dfd Mon Sep 17 00:00:00 2001
+From f57909e23aa879da0c747ea91b472cac307980d9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 19:45:21 -0600
 Subject: [PATCH] Automatically disable plugins that fail to load
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 4983ea8..93a43dd 100644
+index 6b159ed..a0c98c7 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -332,6 +332,10 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -330,6 +330,10 @@ public final class JavaPluginLoader implements PluginLoader {
                  jPlugin.setEnabled(true);
              } catch (Throwable ex) {
                  server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
@@ -20,5 +20,5 @@ index 4983ea8..93a43dd 100644
  
              // Perhaps abort here, rather than continue going, but as it stands,
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0016-Expose-server-CommandMap.patch b/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
similarity index 96%
rename from Spigot-API-Patches/0016-Expose-server-CommandMap.patch
rename to Spigot-API-Patches/0015-Expose-server-CommandMap.patch
index 1c8df1648..dd32aa24b 100644
--- a/Spigot-API-Patches/0016-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
@@ -1,4 +1,4 @@
-From e56e4b8d652e65f05ed1102a811ec81508f7af4a Mon Sep 17 00:00:00 2001
+From e4b1bdd2b710c3c09c0ba4946bf8a313c4f4296d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap
@@ -70,5 +70,5 @@ index 6e23b0c..a1ce356 100644
       * @see UnsafeValues
       * @return the unsafe values instance
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 97%
rename from Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 5d3027ae0..07889f9c4 100644
--- a/Spigot-API-Patches/0017-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 544918f08d26a3d51fd444976d273fcd5b0609cb Mon Sep 17 00:00:00 2001
+From ffdfb6f2ae07ecf3724c90500e09c71370c93ccf 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
@@ -99,5 +99,5 @@ index 0945c59..4c880b8 100644
       * Forces an update of the player's entire inventory.
       *
 -- 
-2.8.3
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
similarity index 99%
rename from Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
index 4eff174f5..092f0775a 100644
--- a/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 65e92020e42f6989a280c30ef0d5572d3e6dff92 Mon Sep 17 00:00:00 2001
+From 9e70beca6caf7d6007ad0b0ab6f050aab7c14a0e 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
@@ -507,5 +507,5 @@ index 4c880b8..bb31477 100644
  
  
 -- 
-2.8.3
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0019-Add-exception-reporting-event.patch b/Spigot-API-Patches/0018-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-API-Patches/0019-Add-exception-reporting-event.patch
rename to Spigot-API-Patches/0018-Add-exception-reporting-event.patch
index 8a46794c2..9db093973 100644
--- a/Spigot-API-Patches/0019-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0018-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 0a66e97d6b38306199e8b76d2459c3a53beff3c5 Mon Sep 17 00:00:00 2001
+From f3ef3ba155ffb8398e2f421fb0ccb0df8b857c4e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@@ -458,7 +458,7 @@ index 0000000..5582999
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index ba4d45c..8e70b43 100644
+index 466757b..08976cd 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -10,6 +10,9 @@ import java.util.List;
@@ -482,7 +482,7 @@ index ba4d45c..8e70b43 100644
          }
  
          // return true as command was handled
-@@ -229,7 +234,9 @@ public class SimpleCommandMap implements CommandMap {
+@@ -225,7 +230,9 @@ public class SimpleCommandMap implements CommandMap {
          } catch (CommandException ex) {
              throw ex;
          } catch (Throwable ex) {
@@ -492,7 +492,7 @@ index ba4d45c..8e70b43 100644
 +            throw new CommandException(msg, ex);
          }
      }
-     // Paper end
+ 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 index 4ee123e..1302773 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
diff --git a/Spigot-API-Patches/0020-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch
similarity index 96%
rename from Spigot-API-Patches/0020-Fix-ServerListPingEvent-flagging-as-Async.patch
rename to Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch
index 468fa45d5..9da20f51a 100644
--- a/Spigot-API-Patches/0020-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch
@@ -1,4 +1,4 @@
-From 40cea5b463eada81ab6b30330ed739615a97c9bd Mon Sep 17 00:00:00 2001
+From 37e2bacf63a44311cddcf163a91f269e0b473008 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 20:26:39 -0600
 Subject: [PATCH] Fix ServerListPingEvent flagging as Async
@@ -50,5 +50,5 @@ index 343f238..3c38d85 100644
          this.address = address;
          this.motd = motd;
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
similarity index 96%
rename from Spigot-API-Patches/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
rename to Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 26a4bf34b..026cd62fc 100644
--- a/Spigot-API-Patches/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@@ -1,4 +1,4 @@
-From 20f7cf3795004ee2e49b58c2bdcaae78f60dcd8f Mon Sep 17 00:00:00 2001
+From bf151a7ca10280dff0ce41fe2ebbcce4bb2e1ad7 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
@@ -60,5 +60,5 @@ index bb31477..99f148c 100644
  
      /**
 -- 
-2.8.3
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 93%
rename from Spigot-API-Patches/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 78e47163b..2c9a8ccd1 100644
--- a/Spigot-API-Patches/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From ebe7bf9e6ebef527817214387e1696bcb5ecd7ce Mon Sep 17 00:00:00 2001
+From 4b969a109049472e8b5f46d689e7e033e2dd1196 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/Spigot-API-Patches/0023-Complete-resource-pack-API.patch b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
similarity index 98%
rename from Spigot-API-Patches/0023-Complete-resource-pack-API.patch
rename to Spigot-API-Patches/0022-Complete-resource-pack-API.patch
index 966102caf..e286f242b 100644
--- a/Spigot-API-Patches/0023-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From 915e61ece5914582a738ee9a9e43f37e910307c7 Mon Sep 17 00:00:00 2001
+From 844f5ad7531209eaaa783727c8bbdab094b69900 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
@@ -110,5 +110,5 @@ index 4c49801..4c83851 100644
       * Gets the status of this pack.
       *
 -- 
-2.8.3
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0024-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
similarity index 98%
rename from Spigot-API-Patches/0024-Use-ASM-for-event-executors.patch
rename to Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
index 8c290a69c..d8dac0aa3 100644
--- a/Spigot-API-Patches/0024-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
@@ -1,4 +1,4 @@
-From 9c26223cc08641a0cc1ce815215a989c5867adbb Mon Sep 17 00:00:00 2001
+From ed654de7f9903c5b96b87a9a9227151a48eaf21e Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 5e5e5e4..5b70369 100644
+index 6646f4a..a7f6468 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -126,6 +126,12 @@
@@ -369,10 +369,10 @@ index 3b2c99e..f9316d6 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 93a43dd..7229b25 100644
+index a0c98c7..b2c4ba8 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -291,20 +291,7 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -289,20 +289,7 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  
@@ -395,5 +395,5 @@ index 93a43dd..7229b25 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0025-Add-a-call-helper-to-Event.patch b/Spigot-API-Patches/0024-Add-a-call-helper-to-Event.patch
similarity index 93%
rename from Spigot-API-Patches/0025-Add-a-call-helper-to-Event.patch
rename to Spigot-API-Patches/0024-Add-a-call-helper-to-Event.patch
index 0419c1611..ff42b652a 100644
--- a/Spigot-API-Patches/0025-Add-a-call-helper-to-Event.patch
+++ b/Spigot-API-Patches/0024-Add-a-call-helper-to-Event.patch
@@ -1,4 +1,4 @@
-From 81c991a2a0e0f1f58a73b49bb276ab52884d433d Mon Sep 17 00:00:00 2001
+From 544b5f21dd978f9b7ecd0a546421aa11b5c3a159 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 May 2013 20:36:58 -0400
 Subject: [PATCH] Add a call helper to Event
@@ -40,5 +40,5 @@ index 6677e1b..eaf6c49 100644
       * Convenience method for providing a user-friendly identifier. By
       * default, it is the event's class's {@linkplain Class#getSimpleName()
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0026-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
similarity index 95%
rename from Spigot-API-Patches/0026-Add-sender-name-to-commands.yml-replacement.patch
rename to Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
index 26a3c3334..940e9ffcd 100644
--- a/Spigot-API-Patches/0026-Add-sender-name-to-commands.yml-replacement.patch
+++ b/Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
@@ -1,4 +1,4 @@
-From 21d5ec9b192521a3502ad03fdc32d217651ab129 Mon Sep 17 00:00:00 2001
+From 3f129e5794812a7a026249ae923b9acfa2849511 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 22 Jul 2015 18:50:41 -0400
 Subject: [PATCH] Add sender name to commands.yml replacement
@@ -41,5 +41,5 @@ index f89ad07..a3e9c63 100644
          while (index != -1) {
              int start = index;
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0027-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
similarity index 96%
rename from Spigot-API-Patches/0027-Add-command-to-reload-permissions.yml-and-require-co.patch
rename to Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
index 6a9823c7f..659982ed3 100644
--- a/Spigot-API-Patches/0027-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 bd8ce76652697575ba15e5efec4710cf0dcd2bba Mon Sep 17 00:00:00 2001
+From b9193c99b34c7ce136f4c8edee9672346e79617f 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f93ca2e..5e31665 100644
+index 5b37396..b01cd7d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1182,6 +1182,13 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index f93ca2e..5e31665 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 91bde81..6b1f2a4 100644
+index 309fa3f..b527372 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1018,4 +1018,6 @@ public interface Server extends PluginMessageRecipient {
@@ -84,7 +84,7 @@ index c70d512..ee29ebb 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 49f5872..e988a7c 100644
+index 1302773..9ce0a5d 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -750,4 +750,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -102,5 +102,5 @@ index 49f5872..e988a7c 100644
 +
  }
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0028-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch
similarity index 95%
rename from Spigot-API-Patches/0028-Custom-replacement-for-eaten-items.patch
rename to Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch
index 7f275a14a..2f9a04736 100644
--- a/Spigot-API-Patches/0028-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From 9ffd06f684daada133fc1b90cc983c8598a6e328 Mon Sep 17 00:00:00 2001
+From 33bc086f382a2e21d39d4ce384998ce5ed01bd19 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:05:21 -0400
 Subject: [PATCH] Custom replacement for eaten items
@@ -42,5 +42,5 @@ index 8ab76b1..42aad88 100644
          return this.isCancelled;
      }
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0029-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0028-Access-items-by-EquipmentSlot.patch
similarity index 93%
rename from Spigot-API-Patches/0029-Access-items-by-EquipmentSlot.patch
rename to Spigot-API-Patches/0028-Access-items-by-EquipmentSlot.patch
index 79eb54524..85b929cdc 100644
--- a/Spigot-API-Patches/0029-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/0028-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From 0024ceed3f1fac5330f4bafd0054f54229489089 Mon Sep 17 00:00:00 2001
+From 261076ee6c8f78815af83409d38da123ad3073c3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:44:49 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@@ -32,5 +32,5 @@ index 557cc04..799f150 100644
 +    // Paper end
  }
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0030-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0029-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 96%
rename from Spigot-API-Patches/0030-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-API-Patches/0029-Entity-AddTo-RemoveFrom-World-Events.patch
index 2e8acdff6..1c318dd27 100644
--- a/Spigot-API-Patches/0030-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-API-Patches/0029-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From 159fec1e94abbed864b41a5aeeca483306863fba Mon Sep 17 00:00:00 2001
+From afba862bcba12099ebab00ff767bf8d8ff49610b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:26:34 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@@ -72,5 +72,5 @@ index 0000000..800be6a
 +    }
 +}
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0031-EntityPathfindEvent.patch b/Spigot-API-Patches/0030-EntityPathfindEvent.patch
similarity index 96%
rename from Spigot-API-Patches/0031-EntityPathfindEvent.patch
rename to Spigot-API-Patches/0030-EntityPathfindEvent.patch
index 9e46fdede..e61a3412c 100644
--- a/Spigot-API-Patches/0031-EntityPathfindEvent.patch
+++ b/Spigot-API-Patches/0030-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 0cbfd3f956fe731e9a2c1e0838afd8cb577e338b Mon Sep 17 00:00:00 2001
+From 96bfcbd08007feae7b996d708c15a485ce665494 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:15:34 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -87,5 +87,5 @@ index 0000000..21cab26
 +    }
 +}
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch
similarity index 98%
rename from Spigot-API-Patches/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
rename to Spigot-API-Patches/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch
index fcf5dd87c..2fea1f0e3 100644
--- a/Spigot-API-Patches/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/Spigot-API-Patches/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch
@@ -1,4 +1,4 @@
-From 04d794e4aeb4d0b185ed67c14a188f269fb7802b Mon Sep 17 00:00:00 2001
+From 270a57e64ae5f5a383b35a424dab9a45aa781eaf Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Sat, 1 Jun 2013 13:52:30 -0600
 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@@ -101,5 +101,5 @@ index 093c144..64c0f0a 100644
          for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
              if (values.containsKey(owningPlugin)) {
 -- 
-2.8.3.windows.1
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
similarity index 94%
rename from Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
rename to Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
index c29bd3cc2..c19c3a63d 100644
--- a/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
@@ -1,4 +1,4 @@
-From 1e48496f8fce2c543a8bace6a565bce6ccbe1c97 Mon Sep 17 00:00:00 2001
+From 804562f99c8f2bf6b5d9937d5a7816974c716502 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 16 Jul 2013 21:26:50 -0400
 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@@ -37,5 +37,5 @@ index 64c0f0a..6da6abd 100644
       * unique data from the subject with a metadataKey.
       * <p>
 -- 
-2.8.3.windows.1
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0034-Add-getEntity-by-UUID-API.patch b/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
similarity index 90%
rename from Spigot-API-Patches/0034-Add-getEntity-by-UUID-API.patch
rename to Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
index df7a75a4c..ec4af78f3 100644
--- a/Spigot-API-Patches/0034-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
@@ -1,11 +1,11 @@
-From 5c9d87a6c795f9028600143e51fa59286c8a8192 Mon Sep 17 00:00:00 2001
+From 1ec57a41072c805aeeb8efb10cac8b4738cb4aab 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
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5e31665..9d61cc5 100644
+index b01cd7d..3161b87 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1189,6 +1189,16 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 5e31665..9d61cc5 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 6b1f2a4..1c8140f 100644
+index b527372..edf0d04 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1020,4 +1020,12 @@ public interface Server extends PluginMessageRecipient {
@@ -43,5 +43,5 @@ index 6b1f2a4..1c8140f 100644
 +    Entity getEntity(UUID uuid); // Paper
  }
 -- 
-2.7.4
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0035-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0034-Add-PlayerUseUnknownEntityEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0035-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-API-Patches/0034-Add-PlayerUseUnknownEntityEvent.patch
index 0d3762548..11313e1ec 100644
--- a/Spigot-API-Patches/0035-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-API-Patches/0034-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 248cfb570e0e1783f8342ab51c2eb7f8ac0de495 Mon Sep 17 00:00:00 2001
+From 971c532dd73e22735d0b227aa4b467f3e9555a0b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:08:36 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -53,5 +53,5 @@ index 0000000..70eeaf5
 +    }
 +}
 -- 
-2.7.4
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 98%
rename from Spigot-API-Patches/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-API-Patches/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 374338719..f3cee13bd 100644
--- a/Spigot-API-Patches/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-API-Patches/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 82d3cb13bbd3fa88aabf928183e268849d789297 Mon Sep 17 00:00:00 2001
+From a887f5c891c64b820b93ab938dea9ba8b0f89755 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:20:18 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -223,5 +223,5 @@ index 0000000..e44d03a
 +    }
 +}
 -- 
-2.8.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0037-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0036-Arrow-pickup-rule-API.patch
similarity index 93%
rename from Spigot-API-Patches/0037-Arrow-pickup-rule-API.patch
rename to Spigot-API-Patches/0036-Arrow-pickup-rule-API.patch
index 748690762..8bf50dbb1 100644
--- a/Spigot-API-Patches/0037-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0036-Arrow-pickup-rule-API.patch
@@ -1,4 +1,4 @@
-From 1d016100e49bc72ca46633c664e9d3632029ccda Mon Sep 17 00:00:00 2001
+From 5c695da3419985b0d9250e6b312b252daa19d89c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
@@ -41,5 +41,5 @@ index e7a32f7..08095b9 100644
      {
  
 -- 
-2.7.4
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0038-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0037-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 95%
rename from Spigot-API-Patches/0038-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-API-Patches/0037-EntityRegainHealthEvent-isFastRegen-API.patch
index e4af6a459..04f5eae1b 100644
--- a/Spigot-API-Patches/0038-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/0037-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 986cb0451c93c28f6428f4f3f64e23fe5d5be998 Mon Sep 17 00:00:00 2001
+From e9878408be4b8c493c04fa5adcd9c2c7fcd4297c 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
@@ -46,5 +46,5 @@ index a7b3517..703520f 100644
      /**
       * Gets the amount of regained health
 -- 
-2.5.0
+2.9.2.windows.1
 
diff --git a/Spigot-API-Patches/0039-LootTable-API.patch b/Spigot-API-Patches/0038-LootTable-API.patch
similarity index 99%
rename from Spigot-API-Patches/0039-LootTable-API.patch
rename to Spigot-API-Patches/0038-LootTable-API.patch
index 0d6e13282..761cdb732 100644
--- a/Spigot-API-Patches/0039-LootTable-API.patch
+++ b/Spigot-API-Patches/0038-LootTable-API.patch
@@ -1,4 +1,4 @@
-From 88e00e6b7efb8fb48e035fbfdfd75b7887c96c44 Mon Sep 17 00:00:00 2001
+From 2b1c15d0ea5602d9281d1306e0596a5a7f2d85e2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 15:19:49 -0400
 Subject: [PATCH] LootTable API
@@ -350,5 +350,5 @@ index e097157..26aff5a 100644
  
  }
 -- 
-2.8.2
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index 12ac8965a..5f8aed577 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 6533449019b5309292af4ce05cfeabcd43bcae3c Mon Sep 17 00:00:00 2001
+From 794c519d459912de2f16cfb8fc95ad0df40c2f82 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -289,10 +289,10 @@ index fcd90be..e649435 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c906eee..1ef30a3 100644
+index 0658647..e7e9941 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -693,6 +693,7 @@ public final class CraftServer implements Server {
+@@ -694,6 +694,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -300,7 +300,7 @@ index c906eee..1ef30a3 100644
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
-@@ -708,12 +709,14 @@ public final class CraftServer implements Server {
+@@ -709,12 +710,14 @@ public final class CraftServer implements Server {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }
              world.spigotConfig.init(); // Spigot
@@ -335,5 +335,5 @@ index 337aa29..979adad 100644
          };
  
 -- 
-2.9.0.windows.1
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index c1f1e87ed..116b28cfb 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From d1e7f412be2eb89f538516a4aad9605d3aedd7d4 Mon Sep 17 00:00:00 2001
+From a6eea0b71f9783fbe8c3d2faceb4c634a015b3e6 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
@@ -23,10 +23,10 @@ index 4ae34c8..63aaa7a 100644
              <version>3.0.3</version>
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 0000000..2dff5e3
+index 0000000..0f8315c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
-@@ -0,0 +1,114 @@
+@@ -0,0 +1,110 @@
 +package co.aikar.timings;
 +
 +import net.minecraft.server.*;
@@ -136,149 +136,13 @@ index 0000000..2dff5e3
 +    public static Timing getBlockTiming(Block block) {
 +        return Timings.ofSafe("## Scheduled Block: " + block.getName());
 +    }
-+
-+    public static Timing getStructureTiming(StructureGenerator structureGenerator) {
-+        return Timings.ofSafe("Structure Generator - " + structureGenerator.getName());
-+    }
-+}
-diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
-new file mode 100644
-index 0000000..2bf5b66
---- /dev/null
-+++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
-@@ -0,0 +1,126 @@
-+/*
-+ * This file is licensed under the MIT License (MIT).
-+ *
-+ * Copyright (c) 2014-2016 Daniel Ennis <http://aikar.co>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
-+package co.aikar.timings;
-+
-+import net.minecraft.server.BiomeBase.BiomeMeta;
-+import net.minecraft.server.BlockPosition;
-+import net.minecraft.server.Chunk;
-+import net.minecraft.server.EnumCreatureType;
-+import net.minecraft.server.World;
-+import net.minecraft.server.WorldServer;
-+import org.bukkit.Location;
-+import org.bukkit.craftbukkit.generator.InternalChunkGenerator;
-+import org.bukkit.generator.BlockPopulator;
-+
-+import javax.annotation.Nullable;
-+import java.util.List;
-+import java.util.Random;
-+
-+public class TimedChunkGenerator extends InternalChunkGenerator {
-+    private final WorldServer world;
-+    private final InternalChunkGenerator timedGenerator;
-+
-+    public TimedChunkGenerator(WorldServer worldServer, InternalChunkGenerator gen) {
-+        world = worldServer;
-+        timedGenerator = gen;
-+    }
-+
-+    @Override
-+    @Deprecated
-+    public byte[] generate(org.bukkit.World world, Random random, int x, int z) {
-+        return timedGenerator.generate(world, random, x, z);
-+    }
-+
-+    @Override
-+    @Deprecated
-+    public short[][] generateExtBlockSections(org.bukkit.World world, Random random, int x, int z,
-+                                              BiomeGrid biomes) {
-+        return timedGenerator.generateExtBlockSections(world, random, x, z, biomes);
-+    }
-+
-+    @Override
-+    @Deprecated
-+    public byte[][] generateBlockSections(org.bukkit.World world, Random random, int x, int z,
-+                                          BiomeGrid biomes) {
-+        return timedGenerator.generateBlockSections(world, random, x, z, biomes);
-+    }
-+
-+    @Override
-+    public ChunkData generateChunkData(org.bukkit.World world, Random random, int x, int z, BiomeGrid biome) {
-+        return timedGenerator.generateChunkData(world, random, x, z, biome);
-+    }
-+
-+    @Override
-+    public boolean canSpawn(org.bukkit.World world, int x, int z) {
-+        return timedGenerator.canSpawn(world, x, z);
-+    }
-+
-+    @Override
-+    public List<BlockPopulator> getDefaultPopulators(org.bukkit.World world) {
-+        return timedGenerator.getDefaultPopulators(world);
-+    }
-+
-+    @Override
-+    public Location getFixedSpawnLocation(org.bukkit.World world, Random random) {
-+        return timedGenerator.getFixedSpawnLocation(world, random);
-+    }
-+
-+    @Override
-+    public Chunk getOrCreateChunk(int i, int j) {
-+        try (Timing ignored = world.timings.chunkGeneration.startTiming()) {
-+            return timedGenerator.getOrCreateChunk(i, j);
-+        }
-+    }
-+
-+    @Override
-+    public void recreateStructures(int i, int j) {
-+        try (Timing ignored = world.timings.syncChunkLoadStructuresTimer.startTiming()) {
-+            timedGenerator.recreateStructures(i, j);
-+        }
-+    }
-+
-+    @Override
-+    public boolean a(Chunk chunk, int i, int j) {
-+        return timedGenerator.a(chunk, i, j);
-+    }
-+
-+    @Override
-+    public List<BiomeMeta> getMobsFor(EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
-+        return timedGenerator.getMobsFor(enumcreaturetype, blockposition);
-+    }
-+
-+    @Override
-+    @Nullable
-+    public BlockPosition findNearestMapFeature(World world, String s, BlockPosition blockposition) {
-+        return timedGenerator.findNearestMapFeature(world, s, blockposition);
-+    }
-+
-+    @Override
-+    public void recreateStructures(Chunk chunk, int i, int j) {
-+        try (Timing ignored = world.timings.syncChunkLoadStructuresTimer.startTiming()) {
-+            timedGenerator.recreateStructures(chunk, i, j);
-+        }
-+    }
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 0000000..36aafb2
+index 0000000..741da72
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,85 @@
 +package co.aikar.timings;
 +
 +import net.minecraft.server.World;
@@ -294,7 +158,6 @@ index 0000000..36aafb2
 +    public final Timing scheduledBlocksCleanup;
 +    public final Timing scheduledBlocksTicking;
 +    public final Timing chunkTicks;
-+    public final Timing lightChunk;
 +    public final Timing chunkTicksBlocks;
 +    public final Timing doVillages;
 +    public final Timing doChunkMap;
@@ -319,12 +182,10 @@ index 0000000..36aafb2
 +    public final Timing syncChunkLoadTimer;
 +    public final Timing syncChunkLoadDataTimer;
 +    public final Timing syncChunkLoadStructuresTimer;
++    public final Timing syncChunkLoadEntitiesTimer;
++    public final Timing syncChunkLoadTileEntitiesTimer;
++    public final Timing syncChunkLoadTileTicksTimer;
 +    public final Timing syncChunkLoadPostTimer;
-+    public final Timing syncChunkLoadNBTTimer;
-+    public final Timing syncChunkLoadPopulateNeighbors;
-+    public final Timing chunkGeneration;
-+    public final Timing chunkIOStage1;
-+    public final Timing chunkIOStage2;
 +
 +    public WorldTimingsHandler(World server) {
 +        String name = server.worldData.getName() +" - ";
@@ -335,7 +196,6 @@ index 0000000..36aafb2
 +        scheduledBlocksCleanup = Timings.ofSafe(name + "Scheduled Blocks - Cleanup");
 +        scheduledBlocksTicking = Timings.ofSafe(name + "Scheduled Blocks - Ticking");
 +        chunkTicks = Timings.ofSafe(name + "Chunk Ticks");
-+        lightChunk = Timings.ofSafe(name + "Light Chunk");
 +        chunkTicksBlocks = Timings.ofSafe(name + "Chunk Ticks - Blocks");
 +        doVillages = Timings.ofSafe(name + "doVillages");
 +        doChunkMap = Timings.ofSafe(name + "doChunkMap");
@@ -356,13 +216,11 @@ index 0000000..36aafb2
 +
 +        syncChunkLoadTimer = Timings.ofSafe(name + "syncChunkLoad");
 +        syncChunkLoadDataTimer = Timings.ofSafe(name + "syncChunkLoad - Data");
-+        syncChunkLoadStructuresTimer = Timings.ofSafe(name + "chunkLoad - recreateStructures");
++        syncChunkLoadStructuresTimer = Timings.ofSafe(name + "chunkLoad - Structures");
++        syncChunkLoadEntitiesTimer = Timings.ofSafe(name + "chunkLoad - Entities");
++        syncChunkLoadTileEntitiesTimer = Timings.ofSafe(name + "chunkLoad - TileEntities");
++        syncChunkLoadTileTicksTimer = Timings.ofSafe(name + "chunkLoad - TileTicks");
 +        syncChunkLoadPostTimer = Timings.ofSafe(name + "chunkLoad - Post");
-+        syncChunkLoadNBTTimer = Timings.ofSafe(name + "chunkLoad - NBT");
-+        syncChunkLoadPopulateNeighbors = Timings.ofSafe(name + "chunkLoad - Populate Neighbors");
-+        chunkGeneration = Timings.ofSafe(name + "chunkGeneration");
-+        chunkIOStage1 = Timings.ofSafe(name + "ChunkIO Stage 1 - DiskIO");
-+        chunkIOStage2 = Timings.ofSafe(name + "ChunkIO Stage 2 - Post Load");
 +
 +        tracker1 = Timings.ofSafe(name + "tracker stage 1");
 +        tracker2 = Timings.ofSafe(name + "tracker stage 2");
@@ -434,94 +292,6 @@ index a106e44..d17160a 100644
  
      public static int getId(Block block) {
          return Block.REGISTRY.a(block); // CraftBukkit - decompile error
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b651edc..5807bb8 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -900,7 +900,7 @@ public class Chunk {
- 
-     // CraftBukkit start
-     public void loadNearby(IChunkProvider ichunkprovider, ChunkGenerator chunkgenerator, boolean newChunk) {
--        world.timings.syncChunkLoadPostTimer.startTiming(); // Spigot
-+        world.timings.syncChunkLoadPostTimer.startTiming(); // Paper
-         Server server = world.getServer();
-         if (server != null) {
-             /*
-@@ -926,7 +926,8 @@ public class Chunk {
-             }
-         }
-         // CraftBukkit end
--
-+        world.timings.syncChunkLoadPostTimer.stopTiming(); // Paper
-+        world.timings.syncChunkLoadPopulateNeighbors.startTiming(); // Paper
-         Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1);
-         Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ);
-         Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1);
-@@ -951,7 +952,7 @@ public class Chunk {
-                 chunk4.a(chunkgenerator);
-             }
-         }
--        world.timings.syncChunkLoadPostTimer.stopTiming(); // Spigot
-+        world.timings.syncChunkLoadPopulateNeighbors.stopTiming(); // Paper
- 
-     }
- 
-@@ -1164,6 +1165,7 @@ public class Chunk {
-     }
- 
-     public void o() {
-+        world.timings.lightChunk.startTiming(); // Paper
-         this.done = true;
-         this.lit = true;
-         BlockPosition blockposition = new BlockPosition(this.locX << 4, 0, this.locZ << 4);
-@@ -1197,6 +1199,7 @@ public class Chunk {
-             }
-         }
- 
-+        world.timings.lightChunk.stopTiming(); // Paper
-     }
- 
-     private void z() {
-diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 3de34be..31eb342 100644
---- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -387,7 +387,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
- 
-     public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
-         // CraftBukkit end
--        world.timings.syncChunkLoadEntitiesTimer.startTiming(); // Spigot
-+        world.timings.syncChunkLoadNBTTimer.startTiming(); // Spigot
-         NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
- 
-         if (nbttaglist1 != null) {
-@@ -398,8 +398,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-                 chunk.g(true);
-             }
-         }
--        world.timings.syncChunkLoadEntitiesTimer.stopTiming(); // Spigot
--        world.timings.syncChunkLoadTileEntitiesTimer.startTiming(); // Spigot
-         NBTTagList nbttaglist2 = nbttagcompound.getList("TileEntities", 10);
- 
-         if (nbttaglist2 != null) {
-@@ -412,8 +410,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-                 }
-             }
-         }
--        world.timings.syncChunkLoadTileEntitiesTimer.stopTiming(); // Spigot
--        world.timings.syncChunkLoadTileTicksTimer.startTiming(); // Spigot
- 
-         if (nbttagcompound.hasKeyOfType("TileTicks", 9)) {
-             NBTTagList nbttaglist3 = nbttagcompound.getList("TileTicks", 10);
-@@ -433,7 +429,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-                 }
-             }
-         }
--        world.timings.syncChunkLoadTileTicksTimer.stopTiming(); // Spigot
-+        world.timings.syncChunkLoadNBTTimer.stopTiming(); // Spigot
- 
-         // return chunk; // CraftBukkit
-     }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
 index 11a49a3..e70d5c5 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -695,7 +465,7 @@ index 5432e70..72cd51a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3d76e54..0024d3d 100644
+index 26f8467..891c7ea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,7 +45,7 @@ import org.bukkit.Bukkit;
@@ -986,48 +756,6 @@ index d5dd29b..13a6cfe 100644
          // this.minecraftServer.getCommandHandler().a(this.player, s);
          // CraftBukkit end
      }
-diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 8dd434c..c965af1 100644
---- a/src/main/java/net/minecraft/server/StructureGenerator.java
-+++ b/src/main/java/net/minecraft/server/StructureGenerator.java
-@@ -1,5 +1,7 @@
- package net.minecraft.server;
- 
-+import co.aikar.timings.MinecraftTimings;
-+import co.aikar.timings.Timing;
- import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
- import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
- import java.util.Iterator;
-@@ -8,11 +10,13 @@ import java.util.Random;
- 
- public abstract class StructureGenerator extends WorldGenBase {
- 
-+    private final Timing timing = MinecraftTimings.getStructureTiming(this); // Paper
-     private PersistentStructure a;
-     protected Long2ObjectMap<StructureStart> c = new Long2ObjectOpenHashMap(1024);
- 
-     public StructureGenerator() {}
- 
-+    public String getName() { return a(); } // Paper // OBF HELPER
-     public abstract String a();
- 
-     protected final synchronized void a(World world, final int i, final int j, int k, int l, ChunkSnapshot chunksnapshot) {
-@@ -68,6 +72,7 @@ public abstract class StructureGenerator extends WorldGenBase {
-     }
- 
-     public synchronized boolean a(World world, Random random, ChunkCoordIntPair chunkcoordintpair) {
-+        timing.startTiming(); // Paper
-         this.a(world);
-         int i = (chunkcoordintpair.x << 4) + 8;
-         int j = (chunkcoordintpair.z << 4) + 8;
-@@ -84,6 +89,7 @@ public abstract class StructureGenerator extends WorldGenBase {
-                 this.a(structurestart.e(), structurestart.f(), structurestart);
-             }
-         }
-+        timing.stopTiming(); // Paper
- 
-         return flag;
-     }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
 index 42f37df..2b82312 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
@@ -1155,7 +883,7 @@ index e649435..b73f64e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0668887..94d07eb 100644
+index 0668887..e0f448d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -245,13 +245,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1235,20 +963,11 @@ index 0668887..94d07eb 100644
  
                  this.methodProfiler.b();
                  this.U.clear();
-@@ -842,7 +850,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-             gen = new org.bukkit.craftbukkit.generator.NormalChunkGenerator(this, this.getSeed());
-         }
- 
--        return new ChunkProviderServer(this, ichunkloader, gen);
-+        return new ChunkProviderServer(this, ichunkloader, new co.aikar.timings.TimedChunkGenerator(this, gen)); // Paper
-         // CraftBukkit end
-     }
- 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 03169db..a519b71 100644
+index e7e9941..5f2a9b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1722,6 +1722,7 @@ public final class CraftServer implements Server {
+@@ -1727,6 +1727,7 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -1256,7 +975,7 @@ index 03169db..a519b71 100644
          @Override
          public YamlConfiguration getConfig()
          {
-@@ -1729,6 +1730,24 @@ public final class CraftServer implements Server {
+@@ -1734,6 +1735,24 @@ public final class CraftServer implements Server {
          }
  
          @Override
@@ -1460,50 +1179,6 @@ index 41d2d87..0000000
 -        }
 -    }
 -}
-diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b44..b5efb9c 100644
---- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-@@ -1,6 +1,8 @@
- package org.bukkit.craftbukkit.chunkio;
- 
- import java.io.IOException;
-+
-+import co.aikar.timings.Timing;
- import net.minecraft.server.Chunk;
- import net.minecraft.server.ChunkCoordIntPair;
- import net.minecraft.server.ChunkRegionLoader;
-@@ -16,7 +18,7 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
- 
-     // async stuff
-     public Chunk callStage1(QueuedChunk queuedChunk) throws RuntimeException {
--        try {
-+        try (Timing ignored = queuedChunk.provider.world.timings.chunkIOStage1.startTimingIfSync()) { // Paper
-             ChunkRegionLoader loader = queuedChunk.loader;
-             Object[] data = loader.loadChunk(queuedChunk.world, queuedChunk.x, queuedChunk.z);
-             
-@@ -38,6 +40,7 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
-             queuedChunk.provider.originalGetChunkAt(queuedChunk.x, queuedChunk.z);
-             return;
-         }
-+        try (Timing ignored = queuedChunk.provider.world.timings.chunkIOStage2.startTimingIfSync()) { // Paper
- 
-         queuedChunk.loader.loadEntities(chunk, queuedChunk.compound.getCompound("Level"), queuedChunk.world);
-         chunk.setLastSaved(queuedChunk.provider.world.getTime());
-@@ -45,12 +48,11 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
-         chunk.addEntities();
- 
-         if (queuedChunk.provider.chunkGenerator != null) {
--            queuedChunk.provider.world.timings.syncChunkLoadStructuresTimer.startTiming(); // Spigot
-             queuedChunk.provider.chunkGenerator.recreateStructures(chunk, queuedChunk.x, queuedChunk.z);
--            queuedChunk.provider.world.timings.syncChunkLoadStructuresTimer.stopTiming(); // Spigot
-         }
- 
-         chunk.loadNearby(queuedChunk.provider, queuedChunk.provider.chunkGenerator, false);
-+        } // Paper
-     }
- 
-     public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index 3c75538..5874554 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1736,5 +1411,5 @@ index 30efc99..eb30abe 100644
      }
  }
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 9275fa2d8..e928dbc3f 100644
--- a/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From acc975233d5156a27b006b1fb3c2d6f60af97aa2 Mon Sep 17 00:00:00 2001
+From 2053173e8972809f9e883ec0633d325101aad5c9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -20,7 +20,7 @@ index a8b5079..ebbc1fc 100644
              EULA.a.warn("Failed to save {}", new Object[] { this.b, exception});
          } finally {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0024d3d..37d25c1 100644
+index 891c7ea..062cfd6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1030,7 +1030,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -33,10 +33,10 @@ index 0024d3d..37d25c1 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c880d85..34daa73 100644
+index 5f2a9b0..4ac573f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -131,7 +131,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
+@@ -132,7 +132,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
  
  public final class CraftServer implements Server {
      private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
@@ -80,5 +80,5 @@ index 94a3d42..3ed983c 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.9.0.windows.1
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
index 1b087630e..4ec72ceed 100644
--- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From 78b963270f4b2957d9c9b4bbcafc34e2b109a68a Mon Sep 17 00:00:00 2001
+From 047c0e003720a57493daadd0211932a833a55331 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 37d25c1..8ca0022 100644
+index 062cfd6..1363472 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -109,17 +109,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -148,10 +148,10 @@ index 37d25c1..8ca0022 100644
                      }
                      lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c9d349a..1d9933f 100644
+index 4ac573f..b5132cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1719,6 +1719,17 @@ public final class CraftServer implements Server {
+@@ -1724,6 +1724,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
diff --git a/Spigot-Server-Patches/0031-Lighting-Queue.patch b/Spigot-Server-Patches/0031-Lighting-Queue.patch
index 8ca263e44..b7b5c636b 100644
--- a/Spigot-Server-Patches/0031-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0031-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From f8a9a1de88d6073309d39ae803d9627284d2657d Mon Sep 17 00:00:00 2001
+From 6a7b6bc589f136582c083249c2ccaca5d436c5bb Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -6,19 +6,19 @@ Subject: [PATCH] Lighting Queue
 This provides option to queue lighting updates to ensure they do not cause the server lag
 
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-index 36aafb2..90bdbf0 100644
+index 741da72..8b3aa17 100644
 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-@@ -45,6 +45,8 @@ public class WorldTimingsHandler {
-     public final Timing chunkIOStage1;
-     public final Timing chunkIOStage2;
+@@ -42,6 +42,8 @@ public class WorldTimingsHandler {
+     public final Timing syncChunkLoadTileTicksTimer;
+     public final Timing syncChunkLoadPostTimer;
  
 +    public final Timing lightingQueueTimer;
 +
      public WorldTimingsHandler(World server) {
          String name = server.worldData.getName() +" - ";
  
-@@ -87,5 +89,7 @@ public class WorldTimingsHandler {
+@@ -81,5 +83,7 @@ public class WorldTimingsHandler {
          tracker2 = Timings.ofSafe(name + "tracker stage 2");
          doTick = Timings.ofSafe(name + "doTick");
          tickEntities = Timings.ofSafe(name + "tickEntities");
@@ -42,7 +42,7 @@ index d78b688..158db3a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 445419f..76130c9 100644
+index 015a223..0fae95d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -33,6 +33,7 @@ public class Chunk {
@@ -97,7 +97,7 @@ index 5682f03..5eeefe8 100644
          // Update neighbor counts
          for (int x = -2; x < 3; x++) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8ca0022..7f6a29d 100644
+index 1363472..d0060d0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -709,7 +709,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -235,5 +235,5 @@ index 8fb8176..672167a 100644
                  }
  
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0035-Generator-Settings.patch b/Spigot-Server-Patches/0035-Generator-Settings.patch
index ecb63033c..f5f96c530 100644
--- a/Spigot-Server-Patches/0035-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0035-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From 1a7f83a720833355b7b0afa6b14d1f4a47a106c6 Mon Sep 17 00:00:00 2001
+From 98c93c01ba0a797b56fb0d268689f5ff3be93913 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
@@ -245,10 +245,10 @@ index 6e6ecd8..e95175e 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index c965af1..3ce4449 100644
+index 8dd434c..4248a36 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
-@@ -95,6 +95,7 @@ public abstract class StructureGenerator extends WorldGenBase {
+@@ -89,6 +89,7 @@ public abstract class StructureGenerator extends WorldGenBase {
      }
  
      public boolean b(BlockPosition blockposition) {
@@ -256,7 +256,7 @@ index c965af1..3ce4449 100644
          this.a(this.g);
          return this.c(blockposition) != null;
      }
-@@ -122,6 +123,7 @@ public abstract class StructureGenerator extends WorldGenBase {
+@@ -116,6 +117,7 @@ public abstract class StructureGenerator extends WorldGenBase {
      }
  
      public synchronized boolean b(World world, BlockPosition blockposition) { // CraftBukkit - synchronized
@@ -265,5 +265,5 @@ index c965af1..3ce4449 100644
          Iterator iterator = this.c.values().iterator();
  
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch
index f159e3621..174deb033 100644
--- a/Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From be3b69bb55a7198a0526725468880dae5e342cc5 Mon Sep 17 00:00:00 2001
+From ba0189de9deaa9bdd967c32551bdb726c63979d6 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,7 +14,7 @@ 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 5bbb644..9abe333 100644
+index 06f394b..7d67e67 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1266,6 +1266,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -48,10 +48,10 @@ index 5bbb644..9abe333 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 408ef34..541b8d8 100644
+index b5132cd..8e501b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -643,6 +643,29 @@ public final class CraftServer implements Server {
+@@ -644,6 +644,29 @@ public final class CraftServer implements Server {
          Validate.notNull(sender, "Sender cannot be null");
          Validate.notNull(commandLine, "CommandLine cannot be null");
  
@@ -82,5 +82,5 @@ index 408ef34..541b8d8 100644
              return true;
          }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch b/Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch
deleted file mode 100644
index eb32e7964..000000000
--- a/Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 5c36bac6b665288e1217a6d54f3c41a1c5b3b886 Mon Sep 17 00:00:00 2001
-From: DemonWav <demonwav@gmail.com>
-Date: Thu, 3 Mar 2016 01:44:39 -0600
-Subject: [PATCH] Add Location support to tab completers (vanilla feature
- missing in CraftBukkit)
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b302cb7..75e7b78 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -249,4 +249,9 @@ public class PaperWorldConfig {
-     private void allChunksAreSlimeChunks() {
-         allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
-     }
-+
-+    public boolean allowBlockLocationTabCompletion;
-+    private void allowBlockLocationTabCompletion() {
-+        allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a41c931..453e600 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1158,7 +1158,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
-             return arraylist;
-         }
-         */
--        return server.tabComplete(icommandlistener, s); // PAIL : todo args
-+        return server.tabComplete(icommandlistener, s, blockposition); // PAIL : todo args // Paper - add Location arg
-         // CraftBukkit end
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2b9959a..fdbf02b 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -25,17 +25,11 @@ import javax.imageio.ImageIO;
- 
- import net.minecraft.server.*;
- 
--import org.bukkit.BanList;
--import org.bukkit.Bukkit;
--import org.bukkit.ChatColor;
--import org.bukkit.GameMode;
--import org.bukkit.OfflinePlayer;
--import org.bukkit.Server;
--import org.bukkit.UnsafeValues;
-+import net.minecraft.server.WorldType;
-+import org.bukkit.*;
- import org.bukkit.Warning.WarningState;
- import org.bukkit.World;
- import org.bukkit.World.Environment;
--import org.bukkit.WorldCreator;
- import org.bukkit.boss.BarColor;
- import org.bukkit.boss.BarFlag;
- import org.bukkit.boss.BarStyle;
-@@ -1603,6 +1597,14 @@ public final class CraftServer implements Server {
-     }
- 
-     public List<String> tabComplete(net.minecraft.server.ICommandListener sender, String message) {
-+        return tabComplete(sender, message, null); // Paper - location tab-completes. Original code here moved below
-+    }
-+
-+    // Paper start - add BlockPosition support
-+    /*
-+      this code is copied, except for the noted change, from the original tabComplete(net.minecraft.server.ICommandListener sender, String message) method
-+     */
-+    public List<String> tabComplete(net.minecraft.server.ICommandListener sender, String message, BlockPosition blockPosition) {
-         if (!(sender instanceof EntityPlayer)) {
-             return ImmutableList.of();
-         }
-@@ -1610,7 +1612,7 @@ public final class CraftServer implements Server {
-         List<String> offers;
-         Player player = ((EntityPlayer) sender).getBukkitEntity();
-         if (message.startsWith("/")) {
--            offers = tabCompleteCommand(player, message);
-+            offers = tabCompleteCommand(player, message, blockPosition);
-         } else {
-             offers = tabCompleteChat(player, message);
-         }
-@@ -1619,11 +1621,20 @@ public final class CraftServer implements Server {
-         getPluginManager().callEvent(tabEvent);
- 
-         return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
-+        // Paper end
-     }
- 
-     public List<String> tabCompleteCommand(Player player, String message) {
-+        return tabCompleteCommand(player, message, null); // Paper - location tab-completes. Original code here moved below
-+    }
-+
-+    // Paper start - add BlockPosition support
-+    /*
-+      this code is copied, except for the noted change, from the original tabComplete(net.minecraft.server.ICommandListener sender, String message) method
-+     */
-+    public List<String> tabCompleteCommand(Player player, String message, BlockPosition blockPosition) {
-         // Spigot Start
--		if ( (org.spigotmc.SpigotConfig.tabComplete < 0 || message.length() <= org.spigotmc.SpigotConfig.tabComplete) && !message.contains( " " ) )
-+        if ( (org.spigotmc.SpigotConfig.tabComplete < 0 || message.length() <= org.spigotmc.SpigotConfig.tabComplete) && !message.contains( " " ) )
-         {
-             return ImmutableList.of();
-         }
-@@ -1631,7 +1642,14 @@ public final class CraftServer implements Server {
- 
-         List<String> completions = null;
-         try {
--            completions = getCommandMap().tabComplete(player, message.substring(1));
-+            // send location info if presen
-+            // completions = getCommandMap().tabComplete(player, message.substring(1));
-+            if (blockPosition == null || !((CraftWorld) player.getWorld()).getHandle().paperConfig.allowBlockLocationTabCompletion) {
-+                completions = getCommandMap().tabComplete(player, message.substring(1));
-+            } else {
-+                completions = getCommandMap().tabComplete(player, message.substring(1), new Location(player.getWorld(), blockPosition.getX(), blockPosition.getY(), blockPosition.getZ()));
-+            }
-+            // Paper end
-         } catch (CommandException ex) {
-             player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
-             getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 0930d30..7461d04 100644
---- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -7,6 +7,7 @@ import net.minecraft.server.*;
- 
- import org.apache.commons.lang.Validate;
- import org.apache.logging.log4j.Level;
-+import org.bukkit.Location;
- import org.bukkit.command.BlockCommandSender;
- import org.bukkit.command.CommandSender;
- import org.bukkit.command.ConsoleCommandSender;
-@@ -39,10 +40,23 @@ public final class VanillaCommandWrapper extends VanillaCommand {
- 
-     @Override
-     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
-+        return tabComplete(sender, alias, args, null); // Paper - location tab-completes. Original code moved below
-+    }
-+
-+    // Paper start - location tab-completes
-+    /*
-+      this code is copied, except for the noted change, from the original tabComplete(CommandSender sender, String alias, String[] args) method
-+     */
-+    @Override
-+    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
-         Validate.notNull(sender, "Sender cannot be null");
-         Validate.notNull(args, "Arguments cannot be null");
-         Validate.notNull(alias, "Alias cannot be null");
--        return (List<String>) vanillaCommand.tabComplete(MinecraftServer.getServer(), getListener(sender), args, new BlockPosition(0, 0, 0));
-+        if (location == null) { // PaperSpigot use location information if available
-+            return (List<String>) vanillaCommand.tabComplete(MinecraftServer.getServer(), getListener(sender), args, new BlockPosition(0, 0, 0));
-+        } else {
-+            return (List<String>) vanillaCommand.tabComplete(MinecraftServer.getServer(), getListener(sender), args, new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()));
-+        }
-     }
- 
-     public static CommandSender lastSender = null; // Nasty :(
--- 
-2.9.2.windows.1
-
diff --git a/Spigot-Server-Patches/0058-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0057-Optimize-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0058-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0057-Optimize-Pathfinding.patch
index 291ad20c9..d6d1bf39a 100644
--- a/Spigot-Server-Patches/0058-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0057-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 6dc93d12b7697e416a6e8fdcbaefaafc78cc8a2b Mon Sep 17 00:00:00 2001
+From 945883cc3c1607c13de3b07dc660287c8d5d87ac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -47,5 +47,5 @@ index c9cfe3f..b1a90c1 100644
      }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0059-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0058-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from Spigot-Server-Patches/0059-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0058-Avoid-hopper-searches-if-there-are-no-items.patch
index ca1b9975e..191ccb790 100644
--- a/Spigot-Server-Patches/0059-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0058-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 4218b818924a5051199822173d5fe96a416ed53d Mon Sep 17 00:00:00 2001
+From fb9bba1325d10fa5e1b3b026cf23084d07259544 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -95,5 +95,5 @@ index 0fae95d..684e5f7 100644
  
              while (iterator.hasNext()) {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0060-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0059-Expose-server-CommandMap.patch
similarity index 77%
rename from Spigot-Server-Patches/0060-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0059-Expose-server-CommandMap.patch
index f7638a6d7..11b855c1e 100644
--- a/Spigot-Server-Patches/0060-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0059-Expose-server-CommandMap.patch
@@ -1,14 +1,14 @@
-From 25e6aa19756ac7da6b70ebf5c66db4ed53f7eb97 Mon Sep 17 00:00:00 2001
+From c3907844a571935fcc6702d446cdb9a4f86c4354 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fdbf02b..f3bad60 100644
+index 8e501b6..c7cd3f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1557,6 +1557,7 @@ public final class CraftServer implements Server {
+@@ -1564,6 +1564,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  
diff --git a/Spigot-Server-Patches/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0060-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 92%
rename from Spigot-Server-Patches/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0060-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 6f1e6e7ad..0f244040e 100644
--- a/Spigot-Server-Patches/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0060-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,11 +1,11 @@
-From 37ad3a919da6d26ad26533012762804c0c852000 Mon Sep 17 00:00:00 2001
+From 2d0f7682e747d6066192545d2d664a974b7fd112 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index feef438..5b7eae5 100644
+index cffa778..a123d5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -92,7 +92,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0062-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 90%
rename from Spigot-Server-Patches/0062-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to Spigot-Server-Patches/0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 683690c0d..4bf6e804b 100644
--- a/Spigot-Server-Patches/0062-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-Server-Patches/0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,14 +1,14 @@
-From 51bc2e377c4e43cf11a51ff4b0be4a8ce5d2885b Mon Sep 17 00:00:00 2001
+From 24439dcdd7417c184668ebb038d974f5abea1224 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 f3bad60..59c8826 100644
+index c7cd3f7..b44808f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1310,6 +1310,18 @@ public final class CraftServer implements Server {
+@@ -1317,6 +1317,18 @@ public final class CraftServer implements Server {
          return count;
      }
  
@@ -28,7 +28,7 @@ index f3bad60..59c8826 100644
      @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 e09dc78..b3e2e66 100644
+index 75c7ece..ed69814 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 {
diff --git a/Spigot-Server-Patches/0063-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0062-Player-Tab-List-and-Title-APIs.patch
similarity index 98%
rename from Spigot-Server-Patches/0063-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0062-Player-Tab-List-and-Title-APIs.patch
index 04c046aa9..c2a0e839e 100644
--- a/Spigot-Server-Patches/0063-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0062-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 1608cd40656ac9b476859d2d2def639550f4874f Mon Sep 17 00:00:00 2001
+From 759dd716bdc7dfccd3b4450b6ea6321cf7114434 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 31a2b21..8a0839c 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 88412f8..d9dd3eb 100644
+index ed69814..86286a5 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 @@
@@ -173,5 +173,5 @@ index 88412f8..d9dd3eb 100644
  
      @Override
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0064-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0063-Ensure-inv-drag-is-in-bounds.patch
similarity index 93%
rename from Spigot-Server-Patches/0064-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0063-Ensure-inv-drag-is-in-bounds.patch
index e27cd9371..c65b63957 100644
--- a/Spigot-Server-Patches/0064-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0063-Ensure-inv-drag-is-in-bounds.patch
@@ -1,4 +1,4 @@
-From 64331394e7398883d753bf51736ac1f9144705e1 Mon Sep 17 00:00:00 2001
+From 95706d529b7c7d6d68f3c5d9ab39b8c00db8febe 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/0065-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0064-Change-implementation-of-tile-entity-removal-list.patch
similarity index 98%
rename from Spigot-Server-Patches/0065-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0064-Change-implementation-of-tile-entity-removal-list.patch
index 7522ba49a..a4775ab39 100644
--- a/Spigot-Server-Patches/0065-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0064-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,4 +1,4 @@
-From 0c9284853514a380de8e9f43d7826acf7d6e4841 Mon Sep 17 00:00:00 2001
+From e13c2b098cff6523e0f9bdaabe9fbb759c7b173f 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/Spigot-Server-Patches/0066-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0065-Add-configurable-portal-search-radius.patch
similarity index 88%
rename from Spigot-Server-Patches/0066-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0065-Add-configurable-portal-search-radius.patch
index 7bff8d200..2cba5f164 100644
--- a/Spigot-Server-Patches/0066-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0065-Add-configurable-portal-search-radius.patch
@@ -1,16 +1,16 @@
-From 3e529ff8e46271ef3e60ec7f9268f11735d97990 Mon Sep 17 00:00:00 2001
+From 0f11e06322d6f8d2678033081b477196fb5d9d77 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 75e7b78..5807609 100644
+index b302cb7..086cab0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -254,4 +254,9 @@ public class PaperWorldConfig {
-     private void allowBlockLocationTabCompletion() {
-         allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
+@@ -249,4 +249,9 @@ public class PaperWorldConfig {
+     private void allChunksAreSlimeChunks() {
+         allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
 +
 +    public int portalSearchRadius;
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0067-Add-velocity-warnings.patch b/Spigot-Server-Patches/0066-Add-velocity-warnings.patch
similarity index 91%
rename from Spigot-Server-Patches/0067-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0066-Add-velocity-warnings.patch
index b7efd74ab..3089b1720 100644
--- a/Spigot-Server-Patches/0067-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0066-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From e89c6191576e753b2742b027227a378963d67b72 Mon Sep 17 00:00:00 2001
+From e03a75ce7f4d8561cd2ae428ed4b5c4a2d1054cb Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 5e81076..43f2c68 100644
+index 6f6b90b..719dd66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -205,6 +205,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -22,5 +22,5 @@ index 5e81076..43f2c68 100644
          entity.motY = vel.getY();
          entity.motZ = vel.getZ();
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0068-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0067-Fix-inter-world-teleportation-glitches.patch
similarity index 92%
rename from Spigot-Server-Patches/0068-Fix-inter-world-teleportation-glitches.patch
rename to Spigot-Server-Patches/0067-Fix-inter-world-teleportation-glitches.patch
index 41fe3aa30..9c5451be4 100644
--- a/Spigot-Server-Patches/0068-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0067-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From 2f889b7b96695761c43f97cc3541d53d6726b1f9 Mon Sep 17 00:00:00 2001
+From 6b98bfa4a580925dc777e7182ab2d6e17d7b381a 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
@@ -11,10 +11,10 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
 The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5807609..034369a 100644
+index 086cab0..aabd629 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -259,4 +259,9 @@ public class PaperWorldConfig {
+@@ -254,4 +254,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }
@@ -25,7 +25,7 @@ index 5807609..034369a 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d9dd3eb..101dc2b 100644
+index 86286a5..a6851e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -572,7 +572,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -39,5 +39,5 @@ index d9dd3eb..101dc2b 100644
          return true;
      }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0069-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0068-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0069-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0068-Add-exception-reporting-event.patch
index cbf5ad2d7..fdf1ad6cc 100644
--- a/Spigot-Server-Patches/0069-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0068-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 570d621bb13515e668ed7a282e0d24f348f1cb82 Mon Sep 17 00:00:00 2001
+From 108eb9cb891131532840f1a0cc670a5ae1f92409 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
@@ -372,5 +372,5 @@ index 2a22697..d82dddf 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.9.0.windows.1
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0070-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 94%
rename from Spigot-Server-Patches/0070-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 396c8ac6b..653ce981c 100644
--- a/Spigot-Server-Patches/0070-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From e11bae4003629ef3f93d618965611e3248a3024f Mon Sep 17 00:00:00 2001
+From a829086a2ebc2b827c4b58d4c2fba1b0d5d14728 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
@@ -26,5 +26,5 @@ index c0e1199..bc6c054 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0070-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 94%
rename from Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0070-Disable-Scoreboards-for-non-players-by-default.patch
index fcdece686..a21d6b124 100644
--- a/Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0070-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From c668d31b904f5c02b31e7aa742a746114525e9cb Mon Sep 17 00:00:00 2001
+From 1004124199af96178875ccfa205bbd2b881fdba0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 034369a..308dfdd 100644
+index aabd629..047fa5f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -264,4 +264,9 @@ public class PaperWorldConfig {
+@@ -259,4 +259,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
diff --git a/Spigot-Server-Patches/0072-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 96%
rename from Spigot-Server-Patches/0072-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 67b424244..d35d42b0c 100644
--- a/Spigot-Server-Patches/0072-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From cd875f12a2ab50bf384fce9ace013e478f46eeef Mon Sep 17 00:00:00 2001
+From 154d80b8db25446e496480dedefa1f4c4d9f4537 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/Spigot-Server-Patches/0073-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0072-Complete-resource-pack-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0073-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0072-Complete-resource-pack-API.patch
index 3e8a55f78..e975812c1 100644
--- a/Spigot-Server-Patches/0073-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0072-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From 23fc12506a96c04c5b860836943e912fbf12192c Mon Sep 17 00:00:00 2001
+From 07bd002edcb8a62463ae788686c76f84ac2474d2 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
@@ -24,7 +24,7 @@ index 7d67e67..d5e06f0 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 0c0906a..e372761 100644
+index a6851e6..8ac7ec5 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 {
@@ -72,5 +72,5 @@ index 0c0906a..e372761 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.0.windows.1
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0074-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0073-Chunk-save-queue-improvements.patch
similarity index 90%
rename from Spigot-Server-Patches/0074-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0073-Chunk-save-queue-improvements.patch
index c9e85095f..5839b812b 100644
--- a/Spigot-Server-Patches/0074-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0073-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From 4a5adb304339d69522e2f49cbea50203ec692b3e Mon Sep 17 00:00:00 2001
+From cb7cba1492fa45cb0b8d20862147e971ff40b9c4 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 9ab6445..d01bca1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 11ee148..e6e7626 100644
+index ff450f4..73b8b8b 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;
@@ -77,7 +77,7 @@ index 11ee148..e6e7626 100644
  
          // Paper start - Don't create region files when checking that they exist
          final RegionFile region = RegionFileCache.a(this.d, i, j, false);
-@@ -143,28 +146,32 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -143,35 +146,32 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      protected void a(ChunkCoordIntPair chunkcoordintpair, NBTTagCompound nbttagcompound) {
@@ -91,7 +91,10 @@ index 11ee148..e6e7626 100644
      }
  
      public boolean c() {
--        if (this.b.isEmpty()) {
+-        // CraftBukkit start
+-        Iterator<Map.Entry<ChunkCoordIntPair, NBTTagCompound>> iter = this.b.entrySet().iterator();
+-        if (!iter.hasNext()) {
+-            // CraftBukkit end
 +        // Paper start - Chunk queue improvements
 +        QueuedChunk chunk = queue.poll();
 +        if (chunk == null) {
@@ -102,20 +105,24 @@ index 11ee148..e6e7626 100644
  
              return false;
          } else {
--            ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair) this.b.keySet().iterator().next();
+-            // CraftBukkit start
+-            Map.Entry<ChunkCoordIntPair, NBTTagCompound> entry = iter.next();
+-            iter.remove(); // Pop single entry
+-            ChunkCoordIntPair chunkcoordintpair = entry.getKey();
+-            // CraftBukkit end
 +            ChunkCoordIntPair chunkcoordintpair = chunk.coords; // Paper - Chunk queue improvements
  
              boolean flag;
  
              try {
 -                this.c.add(chunkcoordintpair);
--                NBTTagCompound nbttagcompound = (NBTTagCompound) this.b.remove(chunkcoordintpair);
+-                NBTTagCompound nbttagcompound = (NBTTagCompound) entry.getValue(); // CraftBukkit
 +                //this.c.add(chunkcoordintpair);
 +                NBTTagCompound nbttagcompound = chunk.compound; // Paper - Chunk queue improvements
  
                  if (nbttagcompound != null) {
                      try {
-@@ -173,10 +180,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -180,10 +180,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                          ChunkRegionLoader.a.error("Failed to save chunk", exception);
                      }
                  }
@@ -128,7 +135,7 @@ index 11ee148..e6e7626 100644
              }
  
              return flag;
-@@ -547,4 +555,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -558,4 +559,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
              return entity;
          }
      }
@@ -170,5 +177,5 @@ index acfdd52..fdbaf5f 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0075-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0074-Chunk-Save-Reattempt.patch
similarity index 96%
rename from Spigot-Server-Patches/0075-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0074-Chunk-Save-Reattempt.patch
index 0010a66ca..81291a145 100644
--- a/Spigot-Server-Patches/0075-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0074-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 09c3d37924ed5bec863e09c7591700d4c93e9e0e Mon Sep 17 00:00:00 2001
+From 5f1fd279518e6cd364df680680f68e978bdff8ec 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
@@ -42,5 +42,5 @@ index c9bd856..1fe5019 100644
  
      }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0076-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0075-Default-loading-permissions.yml-before-plugins.patch
similarity index 91%
rename from Spigot-Server-Patches/0076-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0075-Default-loading-permissions.yml-before-plugins.patch
index ab9d4aff6..475beab04 100644
--- a/Spigot-Server-Patches/0076-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0075-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From e2700ddea0cdb9c5baedbb0a8dad2f2179f759be Mon Sep 17 00:00:00 2001
+From aac4eafc0b5c966555720e61adea0f17d43be2e6 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,10 +30,10 @@ index d01bca1..2e17397 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 910ac7e..b9c5ae9 100644
+index b44808f..034f8ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -307,6 +307,7 @@ public final class CraftServer implements Server {
+@@ -314,6 +314,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              helpMap.clear();
              helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index 910ac7e..b9c5ae9 100644
          }
  
          Plugin[] plugins = pluginManager.getPlugins();
-@@ -324,7 +325,7 @@ public final class CraftServer implements Server {
+@@ -331,7 +332,7 @@ public final class CraftServer implements Server {
              setVanillaCommands(false);
              // Spigot end
              commandMap.registerServerAliases();
@@ -51,5 +51,5 @@ index 910ac7e..b9c5ae9 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0076-Allow-Reloading-of-Custom-Permissions.patch
similarity index 88%
rename from Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0076-Allow-Reloading-of-Custom-Permissions.patch
index 17205b271..f4dc241b2 100644
--- a/Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0076-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From a182db1fa6f1be5543bab858e24b80a0bd0a900d Mon Sep 17 00:00:00 2001
+From ac5650f87ce333c15cb6386da4243c8132497ba6 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 7b4539f..db16ba8 100644
+index 034f8ed..1609b07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1837,4 +1837,21 @@ public final class CraftServer implements Server {
+@@ -1824,4 +1824,21 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
diff --git a/Spigot-Server-Patches/0078-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0077-Remove-Metadata-on-reload.patch
similarity index 84%
rename from Spigot-Server-Patches/0078-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0077-Remove-Metadata-on-reload.patch
index 5d6c44d6e..635ee103d 100644
--- a/Spigot-Server-Patches/0078-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0077-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From 05209debaec88abb32dc726e7b60b8f3021f657c Mon Sep 17 00:00:00 2001
+From d473ed0e9183c9884c773f74eda8649df8a67a1f 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,10 +7,10 @@ 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 8a591ab..8f08fa5 100644
+index 1609b07..15bef42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -730,6 +730,14 @@ public final class CraftServer implements Server {
+@@ -737,6 +737,14 @@ public final class CraftServer implements Server {
              world.paperConfig.init(); // Paper
          }
  
@@ -26,5 +26,5 @@ index 8a591ab..8f08fa5 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0079-Undead-horse-leashing.patch b/Spigot-Server-Patches/0078-Undead-horse-leashing.patch
similarity index 89%
rename from Spigot-Server-Patches/0079-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0078-Undead-horse-leashing.patch
index 63432012c..36bc10a4f 100644
--- a/Spigot-Server-Patches/0079-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0078-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 2d2f5317a0195e8eba7635ce037baf05c6e14f6d Mon Sep 17 00:00:00 2001
+From 7279a750c265627cbc2a1fae0b3b55e7ef3dd626 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
 default false to match vanilla, but option to allow undead horse types to be leashed.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 308dfdd..55253d6 100644
+index 047fa5f..d136807 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -269,4 +269,9 @@ public class PaperWorldConfig {
+@@ -264,4 +264,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
@@ -32,5 +32,5 @@ index ef429c1..38c4f61 100644
      }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0080-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0079-Fix-Furnace-cook-time-bug.patch
similarity index 93%
rename from Spigot-Server-Patches/0080-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0079-Fix-Furnace-cook-time-bug.patch
index 8560f3ac3..da258aafd 100644
--- a/Spigot-Server-Patches/0080-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0079-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From 2a84e2d7242ff8c813cb8afabb05db08a9239546 Mon Sep 17 00:00:00 2001
+From 20fc130a9938e0150010d5167509874426a80209 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
@@ -22,5 +22,5 @@ index fd6c246..db235c3 100644
                  this.burn();
                  flag1 = true;
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0081-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0080-Handle-Item-Meta-Inconsistencies.patch
similarity index 99%
rename from Spigot-Server-Patches/0081-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0080-Handle-Item-Meta-Inconsistencies.patch
index 94f6d416c..47ab04f27 100644
--- a/Spigot-Server-Patches/0081-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0080-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 09d029f665f56b85ab440b31391ffbf75bf404a5 Mon Sep 17 00:00:00 2001
+From 402afb8adba1a22e669b87d6b4cfadc466393385 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
@@ -293,5 +293,5 @@ index 22cc267..94f2ba0 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0082-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 91%
rename from Spigot-Server-Patches/0082-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 0734a7697..290b76a0f 100644
--- a/Spigot-Server-Patches/0082-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 2b5b8fd3777fea8ced8a2f4b1f4b9911183c8fa9 Mon Sep 17 00:00:00 2001
+From e721477da0a544ce6a720cb99d03bafa9e068547 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 55253d6..f528fd1 100644
+index d136807..b701e5e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -274,4 +274,13 @@ public class PaperWorldConfig {
+@@ -269,4 +269,13 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
@@ -37,5 +37,5 @@ index ccbf47e..b7ac5f7 100644
                  }
              } else {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0083-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0082-Add-World-Util-Methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0083-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0082-Add-World-Util-Methods.patch
index 6cb8046b8..ae576c84f 100644
--- a/Spigot-Server-Patches/0083-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0082-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From c49dc8b884a9576492347c1a6dabbc30ef685595 Mon Sep 17 00:00:00 2001
+From 3ef8c34d7825dbf1baedc8ce07899569f7248ada 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
@@ -93,5 +93,5 @@ index 48c0e14..a3bce9a 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0084-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0083-Optimized-Light-Level-Comparisons.patch
similarity index 99%
rename from Spigot-Server-Patches/0084-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0083-Optimized-Light-Level-Comparisons.patch
index bc6359f06..ad96c4d51 100644
--- a/Spigot-Server-Patches/0084-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0083-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From dfa581d6e4d69f851765dc7be7739f5f812c228f Mon Sep 17 00:00:00 2001
+From f3e4a3fcceff16f90d7c8ea2d84e5130ca202dac 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
@@ -131,5 +131,5 @@ index 6981185..798b9c5 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D, EntityHuman.affectsSpawningFilter()) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { // Paper - affectsSpawning filter
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0085-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0084-Pass-world-to-Village-creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0085-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0084-Pass-world-to-Village-creation.patch
index da310745e..3759ed76e 100644
--- a/Spigot-Server-Patches/0085-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0084-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From f5b65114209cfe77109f54a144a5af824c4ab7f8 Mon Sep 17 00:00:00 2001
+From 73fca77c401a155b2b8106d07ef9e21f3b2d99fe 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
@@ -32,5 +32,5 @@ index 1fa7cb2..fc3a6ab 100644
          this.d = BlockPosition.ZERO;
          this.j = new TreeMap();
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0086-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0085-Custom-replacement-for-eaten-items.patch
similarity index 95%
rename from Spigot-Server-Patches/0086-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0085-Custom-replacement-for-eaten-items.patch
index 8ed532c29..4a8dca42a 100644
--- a/Spigot-Server-Patches/0086-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0085-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From 3ab439efa030a2b5b9f9170663966ce97ccc6aa8 Mon Sep 17 00:00:00 2001
+From 10d82cfe5366d9756a1ef587ded186f646f0c834 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
@@ -34,5 +34,5 @@ index 89e6ef5..ad320c2 100644
  
      }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0087-Set-health-before-death-event.patch b/Spigot-Server-Patches/0086-Set-health-before-death-event.patch
similarity index 95%
rename from Spigot-Server-Patches/0087-Set-health-before-death-event.patch
rename to Spigot-Server-Patches/0086-Set-health-before-death-event.patch
index dadde2c6e..b9f988476 100644
--- a/Spigot-Server-Patches/0087-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0086-Set-health-before-death-event.patch
@@ -1,4 +1,4 @@
-From 64d014a384f05fcf4128d9ea5cbad530cf68f171 Mon Sep 17 00:00:00 2001
+From 3d192ba83e69c17fb5d9b21a9e30b0f1c72a4076 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
@@ -19,7 +19,7 @@ index 2e17397..f0f8cb2 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ff17545..7fdd89f 100644
+index 79d60a6..b807a3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -98,11 +98,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0088-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 95%
rename from Spigot-Server-Patches/0088-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index fc884d4fa..154ff8a01 100644
--- a/Spigot-Server-Patches/0088-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From 34eca3f612837f249380d60d7b6ae2fc2cb5cc3b Mon Sep 17 00:00:00 2001
+From 471a920a25cd0d6f11228593543823c7a0b967a8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
@@ -44,7 +44,7 @@ index ad320c2..d66e766 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e372761..d6b2974 100644
+index 8ac7ec5..d5aed11 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1390,6 +1390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -56,5 +56,5 @@ index e372761..d6b2974 100644
      }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0089-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0088-Catch-Async-PlayerChunkMap-operations.patch
similarity index 93%
rename from Spigot-Server-Patches/0089-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0088-Catch-Async-PlayerChunkMap-operations.patch
index 3cddb5896..8e8ed96af 100644
--- a/Spigot-Server-Patches/0089-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0088-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From e3f1de4b334cfc96f9a55a02bc54ba7439f65c2f Mon Sep 17 00:00:00 2001
+From bec543d7b63fca82cd25dde00b15f8f631eb247f 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/0090-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0089-Support-offline-mode-in-whitelist-command-as-well.patch
similarity index 98%
rename from Spigot-Server-Patches/0090-Support-offline-mode-in-whitelist-command-as-well.patch
rename to Spigot-Server-Patches/0089-Support-offline-mode-in-whitelist-command-as-well.patch
index cd2855725..7e1fcb640 100644
--- a/Spigot-Server-Patches/0090-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0089-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,4 +1,4 @@
-From ecf329a1fbe4583de3e4ec9f0e07004db9c960d6 Mon Sep 17 00:00:00 2001
+From c1334946dd4f272895db6244f2c3a453edf42916 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
@@ -89,5 +89,5 @@ index c74d1d2..0f4237d 100644
 +    // Paper end
  }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0091-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0090-Fix-SkullCache-case-bug.patch
similarity index 92%
rename from Spigot-Server-Patches/0091-Fix-SkullCache-case-bug.patch
rename to Spigot-Server-Patches/0090-Fix-SkullCache-case-bug.patch
index 51ef23bf6..eb13bdd5e 100644
--- a/Spigot-Server-Patches/0091-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0090-Fix-SkullCache-case-bug.patch
@@ -1,4 +1,4 @@
-From 8ab22bafccd2e2e4c48e3f1a7ad4e7cd728bf1da Mon Sep 17 00:00:00 2001
+From 24e61a8f91668f86b4113d87034bb68bbf65cecc 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
@@ -18,5 +18,5 @@ index 654b51d..a8adbcb 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0092-Waving-banner-workaround.patch b/Spigot-Server-Patches/0091-Waving-banner-workaround.patch
similarity index 94%
rename from Spigot-Server-Patches/0092-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0091-Waving-banner-workaround.patch
index f340afb8d..3cd9dd88a 100644
--- a/Spigot-Server-Patches/0092-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0091-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 505e41c56fd3272ec2ff4e2e938ba521174913e7 Mon Sep 17 00:00:00 2001
+From 977583ad1bb17c4efb0d70b9c9516e7b248283ba 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
@@ -34,5 +34,5 @@ index c5c3f40..6413f76 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.9.2
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0092-Use-a-Shared-Random-for-Entities.patch
similarity index 95%
rename from Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0092-Use-a-Shared-Random-for-Entities.patch
index 8cd695996..3192e9ec8 100644
--- a/Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0092-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 90236406c3f251ce3d4b4ddd27c64c5c93c88949 Mon Sep 17 00:00:00 2001
+From b87a7a33be7a5198c4839566f7b13de67dc3a1a4 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
diff --git a/Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0093-Don-t-teleport-dead-entities.patch
similarity index 93%
rename from Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0093-Don-t-teleport-dead-entities.patch
index db0ca1077..9dae1c463 100644
--- a/Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0093-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From d1a67cfcf8e2dca784c8088bd33c3235d297bf7d Mon Sep 17 00:00:00 2001
+From a4255bbf6008b8eef25c4aeb9cc78e54621c28a8 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
diff --git a/Spigot-Server-Patches/0095-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0094-Optimize-Chunk-Access.patch
similarity index 95%
rename from Spigot-Server-Patches/0095-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0094-Optimize-Chunk-Access.patch
index 999d55b35..46eb622c3 100644
--- a/Spigot-Server-Patches/0095-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0094-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 76004dc47689f92b507e3921fb05f2959e793918 Mon Sep 17 00:00:00 2001
+From 329cc97ccf1645837c504b25c06fd42f7f06ee78 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
@@ -42,5 +42,5 @@ index 299cc91..9077696 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0096-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0095-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 91%
rename from Spigot-Server-Patches/0096-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0095-Configurable-spawn-chances-for-skeleton-horses.patch
index b74e7eb11..bd3afb55f 100644
--- a/Spigot-Server-Patches/0096-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0095-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,14 +1,14 @@
-From 37849503dd781ad0afeb4096add22308691508e3 Mon Sep 17 00:00:00 2001
+From 65acc19909c2fccb23de55b6c1a11a6e61d1f17c 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f528fd1..1b996ba 100644
+index b701e5e..d29f2a4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -283,4 +283,12 @@ public class PaperWorldConfig {
+@@ -278,4 +278,12 @@ public class PaperWorldConfig {
          }
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
      }
@@ -35,5 +35,5 @@ index 60696ea..72a604a 100644
  
                              entityhorse.setType(EnumHorseType.SKELETON);
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0097-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 99%
rename from Spigot-Server-Patches/0097-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 1a2a95cc7..06104a136 100644
--- a/Spigot-Server-Patches/0097-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 2782f0fbc0c4a40216b1ce0591f3b21b839b7bc2 Mon Sep 17 00:00:00 2001
+From af32c8a3329ffeab7d8d49f4ee952da1a917c2b2 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
@@ -255,5 +255,5 @@ index a3bce9a..b683c3e 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0098-Use-correct-item-in-arrow-pickup-event.patch b/Spigot-Server-Patches/0097-Use-correct-item-in-arrow-pickup-event.patch
similarity index 95%
rename from Spigot-Server-Patches/0098-Use-correct-item-in-arrow-pickup-event.patch
rename to Spigot-Server-Patches/0097-Use-correct-item-in-arrow-pickup-event.patch
index 5247f3700..8967379af 100644
--- a/Spigot-Server-Patches/0098-Use-correct-item-in-arrow-pickup-event.patch
+++ b/Spigot-Server-Patches/0097-Use-correct-item-in-arrow-pickup-event.patch
@@ -1,4 +1,4 @@
-From da4991273ded9806e86a36f9e87b3cff0768bbdd Mon Sep 17 00:00:00 2001
+From 29da1473760184b2509d1dca0926be9cbf52a558 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 22 Mar 2016 16:00:16 -0400
 Subject: [PATCH] Use correct item in arrow pickup event
@@ -27,5 +27,5 @@ index b7ac5f7..37cb17c 100644
              }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0099-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0098-Fix-cooked-fish-legacy-import.patch
similarity index 93%
rename from Spigot-Server-Patches/0099-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0098-Fix-cooked-fish-legacy-import.patch
index f538eb0cc..c160d67cb 100644
--- a/Spigot-Server-Patches/0099-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0098-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From eaa0d207c201b635cb0d461a7fc88c7e05a306b4 Mon Sep 17 00:00:00 2001
+From 3dcbfd6d24e6d06d0efc34c3150a5402a3813eed 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
@@ -18,5 +18,5 @@ index 87b82eb..a7c71f4 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0100-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch b/Spigot-Server-Patches/0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
similarity index 98%
rename from Spigot-Server-Patches/0100-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
rename to Spigot-Server-Patches/0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
index b3a517f1e..d4991855a 100644
--- a/Spigot-Server-Patches/0100-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
+++ b/Spigot-Server-Patches/0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
@@ -1,4 +1,4 @@
-From 5981293c0b82225d853afa9535fba868f4b58665 Mon Sep 17 00:00:00 2001
+From 96c5e2c3cce309b02bc2705fd29713388aa9ea59 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
@@ -87,5 +87,5 @@ index 704faa9..d6cc51b 100644
                              this.b.b = i;
                              this.b.c = j;
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0101-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0100-Access-items-by-EquipmentSlot.patch
similarity index 96%
rename from Spigot-Server-Patches/0101-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0100-Access-items-by-EquipmentSlot.patch
index 2d8e03db5..05ec32085 100644
--- a/Spigot-Server-Patches/0101-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0100-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From 46a65354e4c97fd90db2c37c7aa04c030c4b51d2 Mon Sep 17 00:00:00 2001
+From d791d634713d7e261e2100d77e4b80edd40f74b2 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
@@ -64,5 +64,5 @@ index 51a8b4e..47654a0 100644
 +    // Paper end
  }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0102-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0101-Check-async-remove-unused-vars-GH-159.patch
similarity index 95%
rename from Spigot-Server-Patches/0102-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0101-Check-async-remove-unused-vars-GH-159.patch
index d8d0a8205..cab686810 100644
--- a/Spigot-Server-Patches/0102-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0101-Check-async-remove-unused-vars-GH-159.patch
@@ -1,4 +1,4 @@
-From 7ef0019c92436a06b26d1d981ff5d9de40b471c2 Mon Sep 17 00:00:00 2001
+From 7474360dfd11de2dce0e701f7a0ea28ec251007c 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
@@ -28,5 +28,5 @@ index b3edaee..ea0a145 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0103-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 95%
rename from Spigot-Server-Patches/0103-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 2927a8c31..5378822a8 100644
--- a/Spigot-Server-Patches/0103-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From b929da4abcfbe4e644f9611943d23599a22a577d Mon Sep 17 00:00:00 2001
+From 70d03c83ecc34c518360084ab4a0e5e2ba5cec37 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
@@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1b996ba..ca0673e 100644
+index d29f2a4..9628c06 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -291,4 +291,9 @@ public class PaperWorldConfig {
+@@ -286,4 +286,9 @@ public class PaperWorldConfig {
              skeleHorseSpawnChance = 0.05D; // Vanilla
          }
      }
@@ -67,5 +67,5 @@ index 72a604a..d448277 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0104-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0103-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 92%
rename from Spigot-Server-Patches/0104-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0103-Entity-AddTo-RemoveFrom-World-Events.patch
index 4459472eb..8d9999a1e 100644
--- a/Spigot-Server-Patches/0104-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0103-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From ab3f55e597d417d561f9925fc43ff0d092643760 Mon Sep 17 00:00:00 2001
+From fbe7a5ea13e1cebf44901f7561480ed2e78a06b9 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
@@ -25,5 +25,5 @@ index 0c7558f..a494569 100644
      }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0105-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0104-Configurable-Chunk-Inhabited-Timer.patch
similarity index 85%
rename from Spigot-Server-Patches/0105-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0104-Configurable-Chunk-Inhabited-Timer.patch
index 5b10de27f..bf0083ffc 100644
--- a/Spigot-Server-Patches/0105-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0104-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 69126a742a8bea124915824db8694e880a6126ca Mon Sep 17 00:00:00 2001
+From 6aa657efe8c229a5f5a2af8f9d325a430f2eb2cf 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
@@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor.
 For people who want all chunks to be treated equally, you can disable the timer.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ca0673e..7d60d5e 100644
+index 9628c06..6eb0a2d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -296,4 +296,9 @@ public class PaperWorldConfig {
+@@ -291,4 +291,9 @@ public class PaperWorldConfig {
      private void firePhysicsEventForRedstone() {
          firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
      }
@@ -23,10 +23,10 @@ index ca0673e..7d60d5e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 63e11aa..74ffa66 100644
+index c7452d9..e36525a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1405,7 +1405,7 @@ public class Chunk {
+@@ -1402,7 +1402,7 @@ public class Chunk {
      }
  
      public long x() {
@@ -36,5 +36,5 @@ index 63e11aa..74ffa66 100644
  
      public void c(long i) {
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0106-EntityPathfindEvent.patch b/Spigot-Server-Patches/0105-EntityPathfindEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0106-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0105-EntityPathfindEvent.patch
index 4a1cd92a9..08ef993b6 100644
--- a/Spigot-Server-Patches/0106-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0105-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 434efe8e1de761b4b5f03eba30068a48eade6eb0 Mon Sep 17 00:00:00 2001
+From dc12e66c9b125599754adf9ad30cde24a3a63122 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index b1a90c1..5d0b5a4 100644
                  float f = this.h();
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0107-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0107-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index 4a99c07c4..75498c215 100644
--- a/Spigot-Server-Patches/0107-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From 83984746d42831aaa8967591b2b41d038414b945 Mon Sep 17 00:00:00 2001
+From 84d52cc4bf3b5ec096d1c29e0042ccfd83734aec 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
@@ -48,5 +48,5 @@ index 0336b9c..044ad71 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0108-Minecart-drop-name-workaround.patch b/Spigot-Server-Patches/0107-Minecart-drop-name-workaround.patch
similarity index 92%
rename from Spigot-Server-Patches/0108-Minecart-drop-name-workaround.patch
rename to Spigot-Server-Patches/0107-Minecart-drop-name-workaround.patch
index f9214f2ac..81a416a6b 100644
--- a/Spigot-Server-Patches/0108-Minecart-drop-name-workaround.patch
+++ b/Spigot-Server-Patches/0107-Minecart-drop-name-workaround.patch
@@ -1,4 +1,4 @@
-From 53d91e9777d3e6d77a574fb718cb2c9e230792d7 Mon Sep 17 00:00:00 2001
+From e035cc22efde49cb0ce7a107bc992be863a6bd42 Mon Sep 17 00:00:00 2001
 From: Fabse <fabse@uwmc.info>
 Date: Mon, 28 Mar 2016 00:46:46 +0200
 Subject: [PATCH] Minecart drop name workaround
@@ -20,5 +20,5 @@ index 4438d83..9df7dfc 100644
              }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0109-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0108-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 95%
rename from Spigot-Server-Patches/0109-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0108-Reduce-IO-ops-opening-a-new-region-file.patch
index fd43b1dec..9c7663561 100644
--- a/Spigot-Server-Patches/0109-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0108-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 4f3972729ecb4d8907d6bd0abfe9e32425e98abc Mon Sep 17 00:00:00 2001
+From cdc7c47397def03707027d5f174d8ff691533397 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.
@@ -49,5 +49,5 @@ index 1fe5019..45d490e 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0110-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0109-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0110-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0109-Sanitise-RegionFileCache-and-make-configurable.patch
index fd580fb68..977d7d0d0 100644
--- a/Spigot-Server-Patches/0110-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0109-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From ab291bae71dad9b49b855648c8de79023920a594 Mon Sep 17 00:00:00 2001
+From 767ab4912331bac74784499d8dccb5f3db99ef6e 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.
@@ -77,5 +77,5 @@ index 2121e84..a7ab262 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch
similarity index 89%
rename from Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch
rename to Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch
index 8cca72def..45ee5f102 100644
--- a/Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch
@@ -1,11 +1,11 @@
-From 973902abbfc253161bc46db73cd093935edcc851 Mon Sep 17 00:00:00 2001
+From 62a310de3066ba26bb9498a0d9e322fc5da49505 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 453e600..11770ad 100644
+index d1d268f..ac8dd76 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1508,6 +1508,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -26,10 +26,10 @@ index 453e600..11770ad 100644
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e676a01..a9976f4 100644
+index 15bef42..703aff1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -46,6 +46,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
+@@ -53,6 +53,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
  import org.bukkit.conversations.Conversable;
  import org.bukkit.craftbukkit.boss.CraftBossBar;
  import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
@@ -37,7 +37,7 @@ index e676a01..a9976f4 100644
  import org.bukkit.craftbukkit.entity.CraftPlayer;
  import org.bukkit.craftbukkit.generator.CraftChunkData;
  import org.bukkit.craftbukkit.help.SimpleHelpMap;
-@@ -1861,5 +1862,14 @@ public final class CraftServer implements Server {
+@@ -1848,5 +1849,14 @@ public final class CraftServer implements Server {
              });
          }
      }
diff --git a/Spigot-Server-Patches/0112-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0111-Use-Optimized-Collections.patch
similarity index 96%
rename from Spigot-Server-Patches/0112-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0111-Use-Optimized-Collections.patch
index 8cec69854..c66b8678a 100644
--- a/Spigot-Server-Patches/0112-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0111-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From b3c34e97f0d695b18c0cee6df10138d8c8d485be Mon Sep 17 00:00:00 2001
+From 3b0df507ab8e1866e84440941a95d178563bfd08 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
@@ -47,5 +47,5 @@ index 47968a8..1f5e6c0 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0113-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0112-Do-not-load-chunks-for-light-checks.patch
similarity index 92%
rename from Spigot-Server-Patches/0113-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0112-Do-not-load-chunks-for-light-checks.patch
index fea80f1e8..22bde92e2 100644
--- a/Spigot-Server-Patches/0113-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0112-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 9ab85f6bdb0237697f5686f7978aee997674191a Mon Sep 17 00:00:00 2001
+From 8ee19cf90c31e5ee9d29eccf64670bbb789ea2c7 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
@@ -19,5 +19,5 @@ index a494569..1dc8af1 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0114-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0113-Add-PlayerUseUnknownEntityEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0114-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0113-Add-PlayerUseUnknownEntityEvent.patch
index 6a572f1e8..e635890a8 100644
--- a/Spigot-Server-Patches/0114-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0113-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 2943a23d314737435d4bb0578ad99ab3c151cf1d Mon Sep 17 00:00:00 2001
+From e849a26b3b600023fd469653db936bb0f93e3530 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
@@ -39,5 +39,5 @@ index d5e06f0..b983540 100644
      }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0115-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0114-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 90%
rename from Spigot-Server-Patches/0115-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0114-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 459e7d491..f5329dc77 100644
--- a/Spigot-Server-Patches/0115-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0114-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From 35afe0d12467dfff5f128eacc110141c54415865 Mon Sep 17 00:00:00 2001
+From fd9bf3fcdb8a1c280df5edf173d1b74ad9f69486 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 b202c97..2ff205c 100644
+index e88e918..a41bc5f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -152,6 +152,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index b202c97..2ff205c 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0116-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0115-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 91%
rename from Spigot-Server-Patches/0116-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0115-Configurable-Grass-Spread-Tick-Rate.patch
index 1af072d88..89bb3010d 100644
--- a/Spigot-Server-Patches/0116-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0115-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,14 +1,14 @@
-From 9aa856267caa2068b19700bf134c7be3480219b1 Mon Sep 17 00:00:00 2001
+From d04763e1d3778c4157f814243105fec5e36ff613 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7d60d5e..486ada4 100644
+index 6eb0a2d..bc3515c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -301,4 +301,10 @@ public class PaperWorldConfig {
+@@ -296,4 +296,10 @@ public class PaperWorldConfig {
      private void useInhabitedTime() {
          useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
      }
@@ -32,5 +32,5 @@ index 21e722d..e41f2b2 100644
              int lightLevel = -1; // Paper
              if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 94%
rename from Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 592da0b75..b6d867899 100644
--- a/Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 4fdfba5dd1fbe77d854e98dd627c01166c5ca6b8 Mon Sep 17 00:00:00 2001
+From 19e01440cce4627ca287b60b5b40870897a8f804 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 486ada4..203dafc 100644
+index bc3515c..84694b2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -307,4 +307,10 @@ public class PaperWorldConfig {
+@@ -302,4 +302,10 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
@@ -21,7 +21,7 @@ index 486ada4..203dafc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 11770ad..89b8595 100644
+index ac8dd76..1a7a0ee 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -349,8 +349,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -52,10 +52,10 @@ index 1dc8af1..bb578d9 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 a9976f4..62a598c 100644
+index 703aff1..100142e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -942,7 +942,7 @@ public final class CraftServer implements Server {
+@@ -949,7 +949,7 @@ public final class CraftServer implements Server {
          System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
  
          if (internal.getWorld().getKeepSpawnInMemory()) {
diff --git a/Spigot-Server-Patches/0118-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 90%
rename from Spigot-Server-Patches/0118-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index b37214c47..3e7907958 100644
--- a/Spigot-Server-Patches/0118-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,4 +1,4 @@
-From cfd8d89b541a964adfaf6212de5473647a1b10a5 Mon Sep 17 00:00:00 2001
+From 8d455ccf4c75da5b9448642a71e465e709692ca8 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
@@ -17,5 +17,5 @@ index bb578d9..4452107 100644
          this.e(blockposition.east(), block);
          this.e(blockposition.down(), block);
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0119-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 94%
rename from Spigot-Server-Patches/0119-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 159061bf0..e53b0beaf 100644
--- a/Spigot-Server-Patches/0119-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From 9ecc819d5041374d6faab2ae9b1e585ee251b8ef Mon Sep 17 00:00:00 2001
+From 7aecf78faa71b889cafcca8b21e7b6fb23a5f89f 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
@@ -31,5 +31,5 @@ index e30d346..d1b2d15 100644
      }
  }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0120-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0119-Remove-Debug-checks-from-DataBits.patch
similarity index 95%
rename from Spigot-Server-Patches/0120-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0119-Remove-Debug-checks-from-DataBits.patch
index 188e903c6..f157945df 100644
--- a/Spigot-Server-Patches/0120-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0119-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From 327cd944a22ef905afc3abcf10d50d8c36077209 Mon Sep 17 00:00:00 2001
+From a1156e2f6d4fa43ce44ad0c868ab98b3098d6458 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
@@ -42,5 +42,5 @@ index f3a6799..fa0fd8a 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 95%
rename from Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 03b6b9353..7191b21f1 100644
--- a/Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,14 +1,14 @@
-From c9541f52a6d03f5c73959d649b1b67b8b4c7e2f2 Mon Sep 17 00:00:00 2001
+From 7dcf96b882df0d252851dd1f5362fda7f74e7688 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 203dafc..66cd256 100644
+index 84694b2..64e20d5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -313,4 +313,9 @@ public class PaperWorldConfig {
+@@ -308,4 +308,9 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
diff --git a/Spigot-Server-Patches/0122-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0121-Workaround-for-setting-passengers-on-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0122-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0121-Workaround-for-setting-passengers-on-players.patch
index f5c8ff8b7..e4eae8a72 100644
--- a/Spigot-Server-Patches/0122-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0121-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 879120d74b0d80e4506dbafce467791792fb33e9 Mon Sep 17 00:00:00 2001
+From 16ac4baffca999c374ebb6f7bc8d6ff41b028d77 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d6b2974..f2d1b21 100644
+index d5aed11..5b6d4aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -582,6 +582,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index d6b2974..f2d1b21 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch b/Spigot-Server-Patches/0122-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
similarity index 95%
rename from Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
rename to Spigot-Server-Patches/0122-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
index 798a3fd86..757b2ec57 100644
--- a/Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
+++ b/Spigot-Server-Patches/0122-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
@@ -1,4 +1,4 @@
-From 92d4e34934d27a18a3b1c58a61d792b3cd940a12 Mon Sep 17 00:00:00 2001
+From aca821f184aaa694af46849ab84284ddcff53892 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Apr 2016 22:36:10 -0400
 Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players
diff --git a/Spigot-Server-Patches/0124-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0123-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0124-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0123-Remove-unused-World-Tile-Entity-List.patch
index 5da671ed8..fb7e88fd2 100644
--- a/Spigot-Server-Patches/0124-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0123-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 679fdd271f10e128a499401f3285a0cb56311a73 Mon Sep 17 00:00:00 2001
+From 17e0fad8b8cc8d031c8d0a882e6b3f93b58a8dc0 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
@@ -67,5 +67,5 @@ index 34b10c4..71c5596 100644
              }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0125-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0124-Don-t-tick-Skulls-unused-code.patch
similarity index 90%
rename from Spigot-Server-Patches/0125-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0124-Don-t-tick-Skulls-unused-code.patch
index 39ec3005b..57fa35fda 100644
--- a/Spigot-Server-Patches/0125-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0124-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From d8060bbe35a6856ab2e43678d9dcb87af8ca0470 Mon Sep 17 00:00:00 2001
+From f8660750f3c0acc1ed5882def60f3bc51ade8eaa 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
@@ -18,5 +18,5 @@ index a8adbcb..ff5929f 100644
      private int a;
      public int rotation;
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch
similarity index 96%
rename from Spigot-Server-Patches/0127-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0125-Configurable-Player-Collision.patch
index 5af7436df..3853c8fd6 100644
--- a/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From 584b8849dacaeaf44c6c2781d1ebcfc6a6e59526 Mon Sep 17 00:00:00 2001
+From d390a50649cfe946a9c281fd103e1ba6f5857a82 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
@@ -32,7 +32,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 91e52f9..f133b32 100644
+index a41bc5f..9262ab8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -241,6 +241,13 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0128-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0126-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 97%
rename from Spigot-Server-Patches/0128-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0126-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 6eac6d6cb..292f575c5 100644
--- a/Spigot-Server-Patches/0128-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0126-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 932b4c5f20a991af6cc4d4c72307846d3ae86934 Mon Sep 17 00:00:00 2001
+From 5f254ede8fb4f33d126ecddd00dc17484eb38d33 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
@@ -45,5 +45,5 @@ index e6b6a5f..4924114 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0126-Fix-some-players-not-being-kicked-on-shutdown.patch b/Spigot-Server-Patches/0126-Fix-some-players-not-being-kicked-on-shutdown.patch
deleted file mode 100644
index 3798a6eef..000000000
--- a/Spigot-Server-Patches/0126-Fix-some-players-not-being-kicked-on-shutdown.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 04798fd5955d34414d732efc7dc29836aed90adc Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Tue, 29 Mar 2016 20:19:20 -0400
-Subject: [PATCH] Fix some players not being kicked on shutdown
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 2ff205c..91e52f9 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1297,9 +1297,11 @@ public abstract class PlayerList {
-     }
- 
-     public void u() {
--        for (int i = 0; i < this.players.size(); ++i) {
--            ((EntityPlayer) this.players.get(i)).playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
-+        // Paper start - Fix players being skipped due to concurrent list modification
-+        for (EntityPlayer player : com.google.common.collect.ImmutableList.copyOf(this.players)) {
-+            player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
-         }
-+        // Paper end
- 
-     }
- 
--- 
-2.9.0
-
diff --git a/Spigot-Server-Patches/0129-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0127-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 93%
rename from Spigot-Server-Patches/0129-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0127-Water-mobs-should-only-spawn-in-the-water.patch
index 7f8a236b2..bdf146071 100644
--- a/Spigot-Server-Patches/0129-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0127-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From 8c7bdea0775d23f2fc9f8c4990ea553a01db518c Mon Sep 17 00:00:00 2001
+From 7638367fef21cb7ab26a8df82a1273f47a9736c8 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
@@ -26,5 +26,5 @@ index 76394a3..e61f9a2 100644
  
      public boolean canSpawn() {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0130-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0128-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 97%
rename from Spigot-Server-Patches/0130-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0128-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index b9cfbff1f..374f6b794 100644
--- a/Spigot-Server-Patches/0130-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0128-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From 97e7f928c9973258f76b6859e90e5ac722d3a167 Mon Sep 17 00:00:00 2001
+From ed806f08a7583b79b1b77d6607b2ceac985b966e 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
@@ -56,5 +56,5 @@ index ea0a145..689d664 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0131-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0129-Configurable-RCON-IP-address.patch
similarity index 92%
rename from Spigot-Server-Patches/0131-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0129-Configurable-RCON-IP-address.patch
index 6a43c5ef9..94a0568ea 100644
--- a/Spigot-Server-Patches/0131-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0129-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From aa7c8f794c8b3e822a2654e35e854a06793a0cef Mon Sep 17 00:00:00 2001
+From 82e21c2a6f9cb8eba92a573473373037a499294d 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
@@ -19,5 +19,5 @@ index a6a0d5a..efcafe7 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0132-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0130-Prevent-Fire-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0132-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0130-Prevent-Fire-from-loading-chunks.patch
index cd5cd372d..147c7ff00 100644
--- a/Spigot-Server-Patches/0132-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0130-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 2ebba064cb23a4a029c934eb31489ecde9d4515e Mon Sep 17 00:00:00 2001
+From bd85604af18fc4293a5d9ec3bb0d72ae4d38f8ee 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
@@ -45,5 +45,5 @@ index 1b91f58..c348221 100644
  
              return i;
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0133-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0131-Implement-PlayerLocaleChangeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0133-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0131-Implement-PlayerLocaleChangeEvent.patch
index 3ec09c9e6..bcf9465bb 100644
--- a/Spigot-Server-Patches/0133-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0131-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From c66b249b8794962b07fbb6a62fb90ca4e2909f79 Mon Sep 17 00:00:00 2001
+From b35ca103dd5735fd19b560ee03720d838de64356 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
@@ -34,7 +34,7 @@ index e9baaa2..d084fc2 100644
          this.ci = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.br, 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 f2d1b21..3b95336 100644
+index 5b6d4aa..3c63d1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1675,7 +1675,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -50,5 +50,5 @@ index f2d1b21..3b95336 100644
  
          @Override
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0134-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0132-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0134-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0132-EntityRegainHealthEvent-isFastRegen-API.patch
index 366abc705..7cd3adaf6 100644
--- a/Spigot-Server-Patches/0134-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0132-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From edca212c630c31ac0237763ea0eee1ab0c7c6935 Mon Sep 17 00:00:00 2001
+From 276d9bba1ea00717e239ff3ad5cfe5d1e7440043 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
@@ -41,5 +41,5 @@ index 3a7ce8d..46acda8 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0135-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0133-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 93%
rename from Spigot-Server-Patches/0135-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0133-Add-ability-to-configure-frosted_ice-properties.patch
index 587b6501e..5f323816f 100644
--- a/Spigot-Server-Patches/0135-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0133-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,14 +1,14 @@
-From 0f139e290ef995b66d3e02c259c0145fe1e1bb43 Mon Sep 17 00:00:00 2001
+From 3cf60a9b04c766d8be6027f44bd8c250a86ed413 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 66cd256..ff43adf 100644
+index 64e20d5..9c5dfcf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -318,4 +318,14 @@ public class PaperWorldConfig {
+@@ -313,4 +313,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }
@@ -44,5 +44,5 @@ index 8f502b9..bddfea0 100644
  
      }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0134-Vehicle-Event-Cancellation-Changes.patch
similarity index 98%
rename from Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0134-Vehicle-Event-Cancellation-Changes.patch
index 9752c30b3..af9196208 100644
--- a/Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0134-Vehicle-Event-Cancellation-Changes.patch
@@ -1,4 +1,4 @@
-From 2f64952c25423e7d2a2926b042dcf93d589634ec Mon Sep 17 00:00:00 2001
+From d480ba769c9926c058a200076480f9886c522ef5 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/Spigot-Server-Patches/0137-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0135-Arrow-pickup-rule-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0137-Arrow-pickup-rule-API.patch
rename to Spigot-Server-Patches/0135-Arrow-pickup-rule-API.patch
index a9e8c27d3..473eb392a 100644
--- a/Spigot-Server-Patches/0137-Arrow-pickup-rule-API.patch
+++ b/Spigot-Server-Patches/0135-Arrow-pickup-rule-API.patch
@@ -1,4 +1,4 @@
-From d516471964dec4d3be6a8ad3c45ce9f2c5aa6ae4 Mon Sep 17 00:00:00 2001
+From 47aa4891a959f61334dcc3cb0cb2e5c607456428 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
@@ -54,5 +54,5 @@ index 2a3482c..fbf289f 100644
      private final Arrow.Spigot spigot = new Arrow.Spigot()
      {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0138-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0136-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 97%
rename from Spigot-Server-Patches/0138-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to Spigot-Server-Patches/0136-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index f223fec2d..31b4cc09c 100644
--- a/Spigot-Server-Patches/0138-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0136-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,4 +1,4 @@
-From f002823fc5c12030ba743369eb1e94378e739785 Mon Sep 17 00:00:00 2001
+From 3a61ded2e5353d45223721338a9567d06de5b103 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
@@ -51,5 +51,5 @@ index 61a6b8a..25f7b4b 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0137-Improve-Minecraft-Hopper-Performance.patch
similarity index 97%
rename from Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch
rename to Spigot-Server-Patches/0137-Improve-Minecraft-Hopper-Performance.patch
index 3bc4f6aa8..4b4176842 100644
--- a/Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0137-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From ecdca7963b3facd652fc2a6a60e3c49c3018e8f8 Mon Sep 17 00:00:00 2001
+From cabf4d121a1c5db55fe69b58015d9f62232a9e29 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
diff --git a/Spigot-Server-Patches/0140-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch
similarity index 94%
rename from Spigot-Server-Patches/0140-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch
index 30ef7a757..aa8d2c1c7 100644
--- a/Spigot-Server-Patches/0140-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From dacca2062e728db236143b67b73b42384e293ea8 Mon Sep 17 00:00:00 2001
+From 945260041266024d159b4dd1cfd561f531cfbc0b 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 89b8595..0ebc566 100644
+index 1a7a0ee..5de3672 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -49,6 +49,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -35,5 +35,5 @@ index 89b8595..0ebc566 100644
      // CraftBukkit end
  }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0139-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 99%
rename from Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0139-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index b9dd1a77d..10ca50938 100644
--- a/Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0139-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From a61e59187e307c3585736ee0ef9994fd376286ea Mon Sep 17 00:00:00 2001
+From e932caa069c7f622604724e162151b6e5082f8c6 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
diff --git a/Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0140-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0140-LootTable-API-Replenishable-Lootables-Feature.patch
index c3af00127..c3b96f290 100644
--- a/Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0140-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 8cf43482e402de894fdaa197178c93795520c464 Mon Sep 17 00:00:00 2001
+From 61519982a43461d6ccaa5a77c0b546cd7f99a32a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ff43adf..85ec842 100644
+index 9c5dfcf..f9e6cf0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -328,4 +328,26 @@ public class PaperWorldConfig {
+@@ -323,4 +323,26 @@ public class PaperWorldConfig {
          this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
          this.log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
      }
diff --git a/Spigot-Server-Patches/0143-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0141-Do-not-load-chunks-for-pathfinding.patch
similarity index 90%
rename from Spigot-Server-Patches/0143-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0141-Do-not-load-chunks-for-pathfinding.patch
index b0aff0c44..93969bc02 100644
--- a/Spigot-Server-Patches/0143-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0141-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From c164f08d8f17aea4a3b5e81f958cf73b00910770 Mon Sep 17 00:00:00 2001
+From a6c90688f4b621536fc50d611019c67236e4d3a3 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
@@ -18,5 +18,5 @@ index 08b986f..786d1dd 100644
          }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0142-Entity-Tracking-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0142-Entity-Tracking-Improvements.patch
index 008ff9494..fc63d05e1 100644
--- a/Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0142-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 152c03f65c7028a3b726d2cb0817c4e4e507193b Mon Sep 17 00:00:00 2001
+From afd6eee2ce91d6a41747612cd0fb42556e1c2875 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
diff --git a/Spigot-Server-Patches/0145-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0143-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 95%
rename from Spigot-Server-Patches/0145-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0143-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 777c28f5d..4eceb6a03 100644
--- a/Spigot-Server-Patches/0145-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0143-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,4 +1,4 @@
-From 82896572dc9a1c06cf4187c6a1d2d9f4c697d91e Mon Sep 17 00:00:00 2001
+From a561985ad9643f4db27e46a215d9c5594ab20176 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
@@ -31,5 +31,5 @@ index 230004b..62752f8 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0146-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0144-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 89%
rename from Spigot-Server-Patches/0146-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0144-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 70db4b014..691d9556e 100644
--- a/Spigot-Server-Patches/0146-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0144-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From 41ecf77426898ac0f0759a0bf62f60e6fb9785cf Mon Sep 17 00:00:00 2001
+From 866f9fa9929d55a3d4bdd735a86e0206ee249bd9 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
@@ -6,13 +6,13 @@ Subject: [PATCH] Do not mark chunks as active for neighbor updates
 Fixes chunk unload issues
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 0ee8a13..1ec820f 100644
+index 3419d0f..a2d9f62 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1004,25 +1004,25 @@ public class Chunk {
+@@ -1003,25 +1003,25 @@ public class Chunk {
+         }
          // CraftBukkit end
-         world.timings.syncChunkLoadPostTimer.stopTiming(); // Paper
-         world.timings.syncChunkLoadPopulateNeighbors.startTiming(); // Paper
+ 
 -        Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1);
 -        Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ);
 -        Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1);
@@ -44,5 +44,5 @@ index 0ee8a13..1ec820f 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0145-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0145-Fix-Chunk-Unload-Queue-Issues.patch
index d7f100a1f..4f5379f8b 100644
--- a/Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0145-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From a06864c10506a3c3bd98ef3ab107e240a6b04b61 Mon Sep 17 00:00:00 2001
+From 830edfa4d686a7762c9c92bc19020c15819ba895 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/0148-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0146-System-property-for-disabling-watchdoge.patch
similarity index 92%
rename from Spigot-Server-Patches/0148-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0146-System-property-for-disabling-watchdoge.patch
index 82cad2f60..bd66e7ad3 100644
--- a/Spigot-Server-Patches/0148-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0146-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From dcae4af3de8f9765d40e44cc94230d13249b9311 Mon Sep 17 00:00:00 2001
+From 21d09aa878ff9919708c5931d8438adc4593fcd4 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
@@ -18,5 +18,5 @@ index 3ed983c..fb57e0d 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0149-Optimize-EAR.patch b/Spigot-Server-Patches/0147-Optimize-EAR.patch
similarity index 96%
rename from Spigot-Server-Patches/0149-Optimize-EAR.patch
rename to Spigot-Server-Patches/0147-Optimize-EAR.patch
index aaea93656..7ec51807c 100644
--- a/Spigot-Server-Patches/0149-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0147-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 9a999fd2a115d4b40ec75b099475b0a5fb20e098 Mon Sep 17 00:00:00 2001
+From 1d7c5962e2a1dfff0b015b166bff5333042d8185 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
@@ -65,5 +65,5 @@ index c4ed64a..4a4d64e 100644
                  }
              }
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0150-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch
similarity index 97%
rename from Spigot-Server-Patches/0150-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch
index 97095427e..0dc1b5b3e 100644
--- a/Spigot-Server-Patches/0150-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From 5a0164ee5a2819b509ad6848ec7aeac438d7f95f Mon Sep 17 00:00:00 2001
+From 856fdc306af6b8978ac1086ac714b72791646461 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 0ebc566..b771d3d 100644
+index 5de3672..0daf784 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -500,7 +500,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -96,5 +96,5 @@ index ccfc755..989758c 100644
      }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0149-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0149-Avoid-blocking-on-Network-Manager-creation.patch
index ec2ffe6ae..5ff42ecfe 100644
--- a/Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0149-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 5fe7267a04a4233df435f914ceb79aa8b1b147b0 Mon Sep 17 00:00:00 2001
+From 93278e4396b2469478b7d05b47465e0a2c02bf99 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/0152-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0150-Optional-old-TNT-cannon-behaviors.patch
similarity index 99%
rename from Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch
rename to Spigot-Server-Patches/0150-Optional-old-TNT-cannon-behaviors.patch
index 7f142ad29..2dfe6230c 100644
--- a/Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0150-Optional-old-TNT-cannon-behaviors.patch
@@ -1,14 +1,14 @@
-From 985f3cfbab21e82b59ed6e8488a9aac30aa86f00 Mon Sep 17 00:00:00 2001
+From 9c2bf893798e06ec1986b24a575f0e54bdef1d88 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 85ec842..cc5e299 100644
+index f9e6cf0..781b195 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -350,4 +350,12 @@ public class PaperWorldConfig {
+@@ -345,4 +345,12 @@ public class PaperWorldConfig {
              );
          }
      }
@@ -191,7 +191,7 @@ index bfb27ed..b1ba434 100644
                  world.addEntity(entitytntprimed);
                  world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gz, SoundCategory.BLOCKS, 1.0F, 1.0F);
 diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java
-index 8530952..b50e3d6 100644
+index 03ce337..588c0e9 100644
 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java
 +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java
 @@ -497,7 +497,11 @@ public class DispenserRegistry {
diff --git a/Spigot-Server-Patches/0153-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0151-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 96%
rename from Spigot-Server-Patches/0153-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0151-Faster-redstone-torch-rapid-clock-removal.patch
index 53464be4e..3eeb632a5 100644
--- a/Spigot-Server-Patches/0153-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0151-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 0191195532931d25a610e0e46ef734c235ed3a24 Mon Sep 17 00:00:00 2001
+From 30315c75cbb97908d199739e6990924a7adf5e81 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/0154-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0152-Ensure-Chunks-never-ever-load-async.patch
similarity index 93%
rename from Spigot-Server-Patches/0154-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0152-Ensure-Chunks-never-ever-load-async.patch
index 6ce66bd97..5ab8a4b80 100644
--- a/Spigot-Server-Patches/0154-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0152-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 4ab0fddd4f096a726e5cfd9768b92fd3421444ea Mon Sep 17 00:00:00 2001
+From a3ff6a3ffa37d8816ce860c340635e410d2d0ed7 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
@@ -27,10 +27,10 @@ index 7b7a3d0..9aaca21 100644
  
      public static void queueChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z, Runnable runnable) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index b5efb9c..ef9529a 100644
+index 3a95b44..229fa6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-@@ -35,8 +35,8 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
+@@ -33,8 +33,8 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
  
      // sync stuff
      public void callStage2(QueuedChunk queuedChunk, Chunk chunk) throws RuntimeException {
@@ -42,5 +42,5 @@ index b5efb9c..ef9529a 100644
              return;
          }
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0155-Add-server-name-parameter.patch b/Spigot-Server-Patches/0153-Add-server-name-parameter.patch
similarity index 92%
rename from Spigot-Server-Patches/0155-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0153-Add-server-name-parameter.patch
index 68d498e52..dd0f6fdf6 100644
--- a/Spigot-Server-Patches/0155-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0153-Add-server-name-parameter.patch
@@ -1,4 +1,4 @@
-From e38184e39c84315c5fc2c50c76907d79a09ac5ef Mon Sep 17 00:00:00 2001
+From dfc36f8e68787108de6da6156075bc821706b422 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
@@ -24,5 +24,5 @@ index 979adad..2aad1e8 100644
          };
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0156-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0154-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0156-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0154-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 10a7853a2..54911150c 100644
--- a/Spigot-Server-Patches/0156-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0154-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 9b2cd4cee78850aa052dd8cc6d63cf0d45a79fc4 Mon Sep 17 00:00:00 2001
+From 01b8d0ea25644c7aede1485b3cd3d2df67422179 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
@@ -44,5 +44,5 @@ index 48b5b2c..6749211 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0157-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0155-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 96%
rename from Spigot-Server-Patches/0157-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0155-Fix-FallingBlocks-being-stuck-on-fences.patch
index 0d73bbe96..dbd80ff13 100644
--- a/Spigot-Server-Patches/0157-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0155-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From 1dc4a1ddd3ac2e061a97fc046481082e8e9a9f07 Mon Sep 17 00:00:00 2001
+From 630980b17cd17106905b005076662e28408a42e3 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
@@ -11,10 +11,10 @@ We now first check, if if we are already on the ground.
 if not, we check if the falling block is inside of the hitbox of the block at y - 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cc5e299..3500b6c 100644
+index 781b195..029a688 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -358,4 +358,9 @@ public class PaperWorldConfig {
+@@ -353,4 +353,9 @@ public class PaperWorldConfig {
              log("Old Cannon Behaviors: This feature may not be working entirely properly at the moment");
          }
      }
@@ -101,5 +101,5 @@ index 4fd4371..dcfdd31 100644
          Block block = this.block.getBlock();
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0156-Make-entities-look-for-hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0156-Make-entities-look-for-hoppers.patch
index 40b573de2..0f002f6e2 100644
--- a/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0156-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From c04bd923fdd256e0a025c7282c7f49c7328ccad1 Mon Sep 17 00:00:00 2001
+From 585575cdb2d56f646058571cbdaddd4004a79409 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
@@ -78,10 +78,10 @@ index 0000000..aef7c2b
 +    double getZ();
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3500b6c..21c0a3f 100644
+index 029a688..85f9481 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -363,4 +363,9 @@ public class PaperWorldConfig {
+@@ -358,4 +358,9 @@ public class PaperWorldConfig {
      private void altFallingBlockOnGround() {
          altFallingBlockOnGround = getBoolean("use-alternate-fallingblock-onGround-detection", false);
      }
diff --git a/Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch b/Spigot-Server-Patches/0157-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
similarity index 96%
rename from Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
rename to Spigot-Server-Patches/0157-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
index cd10c3cb9..1460dfba9 100644
--- a/Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
+++ b/Spigot-Server-Patches/0157-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
@@ -1,4 +1,4 @@
-From 526ae9f44188b65fb44cb33a9e91b72a6df818af Mon Sep 17 00:00:00 2001
+From 6e27e470548042ae38fa0b8595c1396524374026 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 01:49:22 -0400
 Subject: [PATCH] Remove the item from the correct hand when spawn egg depletes
diff --git a/Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 97%
rename from Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index cbaf3ecb0..73398b49b 100644
--- a/Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 4774815b3312ab0d3971130862e6d717509f9df0 Mon Sep 17 00:00:00 2001
+From a5052e1ae9abb91e411a2caccd519f36a6af68da Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 21c0a3f..bfe0bdb 100644
+index 85f9481..b4d76e5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -368,4 +368,13 @@ public class PaperWorldConfig {
+@@ -363,4 +363,13 @@ public class PaperWorldConfig {
      private void isHopperPushBased() {
          isHopperPushBased = getBoolean("hopper.push-based", false);
      }
diff --git a/Spigot-Server-Patches/0161-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0159-Toggleable-Elytra-Wall-Damage.patch
similarity index 91%
rename from Spigot-Server-Patches/0161-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0159-Toggleable-Elytra-Wall-Damage.patch
index 76f3741ce..eeafbce21 100644
--- a/Spigot-Server-Patches/0161-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0159-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From 4fa65e457e2d2b791017ad4e013447b940fbd137 Mon Sep 17 00:00:00 2001
+From f356c0493929af40b3940f6e3d6dc45a4d87a05b 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
@@ -7,10 +7,10 @@ Instead of calculating the damage taken from hitting a wall, you can
 disable it in the config.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 17b90a0..af776b3 100644
+index b4d76e5..fb67306 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -377,4 +377,9 @@ public class PaperWorldConfig {
+@@ -372,4 +372,9 @@ public class PaperWorldConfig {
              delayChunkUnloadsBy *= 1000;
          }
      }
@@ -41,5 +41,5 @@ index c0c60a7..8c98a19 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0162-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0160-Fix-Double-World-Add-issues.patch
similarity index 89%
rename from Spigot-Server-Patches/0162-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0160-Fix-Double-World-Add-issues.patch
index b692ec31f..668303029 100644
--- a/Spigot-Server-Patches/0162-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0160-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 868935271be588c270debdf08d33762562ea57fa Mon Sep 17 00:00:00 2001
+From e9f787942513485cd1e634bc16689a7dc5cf55f4 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,10 +8,10 @@ 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 eb36e1f..3a46a0a 100644
+index d68bd28..978e7ab 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -523,7 +523,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -527,7 +527,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      public static void a(Entity entity, World world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
@@ -21,7 +21,7 @@ index eb36e1f..3a46a0a 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 1d47a117..f7d9a7c 100644
+index 1d47a11..f7d9a7c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1039,6 +1039,7 @@ public abstract class World implements IBlockAccess {
@@ -33,5 +33,5 @@ index 1d47a117..f7d9a7c 100644
          int i = MathHelper.floor(entity.locX / 16.0D);
          int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.9.3
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0163-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0161-Fix-Old-Sign-Conversion.patch
similarity index 98%
rename from Spigot-Server-Patches/0163-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0161-Fix-Old-Sign-Conversion.patch
index edc6a9b38..f18c11314 100644
--- a/Spigot-Server-Patches/0163-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0161-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 86f0e7cbd8a6e8dea5171f523e8e721b8e905d13 Mon Sep 17 00:00:00 2001
+From da802c2fef049fd54050d150edf5d82c9ba98b7f 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
@@ -67,5 +67,5 @@ index 5694ff7..f5ba2dd 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0164-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch b/Spigot-Server-Patches/0162-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
similarity index 98%
rename from Spigot-Server-Patches/0164-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
rename to Spigot-Server-Patches/0162-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
index 0f259e75b..50acff6df 100644
--- a/Spigot-Server-Patches/0164-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
+++ b/Spigot-Server-Patches/0162-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
@@ -1,4 +1,4 @@
-From c3cbec2dac54b188c30930c86de012cc2700423b Mon Sep 17 00:00:00 2001
+From 96fb3b6c1042f833bdf3b90e2e82c0652796e9da Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 25 Jun 2016 23:55:56 -0500
 Subject: [PATCH] Don't try and fix TileEntities as they are removed
@@ -115,5 +115,5 @@ index d448277..bd43075 100644
  
          if (type == Blocks.CHEST || type == Blocks.TRAPPED_CHEST) { // Spigot
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0165-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0163-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 92%
rename from Spigot-Server-Patches/0165-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0163-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 1228532d4..431b5870a 100644
--- a/Spigot-Server-Patches/0165-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0163-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From e532493e81d1c1c59e0aba8b72a1ba0de6688642 Mon Sep 17 00:00:00 2001
+From 9ef998e3678205795747368ced9400fc514b5979 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
@@ -18,5 +18,5 @@ index 989758c..1c619c5 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0166-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0164-More-informative-vehicle-moved-wrongly-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0166-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0164-More-informative-vehicle-moved-wrongly-message.patch
index 172373133..35a61c167 100644
--- a/Spigot-Server-Patches/0166-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0164-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,4 +1,4 @@
-From 94ea251872c685c1b23b4bef85dbfb674c3c6f7f Mon Sep 17 00:00:00 2001
+From f6501f3b7153c50b94966a9c67040bad162f8899 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/Spigot-Server-Patches/0167-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0165-Re-track-players-that-dismount-from-other-players.patch
similarity index 93%
rename from Spigot-Server-Patches/0167-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0165-Re-track-players-that-dismount-from-other-players.patch
index e23c0d6f7..f6201fe9b 100644
--- a/Spigot-Server-Patches/0167-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0165-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From df7fd0dcde6b1ebb30586285d0fd93de291c624a Mon Sep 17 00:00:00 2001
+From 89a5d2bf5922e2e430f947d46c01492d9ebbabf6 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
@@ -23,5 +23,5 @@ index d084fc2..ec3a60a 100644
      }
  
 -- 
-2.9.0
+2.9.2.windows.1
 
diff --git a/Spigot-Server-Patches/0168-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0166-Add-setting-for-proxy-online-mode-status.patch
similarity index 94%
rename from Spigot-Server-Patches/0168-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0166-Add-setting-for-proxy-online-mode-status.patch
index 23259d70c..5e2b556b0 100644
--- a/Spigot-Server-Patches/0168-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0166-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From 29786a2502ed0a436d942081543cdc21bc090214 Mon Sep 17 00:00:00 2001
+From 29bd92440728d0e01154fe07e4a3cf6fff536122 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 e21a8c4..41f6300 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 62a598c..0042cc5 100644
+index 100142e..4fb9c5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1343,7 +1343,8 @@ public final class CraftServer implements Server {
+@@ -1350,7 +1350,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/0169-Optimise-hashCode-and-equals.patch b/Spigot-Server-Patches/0167-Optimise-hashCode-and-equals.patch
similarity index 97%
rename from Spigot-Server-Patches/0169-Optimise-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0167-Optimise-hashCode-and-equals.patch
index c7ad083f1..f3c3da7e0 100644
--- a/Spigot-Server-Patches/0169-Optimise-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0167-Optimise-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From cf89a908ea5b10f48d8709d72f6c7eaf252a3fd1 Mon Sep 17 00:00:00 2001
+From 9916857544d860138737275a20a5caece34fc186 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 hashCode and equals
diff --git a/work/Bukkit b/work/Bukkit
index b28ed606f..89e4f83cd 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b28ed606f6ee1b9b81cb3664f9b8efbdb28280fb
+Subproject commit 89e4f83cd41117cc8a0264e70049f2f6e490740a
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4507d99ae..43ab2669d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4507d99aeac5af1d6076e0739505f8525633f8f6
+Subproject commit 43ab2669d768f1a2cfe32418cd275d110691af05
diff --git a/work/Spigot b/work/Spigot
index 1e4dd71cf..455072c24 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 1e4dd71cf216f953a00e1a82901703b39b84ee6e
+Subproject commit 455072c24e822b3e6f9c50ec1d3712bcefbcc92c