From 812618deba16f8a3896f5fd1b55cfde029841716 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 21 Oct 2016 16:08:34 -0500
Subject: [PATCH] Remove changes to lava/water cobblestone gen

Unintended side effects in recent versions, this patch has likely
outlived its usefulness.

Closes GH-452
---
 ...ome-times-creating-air-instead-of-co.patch | 22 -------------------
 ...0047-Use-UserCache-for-player-heads.patch} |  4 ++--
 ...> 0048-Disable-spigot-tick-limiters.patch} |  4 ++--
 ...igurable-Chunk-IO-Thread-Base-Count.patch} |  4 ++--
 ...on-File-s-when-checking-if-chunk-ex.patch} |  4 ++--
 ...=> 0051-Add-PlayerInitialSpawnEvent.patch} |  2 +-
 ...=> 0052-Disable-chest-cat-detection.patch} |  4 ++--
 ...3-Ensure-commands-are-not-ran-async.patch} |  2 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |  4 ++--
 ....patch => 0055-Optimize-Pathfinding.patch} |  4 ++--
 ...pper-searches-if-there-are-no-items.patch} |  4 ++--
 ...ch => 0057-Expose-server-CommandMap.patch} |  4 ++--
 ...-informative-in-maxHealth-exception.patch} |  4 ++--
 ...ord-chat-API-from-spigot-subclasses.patch} |  6 ++---
 ...0060-Player-Tab-List-and-Title-APIs.patch} |  6 ++---
 ...> 0061-Ensure-inv-drag-is-in-bounds.patch} |  4 ++--
 ...ntation-of-tile-entity-removal-list.patch} |  6 ++---
 ...d-configurable-portal-search-radius.patch} |  4 ++--
 ...patch => 0064-Add-velocity-warnings.patch} |  6 ++---
 ...-inter-world-teleportation-glitches.patch} |  6 ++---
 ... 0066-Add-exception-reporting-event.patch} |  2 +-
 ...don-t-need-to-when-cerealising-text.patch} |  4 ++--
 ...reboards-for-non-players-by-default.patch} |  4 ++--
 ...orking-with-arrows-stuck-in-living-.patch} |  4 ++--
 ... => 0070-Complete-resource-pack-API.patch} |  2 +-
 ... 0071-Chunk-save-queue-improvements.patch} |  6 ++---
 ....patch => 0072-Chunk-Save-Reattempt.patch} |  2 +-
 ...ding-permissions.yml-before-plugins.patch} |  6 ++---
 ...low-Reloading-of-Custom-Permissions.patch} |  4 ++--
 ...h => 0075-Remove-Metadata-on-reload.patch} |  4 ++--
 ...patch => 0076-Undead-horse-leashing.patch} |  4 ++--
 ...h => 0077-Fix-Furnace-cook-time-bug.patch} |  4 ++--
 ...78-Handle-Item-Meta-Inconsistencies.patch} |  6 ++---
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |  4 ++--
 ...atch => 0080-Add-World-Util-Methods.patch} |  4 ++--
 ...1-Optimized-Light-Level-Comparisons.patch} |  4 ++--
 ...0082-Pass-world-to-Village-creation.patch} |  4 ++--
 ...-Custom-replacement-for-eaten-items.patch} |  4 ++--
 ... 0084-Set-health-before-death-event.patch} |  6 ++---
 ...h-absorb-values-and-repair-bad-data.patch} |  6 ++---
 ...tch-Async-PlayerChunkMap-operations.patch} |  4 ++--
 ...e-mode-in-whitelist-command-as-well.patch} |  4 ++--
 ...tch => 0088-Fix-SkullCache-case-bug.patch} |  4 ++--
 ...ch => 0089-Waving-banner-workaround.patch} |  4 ++--
 ...90-Use-a-Shared-Random-for-Entities.patch} |  6 ++---
 ...> 0091-Don-t-teleport-dead-entities.patch} |  4 ++--
 ...patch => 0092-Optimize-Chunk-Access.patch} |  6 ++---
 ...e-spawn-chances-for-skeleton-horses.patch} |  6 ++---
 ...ocation-getType-and-getBlockData-fo.patch} |  4 ++--
 ...-correct-item-in-arrow-pickup-event.patch} |  4 ++--
 ... 0096-Fix-cooked-fish-legacy-import.patch} |  4 ++--
 ...infinite-loop-in-BlockPosition-iter.patch} |  4 ++--
 ... 0098-Access-items-by-EquipmentSlot.patch} |  4 ++--
 ...eck-async-remove-unused-vars-GH-159.patch} |  4 ++--
 ...able-BlockPhysicsEvent-for-Redstone.patch} |  6 ++---
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  4 ++--
 ...-Configurable-Chunk-Inhabited-Timer.patch} |  4 ++--
 ...t.patch => 0103-EntityPathfindEvent.patch} |  4 ++--
 ...-BlockFromToEvent-from-loading-chun.patch} |  4 ++--
 ... 0105-Minecart-drop-name-workaround.patch} |  4 ++--
 ...ce-IO-ops-opening-a-new-region-file.patch} |  4 ++--
 ...gionFileCache-and-make-configurable.patch} |  6 ++---
 ...h => 0108-Add-getEntity-by-UUID-API.patch} |  2 +-
 ...h => 0109-Use-Optimized-Collections.patch} |  6 ++---
 ...Do-not-load-chunks-for-light-checks.patch} |  4 ++--
 ...111-Add-PlayerUseUnknownEntityEvent.patch} |  2 +-
 ...DebugInfo-not-initialized-on-client.patch} |  2 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  4 ++--
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  6 ++---
 ...-BlockPlaceEvent-triggering-physics.patch} |  4 ++--
 ...m-reload-spawn-chunks-in-nether-end.patch} |  4 ++--
 ...7-Remove-Debug-checks-from-DataBits.patch} |  4 ++--
 ...illa-per-world-scoreboard-coloring-.patch} |  2 +-
 ...d-for-setting-passengers-on-players.patch} |  6 ++---
 ...emove-unused-World-Tile-Entity-List.patch} |  2 +-
 ... 0121-Don-t-tick-Skulls-unused-code.patch} |  2 +-
 ... 0122-Configurable-Player-Collision.patch} |  2 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |  2 +-
 ...mobs-should-only-spawn-in-the-water.patch} |  2 +-
 ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} |  2 +-
 ...> 0126-Configurable-RCON-IP-address.patch} |  2 +-
 ...27-Prevent-Fire-from-loading-chunks.patch} |  2 +-
 ...8-Implement-PlayerLocaleChangeEvent.patch} |  2 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  2 +-
 ...to-configure-frosted_ice-properties.patch} |  2 +-
 ...-Vehicle-Event-Cancellation-Changes.patch} |  2 +-
 ...patch => 0132-Arrow-pickup-rule-API.patch} |  2 +-
 ...dispenser-dropper-furnace-placement.patch} |  2 +-
 ...mprove-Minecraft-Hopper-Performance.patch} |  2 +-
 ...possibility-for-getServer-singleton.patch} |  2 +-
 ...tem-frames-performance-and-bug-fixe.patch} |  2 +-
 ...API-Replenishable-Lootables-Feature.patch} |  2 +-
 ...-Do-not-load-chunks-for-pathfinding.patch} |  2 +-
 ...> 0139-Entity-Tracking-Improvements.patch} |  2 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  2 +-
 ...unks-as-active-for-neighbor-updates.patch} |  2 +-
 ... 0142-Fix-Chunk-Unload-Queue-Issues.patch} |  2 +-
 ...em-property-for-disabling-watchdoge.patch} |  2 +-
 ...mize-EAR.patch => 0144-Optimize-EAR.patch} |  2 +-
 ...0145-Optimize-UserCache-Thread-Safe.patch} |  2 +-
 ...locking-on-Network-Manager-creation.patch} |  2 +-
 ...7-Optional-old-TNT-cannon-behaviors.patch} |  2 +-
 ...-redstone-torch-rapid-clock-removal.patch} |  2 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |  2 +-
 ...h => 0150-Add-server-name-parameter.patch} |  2 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |  2 +-
 ...FallingBlocks-being-stuck-on-fences.patch} |  2 +-
 ...0153-Make-entities-look-for-hoppers.patch} |  2 +-
 ...rom-the-correct-hand-when-spawn-egg.patch} |  2 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |  2 +-
 ... 0156-Toggleable-Elytra-Wall-Damage.patch} |  2 +-
 ...=> 0157-Fix-Double-World-Add-issues.patch} |  2 +-
 ...tch => 0158-Fix-Old-Sign-Conversion.patch} |  2 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |  2 +-
 ...ative-vehicle-moved-wrongly-message.patch} |  2 +-
 ...rs-that-dismount-from-other-players.patch} |  2 +-
 ...etting-for-proxy-online-mode-status.patch} |  2 +-
 ...-BlockStateEnum-hashCode-and-equals.patch} |  2 +-
 ...0164-Disable-ticking-of-snow-blocks.patch} |  2 +-
 ...rt-new-health-to-a-float-during-set.patch} |  2 +-
 ...66-Fix-AIOOBE-in-inventory-handling.patch} |  2 +-
 ...nfigurable-packet-in-spam-threshold.patch} |  2 +-
 ...8-Configurable-flying-kick-messages.patch} |  2 +-
 ...atch => 0169-Auto-Save-Improvements.patch} |  2 +-
 ...ch => 0170-Chunk-registration-fixes.patch} |  2 +-
 ...ta-Conversion-post-ItemMeta-on-Copy.patch} |  2 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  2 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |  2 +-
 ...ring-limit-for-packet-serialization.patch} |  2 +-
 ...ch => 0175-Disable-Vanilla-Chunk-GC.patch} |  2 +-
 ...dd-hit-entity-to-ProjectileHitEvent.patch} |  2 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  2 +-
 132 files changed, 213 insertions(+), 235 deletions(-)
 delete mode 100644 Spigot-Server-Patches/0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch
 rename Spigot-Server-Patches/{0048-Use-UserCache-for-player-heads.patch => 0047-Use-UserCache-for-player-heads.patch} (94%)
 rename Spigot-Server-Patches/{0049-Disable-spigot-tick-limiters.patch => 0048-Disable-spigot-tick-limiters.patch} (96%)
 rename Spigot-Server-Patches/{0050-Configurable-Chunk-IO-Thread-Base-Count.patch => 0049-Configurable-Chunk-IO-Thread-Base-Count.patch} (96%)
 rename Spigot-Server-Patches/{0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch => 0050-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch} (96%)
 rename Spigot-Server-Patches/{0052-Add-PlayerInitialSpawnEvent.patch => 0051-Add-PlayerInitialSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0053-Disable-chest-cat-detection.patch => 0052-Disable-chest-cat-detection.patch} (95%)
 rename Spigot-Server-Patches/{0054-Ensure-commands-are-not-ran-async.patch => 0053-Ensure-commands-are-not-ran-async.patch} (98%)
 rename Spigot-Server-Patches/{0055-All-chunks-are-slime-spawn-chunks-toggle.patch => 0054-All-chunks-are-slime-spawn-chunks-toggle.patch} (95%)
 rename Spigot-Server-Patches/{0056-Optimize-Pathfinding.patch => 0055-Optimize-Pathfinding.patch} (95%)
 rename Spigot-Server-Patches/{0057-Avoid-hopper-searches-if-there-are-no-items.patch => 0056-Avoid-hopper-searches-if-there-are-no-items.patch} (98%)
 rename Spigot-Server-Patches/{0058-Expose-server-CommandMap.patch => 0057-Expose-server-CommandMap.patch} (88%)
 rename Spigot-Server-Patches/{0059-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0058-Be-a-bit-more-informative-in-maxHealth-exception.patch} (93%)
 rename Spigot-Server-Patches/{0060-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch => 0059-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch} (94%)
 rename Spigot-Server-Patches/{0061-Player-Tab-List-and-Title-APIs.patch => 0060-Player-Tab-List-and-Title-APIs.patch} (98%)
 rename Spigot-Server-Patches/{0062-Ensure-inv-drag-is-in-bounds.patch => 0061-Ensure-inv-drag-is-in-bounds.patch} (92%)
 rename Spigot-Server-Patches/{0063-Change-implementation-of-tile-entity-removal-list.patch => 0062-Change-implementation-of-tile-entity-removal-list.patch} (97%)
 rename Spigot-Server-Patches/{0064-Add-configurable-portal-search-radius.patch => 0063-Add-configurable-portal-search-radius.patch} (96%)
 rename Spigot-Server-Patches/{0065-Add-velocity-warnings.patch => 0064-Add-velocity-warnings.patch} (91%)
 rename Spigot-Server-Patches/{0066-Fix-inter-world-teleportation-glitches.patch => 0065-Fix-inter-world-teleportation-glitches.patch} (95%)
 rename Spigot-Server-Patches/{0067-Add-exception-reporting-event.patch => 0066-Add-exception-reporting-event.patch} (99%)
 rename Spigot-Server-Patches/{0068-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0067-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (94%)
 rename Spigot-Server-Patches/{0069-Disable-Scoreboards-for-non-players-by-default.patch => 0068-Disable-Scoreboards-for-non-players-by-default.patch} (96%)
 rename Spigot-Server-Patches/{0070-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (95%)
 rename Spigot-Server-Patches/{0071-Complete-resource-pack-API.patch => 0070-Complete-resource-pack-API.patch} (98%)
 rename Spigot-Server-Patches/{0072-Chunk-save-queue-improvements.patch => 0071-Chunk-save-queue-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0073-Chunk-Save-Reattempt.patch => 0072-Chunk-Save-Reattempt.patch} (97%)
 rename Spigot-Server-Patches/{0074-Default-loading-permissions.yml-before-plugins.patch => 0073-Default-loading-permissions.yml-before-plugins.patch} (96%)
 rename Spigot-Server-Patches/{0075-Allow-Reloading-of-Custom-Permissions.patch => 0074-Allow-Reloading-of-Custom-Permissions.patch} (94%)
 rename Spigot-Server-Patches/{0076-Remove-Metadata-on-reload.patch => 0075-Remove-Metadata-on-reload.patch} (92%)
 rename Spigot-Server-Patches/{0077-Undead-horse-leashing.patch => 0076-Undead-horse-leashing.patch} (94%)
 rename Spigot-Server-Patches/{0078-Fix-Furnace-cook-time-bug.patch => 0077-Fix-Furnace-cook-time-bug.patch} (93%)
 rename Spigot-Server-Patches/{0079-Handle-Item-Meta-Inconsistencies.patch => 0078-Handle-Item-Meta-Inconsistencies.patch} (99%)
 rename Spigot-Server-Patches/{0080-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0079-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (95%)
 rename Spigot-Server-Patches/{0081-Add-World-Util-Methods.patch => 0080-Add-World-Util-Methods.patch} (97%)
 rename Spigot-Server-Patches/{0082-Optimized-Light-Level-Comparisons.patch => 0081-Optimized-Light-Level-Comparisons.patch} (99%)
 rename Spigot-Server-Patches/{0083-Pass-world-to-Village-creation.patch => 0082-Pass-world-to-Village-creation.patch} (94%)
 rename Spigot-Server-Patches/{0084-Custom-replacement-for-eaten-items.patch => 0083-Custom-replacement-for-eaten-items.patch} (95%)
 rename Spigot-Server-Patches/{0085-Set-health-before-death-event.patch => 0084-Set-health-before-death-event.patch} (94%)
 rename Spigot-Server-Patches/{0086-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0085-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (95%)
 rename Spigot-Server-Patches/{0087-Catch-Async-PlayerChunkMap-operations.patch => 0086-Catch-Async-PlayerChunkMap-operations.patch} (91%)
 rename Spigot-Server-Patches/{0088-Support-offline-mode-in-whitelist-command-as-well.patch => 0087-Support-offline-mode-in-whitelist-command-as-well.patch} (98%)
 rename Spigot-Server-Patches/{0089-Fix-SkullCache-case-bug.patch => 0088-Fix-SkullCache-case-bug.patch} (92%)
 rename Spigot-Server-Patches/{0090-Waving-banner-workaround.patch => 0089-Waving-banner-workaround.patch} (93%)
 rename Spigot-Server-Patches/{0091-Use-a-Shared-Random-for-Entities.patch => 0090-Use-a-Shared-Random-for-Entities.patch} (91%)
 rename Spigot-Server-Patches/{0092-Don-t-teleport-dead-entities.patch => 0091-Don-t-teleport-dead-entities.patch} (92%)
 rename Spigot-Server-Patches/{0093-Optimize-Chunk-Access.patch => 0092-Optimize-Chunk-Access.patch} (94%)
 rename Spigot-Server-Patches/{0094-Configurable-spawn-chances-for-skeleton-horses.patch => 0093-Configurable-spawn-chances-for-skeleton-horses.patch} (94%)
 rename Spigot-Server-Patches/{0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0094-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (99%)
 rename Spigot-Server-Patches/{0096-Use-correct-item-in-arrow-pickup-event.patch => 0095-Use-correct-item-in-arrow-pickup-event.patch} (95%)
 rename Spigot-Server-Patches/{0097-Fix-cooked-fish-legacy-import.patch => 0096-Fix-cooked-fish-legacy-import.patch} (93%)
 rename Spigot-Server-Patches/{0098-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch => 0097-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch} (98%)
 rename Spigot-Server-Patches/{0099-Access-items-by-EquipmentSlot.patch => 0098-Access-items-by-EquipmentSlot.patch} (96%)
 rename Spigot-Server-Patches/{0100-Check-async-remove-unused-vars-GH-159.patch => 0099-Check-async-remove-unused-vars-GH-159.patch} (95%)
 rename Spigot-Server-Patches/{0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0100-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (97%)
 rename Spigot-Server-Patches/{0102-Entity-AddTo-RemoveFrom-World-Events.patch => 0101-Entity-AddTo-RemoveFrom-World-Events.patch} (92%)
 rename Spigot-Server-Patches/{0103-Configurable-Chunk-Inhabited-Timer.patch => 0102-Configurable-Chunk-Inhabited-Timer.patch} (94%)
 rename Spigot-Server-Patches/{0104-EntityPathfindEvent.patch => 0103-EntityPathfindEvent.patch} (95%)
 rename Spigot-Server-Patches/{0105-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch => 0104-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch} (97%)
 rename Spigot-Server-Patches/{0106-Minecart-drop-name-workaround.patch => 0105-Minecart-drop-name-workaround.patch} (92%)
 rename Spigot-Server-Patches/{0107-Reduce-IO-ops-opening-a-new-region-file.patch => 0106-Reduce-IO-ops-opening-a-new-region-file.patch} (95%)
 rename Spigot-Server-Patches/{0108-Sanitise-RegionFileCache-and-make-configurable.patch => 0107-Sanitise-RegionFileCache-and-make-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0109-Add-getEntity-by-UUID-API.patch => 0108-Add-getEntity-by-UUID-API.patch} (97%)
 rename Spigot-Server-Patches/{0110-Use-Optimized-Collections.patch => 0109-Use-Optimized-Collections.patch} (95%)
 rename Spigot-Server-Patches/{0111-Do-not-load-chunks-for-light-checks.patch => 0110-Do-not-load-chunks-for-light-checks.patch} (92%)
 rename Spigot-Server-Patches/{0112-Add-PlayerUseUnknownEntityEvent.patch => 0111-Add-PlayerUseUnknownEntityEvent.patch} (96%)
 rename Spigot-Server-Patches/{0113-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0112-Fix-reducedDebugInfo-not-initialized-on-client.patch} (94%)
 rename Spigot-Server-Patches/{0114-Configurable-Grass-Spread-Tick-Rate.patch => 0113-Configurable-Grass-Spread-Tick-Rate.patch} (95%)
 rename Spigot-Server-Patches/{0115-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0114-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (97%)
 rename Spigot-Server-Patches/{0116-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0115-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (90%)
 rename Spigot-Server-Patches/{0117-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0116-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (94%)
 rename Spigot-Server-Patches/{0118-Remove-Debug-checks-from-DataBits.patch => 0117-Remove-Debug-checks-from-DataBits.patch} (95%)
 rename Spigot-Server-Patches/{0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0118-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (97%)
 rename Spigot-Server-Patches/{0120-Workaround-for-setting-passengers-on-players.patch => 0119-Workaround-for-setting-passengers-on-players.patch} (90%)
 rename Spigot-Server-Patches/{0121-Remove-unused-World-Tile-Entity-List.patch => 0120-Remove-unused-World-Tile-Entity-List.patch} (98%)
 rename Spigot-Server-Patches/{0122-Don-t-tick-Skulls-unused-code.patch => 0121-Don-t-tick-Skulls-unused-code.patch} (92%)
 rename Spigot-Server-Patches/{0123-Configurable-Player-Collision.patch => 0122-Configurable-Player-Collision.patch} (99%)
 rename Spigot-Server-Patches/{0124-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0123-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (97%)
 rename Spigot-Server-Patches/{0125-Water-mobs-should-only-spawn-in-the-water.patch => 0124-Water-mobs-should-only-spawn-in-the-water.patch} (94%)
 rename Spigot-Server-Patches/{0126-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch => 0125-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} (97%)
 rename Spigot-Server-Patches/{0127-Configurable-RCON-IP-address.patch => 0126-Configurable-RCON-IP-address.patch} (93%)
 rename Spigot-Server-Patches/{0128-Prevent-Fire-from-loading-chunks.patch => 0127-Prevent-Fire-from-loading-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0129-Implement-PlayerLocaleChangeEvent.patch => 0128-Implement-PlayerLocaleChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0130-EntityRegainHealthEvent-isFastRegen-API.patch => 0129-EntityRegainHealthEvent-isFastRegen-API.patch} (97%)
 rename Spigot-Server-Patches/{0131-Add-ability-to-configure-frosted_ice-properties.patch => 0130-Add-ability-to-configure-frosted_ice-properties.patch} (97%)
 rename Spigot-Server-Patches/{0132-Vehicle-Event-Cancellation-Changes.patch => 0131-Vehicle-Event-Cancellation-Changes.patch} (98%)
 rename Spigot-Server-Patches/{0133-Arrow-pickup-rule-API.patch => 0132-Arrow-pickup-rule-API.patch} (96%)
 rename Spigot-Server-Patches/{0134-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch => 0133-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch} (97%)
 rename Spigot-Server-Patches/{0135-Improve-Minecraft-Hopper-Performance.patch => 0134-Improve-Minecraft-Hopper-Performance.patch} (97%)
 rename Spigot-Server-Patches/{0136-remove-null-possibility-for-getServer-singleton.patch => 0135-remove-null-possibility-for-getServer-singleton.patch} (96%)
 rename Spigot-Server-Patches/{0137-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0136-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (99%)
 rename Spigot-Server-Patches/{0138-LootTable-API-Replenishable-Lootables-Feature.patch => 0137-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0139-Do-not-load-chunks-for-pathfinding.patch => 0138-Do-not-load-chunks-for-pathfinding.patch} (92%)
 rename Spigot-Server-Patches/{0140-Entity-Tracking-Improvements.patch => 0139-Entity-Tracking-Improvements.patch} (98%)
 rename Spigot-Server-Patches/{0141-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0140-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (96%)
 rename Spigot-Server-Patches/{0142-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0141-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (97%)
 rename Spigot-Server-Patches/{0143-Fix-Chunk-Unload-Queue-Issues.patch => 0142-Fix-Chunk-Unload-Queue-Issues.patch} (96%)
 rename Spigot-Server-Patches/{0144-System-property-for-disabling-watchdoge.patch => 0143-System-property-for-disabling-watchdoge.patch} (93%)
 rename Spigot-Server-Patches/{0145-Optimize-EAR.patch => 0144-Optimize-EAR.patch} (97%)
 rename Spigot-Server-Patches/{0146-Optimize-UserCache-Thread-Safe.patch => 0145-Optimize-UserCache-Thread-Safe.patch} (98%)
 rename Spigot-Server-Patches/{0147-Avoid-blocking-on-Network-Manager-creation.patch => 0146-Avoid-blocking-on-Network-Manager-creation.patch} (97%)
 rename Spigot-Server-Patches/{0148-Optional-old-TNT-cannon-behaviors.patch => 0147-Optional-old-TNT-cannon-behaviors.patch} (99%)
 rename Spigot-Server-Patches/{0149-Faster-redstone-torch-rapid-clock-removal.patch => 0148-Faster-redstone-torch-rapid-clock-removal.patch} (96%)
 rename Spigot-Server-Patches/{0150-Ensure-Chunks-never-ever-load-async.patch => 0149-Ensure-Chunks-never-ever-load-async.patch} (97%)
 rename Spigot-Server-Patches/{0151-Add-server-name-parameter.patch => 0150-Add-server-name-parameter.patch} (93%)
 rename Spigot-Server-Patches/{0152-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0151-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%)
 rename Spigot-Server-Patches/{0153-Fix-FallingBlocks-being-stuck-on-fences.patch => 0152-Fix-FallingBlocks-being-stuck-on-fences.patch} (98%)
 rename Spigot-Server-Patches/{0154-Make-entities-look-for-hoppers.patch => 0153-Make-entities-look-for-hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0155-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch => 0154-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch} (96%)
 rename Spigot-Server-Patches/{0156-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0155-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (99%)
 rename Spigot-Server-Patches/{0157-Toggleable-Elytra-Wall-Damage.patch => 0156-Toggleable-Elytra-Wall-Damage.patch} (96%)
 rename Spigot-Server-Patches/{0158-Fix-Double-World-Add-issues.patch => 0157-Fix-Double-World-Add-issues.patch} (96%)
 rename Spigot-Server-Patches/{0159-Fix-Old-Sign-Conversion.patch => 0158-Fix-Old-Sign-Conversion.patch} (98%)
 rename Spigot-Server-Patches/{0160-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0159-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (93%)
 rename Spigot-Server-Patches/{0161-More-informative-vehicle-moved-wrongly-message.patch => 0160-More-informative-vehicle-moved-wrongly-message.patch} (94%)
 rename Spigot-Server-Patches/{0162-Re-track-players-that-dismount-from-other-players.patch => 0161-Re-track-players-that-dismount-from-other-players.patch} (94%)
 rename Spigot-Server-Patches/{0163-Add-setting-for-proxy-online-mode-status.patch => 0162-Add-setting-for-proxy-online-mode-status.patch} (97%)
 rename Spigot-Server-Patches/{0164-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0163-Optimise-BlockStateEnum-hashCode-and-equals.patch} (97%)
 rename Spigot-Server-Patches/{0165-Disable-ticking-of-snow-blocks.patch => 0164-Disable-ticking-of-snow-blocks.patch} (94%)
 rename Spigot-Server-Patches/{0166-Convert-new-health-to-a-float-during-set.patch => 0165-Convert-new-health-to-a-float-during-set.patch} (94%)
 rename Spigot-Server-Patches/{0167-Fix-AIOOBE-in-inventory-handling.patch => 0166-Fix-AIOOBE-in-inventory-handling.patch} (94%)
 rename Spigot-Server-Patches/{0168-Configurable-packet-in-spam-threshold.patch => 0167-Configurable-packet-in-spam-threshold.patch} (97%)
 rename Spigot-Server-Patches/{0169-Configurable-flying-kick-messages.patch => 0168-Configurable-flying-kick-messages.patch} (97%)
 rename Spigot-Server-Patches/{0170-Auto-Save-Improvements.patch => 0169-Auto-Save-Improvements.patch} (99%)
 rename Spigot-Server-Patches/{0171-Chunk-registration-fixes.patch => 0170-Chunk-registration-fixes.patch} (93%)
 rename Spigot-Server-Patches/{0172-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch => 0171-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch} (97%)
 rename Spigot-Server-Patches/{0173-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0172-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (93%)
 rename Spigot-Server-Patches/{0174-Auto-fix-bad-Y-levels-on-player-login.patch => 0173-Auto-fix-bad-Y-levels-on-player-login.patch} (92%)
 rename Spigot-Server-Patches/{0175-Raise-string-limit-for-packet-serialization.patch => 0174-Raise-string-limit-for-packet-serialization.patch} (95%)
 rename Spigot-Server-Patches/{0176-Disable-Vanilla-Chunk-GC.patch => 0175-Disable-Vanilla-Chunk-GC.patch} (95%)
 rename Spigot-Server-Patches/{0177-Add-hit-entity-to-ProjectileHitEvent.patch => 0176-Add-hit-entity-to-ProjectileHitEvent.patch} (98%)
 rename Spigot-Server-Patches/{0178-Option-to-remove-corrupt-tile-entities.patch => 0177-Option-to-remove-corrupt-tile-entities.patch} (96%)

diff --git a/Spigot-Server-Patches/0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch b/Spigot-Server-Patches/0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch
deleted file mode 100644
index 4722002902..0000000000
--- a/Spigot-Server-Patches/0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 09fc25a75ad2b07d03779bba1a2e1daf5552f12a Mon Sep 17 00:00:00 2001
-From: Iceee <andrew@opticgaming.tv>
-Date: Wed, 2 Mar 2016 23:38:52 -0600
-Subject: [PATCH] Fix lava/water some times creating air instead of cobblestone
-
-
-diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index ddd5199..d7308dd 100644
---- a/src/main/java/net/minecraft/server/BlockFluids.java
-+++ b/src/main/java/net/minecraft/server/BlockFluids.java
-@@ -169,7 +169,7 @@ public abstract class BlockFluids extends Block {
-                     return true;
-                 }
- 
--                if (integer.intValue() <= 4) {
-+                if (integer.intValue() > 0) { // Paper
-                     world.setTypeUpdate(blockposition, Blocks.COBBLESTONE.getBlockData());
-                     this.fizz(world, blockposition);
-                     return true;
--- 
-2.10.0.windows.1
-
diff --git a/Spigot-Server-Patches/0048-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0047-Use-UserCache-for-player-heads.patch
similarity index 94%
rename from Spigot-Server-Patches/0048-Use-UserCache-for-player-heads.patch
rename to Spigot-Server-Patches/0047-Use-UserCache-for-player-heads.patch
index 66e80334af..e7283bfb38 100644
--- a/Spigot-Server-Patches/0048-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0047-Use-UserCache-for-player-heads.patch
@@ -1,4 +1,4 @@
-From 9aa63267f4da12a9959ab0593cd83f192e05297d Mon Sep 17 00:00:00 2001
+From b298999b39a01889cf42248ccfa9a9ad8bf6fc5d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
@@ -32,5 +32,5 @@ index 2abca0c..7d83bbe 100644
  
          return true;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0049-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0048-Disable-spigot-tick-limiters.patch
similarity index 96%
rename from Spigot-Server-Patches/0049-Disable-spigot-tick-limiters.patch
rename to Spigot-Server-Patches/0048-Disable-spigot-tick-limiters.patch
index 2170065bbc..13971f080d 100644
--- a/Spigot-Server-Patches/0049-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0048-Disable-spigot-tick-limiters.patch
@@ -1,4 +1,4 @@
-From d1bde73c4ab05ed8bcabd66007507773a57976b0 Mon Sep 17 00:00:00 2001
+From 26bf3e047c9296e044b1168e569fe474ae7b4f72 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
@@ -35,5 +35,5 @@ index e8cfe2b..5881ffb 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0050-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0049-Configurable-Chunk-IO-Thread-Base-Count.patch
similarity index 96%
rename from Spigot-Server-Patches/0050-Configurable-Chunk-IO-Thread-Base-Count.patch
rename to Spigot-Server-Patches/0049-Configurable-Chunk-IO-Thread-Base-Count.patch
index 1cb10a0709..05c31e07be 100644
--- a/Spigot-Server-Patches/0050-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ b/Spigot-Server-Patches/0049-Configurable-Chunk-IO-Thread-Base-Count.patch
@@ -1,4 +1,4 @@
-From cb78f2537b9f9d833898b52f077423e06c0bca7b Mon Sep 17 00:00:00 2001
+From 4e2d1396a2ffd7c6b4a51e4ab1fc1dfae123240f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
@@ -39,5 +39,5 @@ index e4fd9bc..7b7a3d0 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch b/Spigot-Server-Patches/0050-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
similarity index 96%
rename from Spigot-Server-Patches/0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
rename to Spigot-Server-Patches/0050-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
index d95a3a3c47..6878cbb5f3 100644
--- a/Spigot-Server-Patches/0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
+++ b/Spigot-Server-Patches/0050-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
@@ -1,4 +1,4 @@
-From 7abfa914ed445aecdbb95b38452cc08c28d035f5 Mon Sep 17 00:00:00 2001
+From 357d59ccd264fde423f99502fe7d00776940003f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
@@ -49,5 +49,5 @@ index 01b54e7..49fa5e4 100644
                  file1.mkdirs();
              }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0051-Add-PlayerInitialSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0051-Add-PlayerInitialSpawnEvent.patch
index f943f34fd6..9e55ab5446 100644
--- a/Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0051-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From dc4a0fc1d58a758366ee67244d3eafb9bced3f4c Mon Sep 17 00:00:00 2001
+From c40aebbb665afe2c501b86344eead5f784e19bfe Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
diff --git a/Spigot-Server-Patches/0053-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0052-Disable-chest-cat-detection.patch
similarity index 95%
rename from Spigot-Server-Patches/0053-Disable-chest-cat-detection.patch
rename to Spigot-Server-Patches/0052-Disable-chest-cat-detection.patch
index eb0c6af59b..9c7d979ca1 100644
--- a/Spigot-Server-Patches/0053-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0052-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From 6dde4f165a8a3f04b039b1145e575b35a4de7950 Mon Sep 17 00:00:00 2001
+From 77d6b5b4dd0caf2cee41b75af28b077b23b06421 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
@@ -35,5 +35,5 @@ index 21be295..a5f2fc0 100644
  
          EntityOcelot entityocelot;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0054-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0053-Ensure-commands-are-not-ran-async.patch
similarity index 98%
rename from Spigot-Server-Patches/0054-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0053-Ensure-commands-are-not-ran-async.patch
index 9ace08beb7..1c56c236dd 100644
--- a/Spigot-Server-Patches/0054-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0053-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 2b51a78e96091d06203d6febe96af359b248bae5 Mon Sep 17 00:00:00 2001
+From c5da7db2be2f4c4b52919df2ba11639b0c8a4207 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
diff --git a/Spigot-Server-Patches/0055-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0054-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 95%
rename from Spigot-Server-Patches/0055-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0054-All-chunks-are-slime-spawn-chunks-toggle.patch
index 505173d986..5b7d93bbbf 100644
--- a/Spigot-Server-Patches/0055-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0054-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From 30f1a19b07f5ccf554263385ae068c0d6095211e Mon Sep 17 00:00:00 2001
+From d2f97a1dd265b66d592257dda42959bfccb6b9b4 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
@@ -33,5 +33,5 @@ index 334505f..616c2e8 100644
                  }
              }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0056-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0055-Optimize-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0056-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0055-Optimize-Pathfinding.patch
index aa77ed423b..eb6155b745 100644
--- a/Spigot-Server-Patches/0056-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0055-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 9d545994314c0b641e4f24f76479e3c4135b52ad Mon Sep 17 00:00:00 2001
+From 19676f2dbe9c77faf790b31c6d488bc1e722c7e7 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0057-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0056-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from Spigot-Server-Patches/0057-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0056-Avoid-hopper-searches-if-there-are-no-items.patch
index 7a11b83cc4..6f09f0a4bc 100644
--- a/Spigot-Server-Patches/0057-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0056-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 3c9f00d356700b2c9288061db06adf8fcd38c9d4 Mon Sep 17 00:00:00 2001
+From e9d8ddfae7bf982be80e3feee2addc9f9adb71ea 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 76130c9..989d510 100644
  
              while (iterator.hasNext()) {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0058-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0057-Expose-server-CommandMap.patch
similarity index 88%
rename from Spigot-Server-Patches/0058-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0057-Expose-server-CommandMap.patch
index c96e87c65d..e9a42735ea 100644
--- a/Spigot-Server-Patches/0058-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0057-Expose-server-CommandMap.patch
@@ -1,4 +1,4 @@
-From 028e0e4e1c31a297efd9b0b7c469885c0260b4de Mon Sep 17 00:00:00 2001
+From 86a453e62a7489c982b7f0a6887c08e1a742417a 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
@@ -17,5 +17,5 @@ index 8e501b6..c7cd3f7 100644
          return commandMap;
      }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 93%
rename from Spigot-Server-Patches/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch
index ae541a2fab..7295dadec6 100644
--- a/Spigot-Server-Patches/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,4 +1,4 @@
-From 61f47aad92e775d2245d216fd1fa0cd76ac96efc Mon Sep 17 00:00:00 2001
+From ae8a24ed319533757b937d8608efe6cf9c1078c2 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
@@ -21,5 +21,5 @@ index cffa778..a123d5e 100644
  
          if (health == 0) {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0060-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0059-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 94%
rename from Spigot-Server-Patches/0060-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to Spigot-Server-Patches/0059-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 2f258350a1..ca2f5f7bef 100644
--- a/Spigot-Server-Patches/0060-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-Server-Patches/0059-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From f7a77a02bb5af91929d969693245c5b4c88c9c85 Mon Sep 17 00:00:00 2001
+From 5423c45e57cb9c46f271c7e80074460ef3438bad 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
@@ -28,7 +28,7 @@ index c7cd3f7..b44808f 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 75c7ece..ed69814 100644
+index b05f111..70da218 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 {
@@ -56,5 +56,5 @@ index 75c7ece..ed69814 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0061-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0060-Player-Tab-List-and-Title-APIs.patch
similarity index 98%
rename from Spigot-Server-Patches/0061-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0060-Player-Tab-List-and-Title-APIs.patch
index f064127bfc..3a11537fef 100644
--- a/Spigot-Server-Patches/0061-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0060-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From c1a0abb30cce9a96969b18361556a6ad34138742 Mon Sep 17 00:00:00 2001
+From 34b016ca45ecc45c0754865c4ab1ba51d664b1fc 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 ed69814..86286a5 100644
+index 70da218..eb72f46 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 ed69814..86286a5 100644
  
      @Override
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0062-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0061-Ensure-inv-drag-is-in-bounds.patch
similarity index 92%
rename from Spigot-Server-Patches/0062-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0061-Ensure-inv-drag-is-in-bounds.patch
index 55bb0c81a9..822c9d97e1 100644
--- a/Spigot-Server-Patches/0062-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0061-Ensure-inv-drag-is-in-bounds.patch
@@ -1,4 +1,4 @@
-From 9c5904d0c9c48916644ebd66cf9f5faa167c5e75 Mon Sep 17 00:00:00 2001
+From 459767453fa25a930e55592350f58f60c44abe83 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
@@ -18,5 +18,5 @@ index 02b1fb1..d39ffbe 100644
                  if (slot != null && a(slot, playerinventory.getCarried(), true) && slot.isAllowed(playerinventory.getCarried()) && playerinventory.getCarried().count > this.h.size() && this.b(slot)) {
                      this.h.add(slot);
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0063-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0062-Change-implementation-of-tile-entity-removal-list.patch
similarity index 97%
rename from Spigot-Server-Patches/0063-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0062-Change-implementation-of-tile-entity-removal-list.patch
index 3beb36b8a5..ec878e5d45 100644
--- a/Spigot-Server-Patches/0063-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0062-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,11 +1,11 @@
-From dfdacf75724fe2b443ab11fb59134edf4426a997 Mon Sep 17 00:00:00 2001
+From 9d5997b7ae5e8b6e070387f8d61a14affa7036e1 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fd51ecb..14c2d2c 100644
+index bbbe951..4e333e0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -120,10 +120,10 @@ public abstract class Entity implements ICommandListener {
@@ -84,5 +84,5 @@ index 5881ffb..a905ff9 100644
          this.f.clear();
          this.l();
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0064-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0063-Add-configurable-portal-search-radius.patch
similarity index 96%
rename from Spigot-Server-Patches/0064-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0063-Add-configurable-portal-search-radius.patch
index d02e5ed76b..723e2e2aa6 100644
--- a/Spigot-Server-Patches/0064-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0063-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From 4f23bd2161337be926d6e5de1047307b278c7fef Mon Sep 17 00:00:00 2001
+From f906fb0fd68b9cb4683a22cc4361193ef1ad86fd 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
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0065-Add-velocity-warnings.patch b/Spigot-Server-Patches/0064-Add-velocity-warnings.patch
similarity index 91%
rename from Spigot-Server-Patches/0065-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0064-Add-velocity-warnings.patch
index 0bddd139f4..9db500ccb0 100644
--- a/Spigot-Server-Patches/0065-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0064-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From 94f85cb0553842b03af9aeeaa90a338663423cb2 Mon Sep 17 00:00:00 2001
+From 2daf3853eab89e487449f8ac82368b77e85f13e5 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 6f6b90b..719dd66 100644
+index c8435a3..f2693eb 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 6f6b90b..719dd66 100644
          entity.motY = vel.getY();
          entity.motZ = vel.getZ();
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0066-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0065-Fix-inter-world-teleportation-glitches.patch
similarity index 95%
rename from Spigot-Server-Patches/0066-Fix-inter-world-teleportation-glitches.patch
rename to Spigot-Server-Patches/0065-Fix-inter-world-teleportation-glitches.patch
index 8883f6cdd7..8726bcd596 100644
--- a/Spigot-Server-Patches/0066-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0065-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From c0feff9eee686659da793e2e1312911148b8cee5 Mon Sep 17 00:00:00 2001
+From df8665db4ceaae7b28139f87849d746e086a8ecc Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -25,7 +25,7 @@ index 086cab0..aabd629 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 86286a5..a6851e6 100644
+index eb72f46..98cbc02 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 86286a5..a6851e6 100644
          return true;
      }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0067-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0066-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0067-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0066-Add-exception-reporting-event.patch
index a0642bb1e7..56ebb58791 100644
--- a/Spigot-Server-Patches/0067-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0066-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 3b67a07162cd0af9af66a25721a5cbd5fdaa755b Mon Sep 17 00:00:00 2001
+From ef48b1d4a4d529417c0f69b5558ad4132302dca2 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
diff --git a/Spigot-Server-Patches/0068-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0067-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 94%
rename from Spigot-Server-Patches/0068-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0067-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 0ae6ae8a46..e6f08af37d 100644
--- a/Spigot-Server-Patches/0068-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0067-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From 0cc68b6860a5cd71a47e24323700f4060852e7b4 Mon Sep 17 00:00:00 2001
+From 58ca250bf5e3c9d321d550f6cbf729f20884459b 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0068-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 96%
rename from Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0068-Disable-Scoreboards-for-non-players-by-default.patch
index 49aa34076f..bc3e18e9f8 100644
--- a/Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0068-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 8e1c1aed3bdd1a33d88a644e3268614744113795 Mon Sep 17 00:00:00 2001
+From 0e29b3cf3ecf0e998cd8d3c65b38e7ab881cce2a 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
@@ -49,5 +49,5 @@ index 4e333e0..5a4b5bc 100644
      }
  
 -- 
-2.10.1.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0070-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 95%
rename from Spigot-Server-Patches/0070-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index c0df9b0dcc..e1880a032a 100644
--- a/Spigot-Server-Patches/0070-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From 82702a3641371be61590cb8432fe5c6ed836fa94 Mon Sep 17 00:00:00 2001
+From a8dd83849bf5f467be31c0f8a1a49a002b0511e3 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
@@ -43,5 +43,5 @@ index a123d5e..79d60a6 100644
 +    // Paper end
  }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0071-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0070-Complete-resource-pack-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0071-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0070-Complete-resource-pack-API.patch
index bacff15788..8081c2c4f6 100644
--- a/Spigot-Server-Patches/0071-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0070-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From d3c2b9158a8bd1adb6ee88279e941fe7aaccd052 Mon Sep 17 00:00:00 2001
+From dab73f3d08c224355e576cb9f682661206ad3999 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
diff --git a/Spigot-Server-Patches/0072-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0071-Chunk-save-queue-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0072-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0071-Chunk-save-queue-improvements.patch
index 89b53daac4..712a9533f1 100644
--- a/Spigot-Server-Patches/0072-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0071-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From fe4a48095ff2b4486e3ee9f7d514b998823d3d7c Mon Sep 17 00:00:00 2001
+From a4161bf83b718e0ae8b6bfe8689d36ad6faba27e 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
@@ -26,7 +26,7 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index de13cf7..8c1d6ac 100644
+index 259e3b7..c1a8243 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -189,4 +189,10 @@ public class PaperConfig {
@@ -177,5 +177,5 @@ index acfdd52..fdbaf5f 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0073-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0072-Chunk-Save-Reattempt.patch
similarity index 97%
rename from Spigot-Server-Patches/0073-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0072-Chunk-Save-Reattempt.patch
index ed3ce7d046..fcf52a379d 100644
--- a/Spigot-Server-Patches/0073-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0072-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 639ec1035a1b282d21b9ba6e112039d6a0995c13 Mon Sep 17 00:00:00 2001
+From 8ae77c2eeaf9244ce0aed3f8f49c24b5de26b3e3 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
diff --git a/Spigot-Server-Patches/0074-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0073-Default-loading-permissions.yml-before-plugins.patch
similarity index 96%
rename from Spigot-Server-Patches/0074-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0073-Default-loading-permissions.yml-before-plugins.patch
index 4c9502e45e..7eabefa0ed 100644
--- a/Spigot-Server-Patches/0074-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0073-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From fc30732d2a216d6882bbcbe75e2c09b6df297cd6 Mon Sep 17 00:00:00 2001
+From 7e04eeade0c87fbd241b0945a72839c849630703 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
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8c1d6ac..4a4043e 100644
+index c1a8243..88b6778 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -195,4 +195,9 @@ public class PaperConfig {
@@ -51,5 +51,5 @@ index b44808f..034f8ed 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0075-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0074-Allow-Reloading-of-Custom-Permissions.patch
similarity index 94%
rename from Spigot-Server-Patches/0075-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0074-Allow-Reloading-of-Custom-Permissions.patch
index 03475d8afe..5d83bab8bc 100644
--- a/Spigot-Server-Patches/0075-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0074-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From c89b153ed8441d201cc65ea8a414d111352b5973 Mon Sep 17 00:00:00 2001
+From 6eaa65221aa494db575fcce21960db12252d7645 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
@@ -32,5 +32,5 @@ index 034f8ed..1609b07 100644
 +    // Paper end
  }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0076-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0075-Remove-Metadata-on-reload.patch
similarity index 92%
rename from Spigot-Server-Patches/0076-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0075-Remove-Metadata-on-reload.patch
index 182e99eae1..515d1a150f 100644
--- a/Spigot-Server-Patches/0076-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0075-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From 9406ab6fe06587ae33af9378d98cae65d734c761 Mon Sep 17 00:00:00 2001
+From 5b51439720d9c51313f081977743a6bd40300e5b 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
@@ -26,5 +26,5 @@ index 1609b07..15bef42 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0077-Undead-horse-leashing.patch b/Spigot-Server-Patches/0076-Undead-horse-leashing.patch
similarity index 94%
rename from Spigot-Server-Patches/0077-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0076-Undead-horse-leashing.patch
index 034ddde855..e3a220cc31 100644
--- a/Spigot-Server-Patches/0077-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0076-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 0be5ec05d4859565b5882514e5baa36b84e42513 Mon Sep 17 00:00:00 2001
+From e0459fc81fe3aabc2592519f150c1ea2406332c0 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
@@ -32,5 +32,5 @@ index ef429c1..38c4f61 100644
      }
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0078-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0077-Fix-Furnace-cook-time-bug.patch
similarity index 93%
rename from Spigot-Server-Patches/0078-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0077-Fix-Furnace-cook-time-bug.patch
index e24fc16597..26fbe97265 100644
--- a/Spigot-Server-Patches/0078-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0077-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From 4ad90c5c991a89873d11100f71c5d1da2aa702ed Mon Sep 17 00:00:00 2001
+From f5db69e0fe71b3198265c7c204af1d2ab5515530 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0079-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0078-Handle-Item-Meta-Inconsistencies.patch
similarity index 99%
rename from Spigot-Server-Patches/0079-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0078-Handle-Item-Meta-Inconsistencies.patch
index 3d474e62c5..3c5174b3d7 100644
--- a/Spigot-Server-Patches/0079-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0078-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 6fd544c68b28a552dfe94301008aaa522dcc4580 Mon Sep 17 00:00:00 2001
+From 961e07249cb9356c6cede5583713f8f10621daaa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 8b6fd4f..b397ccc 100644
+index 6f5dcbd..88f0292 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -293,5 +293,5 @@ index 22cc267..94f2ba0 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0080-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0079-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0080-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0079-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 5d7a5f5917..a1a94b1a22 100644
--- a/Spigot-Server-Patches/0080-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0079-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 04cbb784fabeaca52caa2a70f748c21693fa39a0 Mon Sep 17 00:00:00 2001
+From 3c0e3ac83a120387568efcb5acc1572e0ed94a31 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
@@ -37,5 +37,5 @@ index ccbf47e..b7ac5f7 100644
                  }
              } else {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0081-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0080-Add-World-Util-Methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0081-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0080-Add-World-Util-Methods.patch
index c9533ad7bb..4cbdbeafc6 100644
--- a/Spigot-Server-Patches/0081-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0080-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From fcd4926f5eb3b787aa3be7f625e93b249e34dc51 Mon Sep 17 00:00:00 2001
+From f5f8a0ee2325f6721a28b61713cdf4f41f8a330b 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0082-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0081-Optimized-Light-Level-Comparisons.patch
similarity index 99%
rename from Spigot-Server-Patches/0082-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0081-Optimized-Light-Level-Comparisons.patch
index cd6e4dc994..3869acb029 100644
--- a/Spigot-Server-Patches/0082-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0081-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From 0f9e01ade8983db89a2e945bfbcb04169590f2fa Mon Sep 17 00:00:00 2001
+From 03a68a2ee994ecbd5a66f33c93ec973405b13d33 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0083-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0082-Pass-world-to-Village-creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0083-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0082-Pass-world-to-Village-creation.patch
index b059e65fae..1f498aa6b8 100644
--- a/Spigot-Server-Patches/0083-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0082-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From 07d8e704ef4a680c1b1b82c7cabbc674dccc5904 Mon Sep 17 00:00:00 2001
+From 4cfd8b339c0ad3fe7a143d724408b5a60049ece6 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0084-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0083-Custom-replacement-for-eaten-items.patch
similarity index 95%
rename from Spigot-Server-Patches/0084-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0083-Custom-replacement-for-eaten-items.patch
index 2495d9985c..8f959c3b1e 100644
--- a/Spigot-Server-Patches/0084-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0083-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From bdf88901a30aee6aaf5f3f6d869c2ea8ebde0ebd Mon Sep 17 00:00:00 2001
+From 2ffc2bf91c0006ca2a77e6be164fbeabac4721c6 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0085-Set-health-before-death-event.patch b/Spigot-Server-Patches/0084-Set-health-before-death-event.patch
similarity index 94%
rename from Spigot-Server-Patches/0085-Set-health-before-death-event.patch
rename to Spigot-Server-Patches/0084-Set-health-before-death-event.patch
index 53eedfcf9d..80a1a4bc31 100644
--- a/Spigot-Server-Patches/0085-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0084-Set-health-before-death-event.patch
@@ -1,11 +1,11 @@
-From b62a77541e096a2f2f265d404adc1bd6a8b5bf17 Mon Sep 17 00:00:00 2001
+From db119eed768bbd60a42cca20e2a1fefaada86f81 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4a4043e..c1c168a 100644
+index 88b6778..a60aee6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -200,4 +200,9 @@ public class PaperConfig {
@@ -45,5 +45,5 @@ index 79d60a6..b807a3f 100644
  
      public double getMaxHealth() {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0086-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0085-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 95%
rename from Spigot-Server-Patches/0086-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0085-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index a6c3d064b5..672cc4854e 100644
--- a/Spigot-Server-Patches/0086-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0085-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From 20ec082afd5d349eee7bf6d5c7e2fa30ed605224 Mon Sep 17 00:00:00 2001
+From c17c58addb833ca7e763f73bc5d7395e5c262d2f 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 8ac7ec5..d5aed11 100644
+index 515d0cd..d3f4c3f 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 8ac7ec5..d5aed11 100644
      }
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0087-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0086-Catch-Async-PlayerChunkMap-operations.patch
similarity index 91%
rename from Spigot-Server-Patches/0087-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0086-Catch-Async-PlayerChunkMap-operations.patch
index d850a0ce40..e6ea493264 100644
--- a/Spigot-Server-Patches/0087-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0086-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From 694f9d8f5ef28f63522d63d422677147164f23b1 Mon Sep 17 00:00:00 2001
+From 4a6f7ee5118173e4e65e1a1fcdb72ed0e2c1b194 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
@@ -22,5 +22,5 @@ index fcd0186..c9d48ac 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0088-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0087-Support-offline-mode-in-whitelist-command-as-well.patch
similarity index 98%
rename from Spigot-Server-Patches/0088-Support-offline-mode-in-whitelist-command-as-well.patch
rename to Spigot-Server-Patches/0087-Support-offline-mode-in-whitelist-command-as-well.patch
index 99c3caee01..4bf185ab99 100644
--- a/Spigot-Server-Patches/0088-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0087-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,4 +1,4 @@
-From 7815a7f52dd5b61a214ed564bf3aa586d2383f8c Mon Sep 17 00:00:00 2001
+From d73723c415b3c4477fa8935e54b57317a120ed57 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0089-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0088-Fix-SkullCache-case-bug.patch
similarity index 92%
rename from Spigot-Server-Patches/0089-Fix-SkullCache-case-bug.patch
rename to Spigot-Server-Patches/0088-Fix-SkullCache-case-bug.patch
index 19b19e23f2..dac7edf85b 100644
--- a/Spigot-Server-Patches/0089-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0088-Fix-SkullCache-case-bug.patch
@@ -1,4 +1,4 @@
-From bcff5421212a9cc6abcbc97a51794617060d5433 Mon Sep 17 00:00:00 2001
+From d6d1dc0c6e2103a1569f0347817be71316faaf8c 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0090-Waving-banner-workaround.patch b/Spigot-Server-Patches/0089-Waving-banner-workaround.patch
similarity index 93%
rename from Spigot-Server-Patches/0090-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0089-Waving-banner-workaround.patch
index 7ca111eedb..0bcf2493a2 100644
--- a/Spigot-Server-Patches/0090-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0089-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From a2e556037eb637dd250e998dc57b83e6618e9e56 Mon Sep 17 00:00:00 2001
+From 989047b666c933de551cbd7e336883f1b5948923 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0091-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0090-Use-a-Shared-Random-for-Entities.patch
similarity index 91%
rename from Spigot-Server-Patches/0091-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0090-Use-a-Shared-Random-for-Entities.patch
index 100337ab5e..0f9db640ae 100644
--- a/Spigot-Server-Patches/0091-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0090-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 047148112d1e51f5165c68449b3b84ef1146c4aa Mon Sep 17 00:00:00 2001
+From a70bb2d71e2a418d5029efa646fc13012f61a01f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 232ba8e..fab8eb4 100644
+index 5a4b5bc..91eb036 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -45,6 +45,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,5 +27,5 @@ index 232ba8e..fab8eb4 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0091-Don-t-teleport-dead-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0091-Don-t-teleport-dead-entities.patch
index 88c102ab83..6522228299 100644
--- a/Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0091-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From e856a0daace0996ac8b78b2e5def6660dc416d0b Mon Sep 17 00:00:00 2001
+From ee395eb0157df61aaaa7672ef5e9cf4ba5859950 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
@@ -20,5 +20,5 @@ index 91eb036..7696998 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.10.1.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0093-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0092-Optimize-Chunk-Access.patch
similarity index 94%
rename from Spigot-Server-Patches/0093-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0092-Optimize-Chunk-Access.patch
index dce122f854..d76e47a24a 100644
--- a/Spigot-Server-Patches/0093-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0092-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 11adf2a4659244e5bbb675c50b3516608b48a860 Mon Sep 17 00:00:00 2001
+From 5e1f9c486154c325334770e1d3771eb85fcd352e 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
@@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 Optimize this look up by using a Last Access cache.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 299cc91..9077696 100644
+index cbc93a8..ad94c5a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -26,7 +26,27 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -42,5 +42,5 @@ index 299cc91..9077696 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0093-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0093-Configurable-spawn-chances-for-skeleton-horses.patch
index c86811953e..7299edea9b 100644
--- a/Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0093-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From 6f186d0f6d800dbe7e7626e8794b6e8880ac38a9 Mon Sep 17 00:00:00 2001
+From 2d4c48e2d7b719b5aef60d4d1264776f9e9e71c9 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
@@ -22,7 +22,7 @@ index b701e5e..d29f2a4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c2c0b5e..170a0ce 100644
+index a5f8d93..c2a8bdf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -432,7 +432,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -35,5 +35,5 @@ index c2c0b5e..170a0ce 100644
  
                              entityhorse.setType(EnumHorseType.SKELETON);
 -- 
-2.10.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0094-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 99%
rename from Spigot-Server-Patches/0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0094-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 2b980359df..d11826f5c1 100644
--- a/Spigot-Server-Patches/0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0094-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 829bb30a29ee26ea339d2f531d8053acdb6a6ce7 Mon Sep 17 00:00:00 2001
+From 9c40285ed71d8220215e2a1b191d2d299764e757 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0096-Use-correct-item-in-arrow-pickup-event.patch b/Spigot-Server-Patches/0095-Use-correct-item-in-arrow-pickup-event.patch
similarity index 95%
rename from Spigot-Server-Patches/0096-Use-correct-item-in-arrow-pickup-event.patch
rename to Spigot-Server-Patches/0095-Use-correct-item-in-arrow-pickup-event.patch
index 6288e1a23c..1dc84e3806 100644
--- a/Spigot-Server-Patches/0096-Use-correct-item-in-arrow-pickup-event.patch
+++ b/Spigot-Server-Patches/0095-Use-correct-item-in-arrow-pickup-event.patch
@@ -1,4 +1,4 @@
-From 15e946b55fd9b5ac3de05556f9be1cd875ca480b Mon Sep 17 00:00:00 2001
+From a94a0e2ea04a8d7184a3d22d9059f037d9dabe24 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0097-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0096-Fix-cooked-fish-legacy-import.patch
similarity index 93%
rename from Spigot-Server-Patches/0097-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0096-Fix-cooked-fish-legacy-import.patch
index 879068c08e..d015cd8132 100644
--- a/Spigot-Server-Patches/0097-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0096-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From 9962daf76e84e4a612e7eb16a38022a93a9d5a92 Mon Sep 17 00:00:00 2001
+From c7d72d10b63991d729bbd3a3bceed69d5fb60183 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0098-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch b/Spigot-Server-Patches/0097-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
similarity index 98%
rename from Spigot-Server-Patches/0098-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
rename to Spigot-Server-Patches/0097-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
index e6450cd5f9..17e5de424c 100644
--- a/Spigot-Server-Patches/0098-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
+++ b/Spigot-Server-Patches/0097-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
@@ -1,4 +1,4 @@
-From e00b889aae810de1bf509a3f407f8c42993668cc Mon Sep 17 00:00:00 2001
+From 8d48ed529554ee9f79b535d4a88f20ac1f9a68e7 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0099-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0098-Access-items-by-EquipmentSlot.patch
similarity index 96%
rename from Spigot-Server-Patches/0099-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0098-Access-items-by-EquipmentSlot.patch
index cd7339ce18..a39162236e 100644
--- a/Spigot-Server-Patches/0099-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0098-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From cf650dfca5010124a180cee6604395233b5c2bf7 Mon Sep 17 00:00:00 2001
+From ada8adff545102f20f46864b7cb8ae4524f700e1 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0100-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0099-Check-async-remove-unused-vars-GH-159.patch
similarity index 95%
rename from Spigot-Server-Patches/0100-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0099-Check-async-remove-unused-vars-GH-159.patch
index 6772718330..0ec8e36242 100644
--- a/Spigot-Server-Patches/0100-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0099-Check-async-remove-unused-vars-GH-159.patch
@@ -1,4 +1,4 @@
-From ba8c69221abe7ea03db5e311d97710c737807d88 Mon Sep 17 00:00:00 2001
+From 21198d8e2e5ce1d7838b1e262979728decb7c75e 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0100-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 97%
rename from Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0100-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index b827079b58..6c0d2efa2c 100644
--- a/Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0100-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 5a634134cafed1bec53537156945fd424a8536de Mon Sep 17 00:00:00 2001
+From 024301036db200b604d03f560d65dbda4d0a9ff8 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
@@ -38,7 +38,7 @@ index b683c3e..0c7558f 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 170a0ce..24b79d3 100644
+index c2a8bdf..fc33575 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -67,5 +67,5 @@ index 170a0ce..24b79d3 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.10.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0102-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0101-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 92%
rename from Spigot-Server-Patches/0102-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0101-Entity-AddTo-RemoveFrom-World-Events.patch
index eae798707b..b61922a018 100644
--- a/Spigot-Server-Patches/0102-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0101-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From 429e147d3bdd2f258f81059023ec3197ea0bb90e Mon Sep 17 00:00:00 2001
+From 1dabbdc5a9bad0dc21c2fa593554aab2539fa0e5 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0103-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0102-Configurable-Chunk-Inhabited-Timer.patch
similarity index 94%
rename from Spigot-Server-Patches/0103-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0102-Configurable-Chunk-Inhabited-Timer.patch
index f11f1be20a..371418e0a5 100644
--- a/Spigot-Server-Patches/0103-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0102-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From a5d07ebe4f66acd155172c044bc2cbbfbf0785e1 Mon Sep 17 00:00:00 2001
+From 804e44d92477a216516f1a5cbaad3c0c9b748f1c 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
@@ -36,5 +36,5 @@ index 63e11aa..74ffa66 100644
  
      public void c(long i) {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0104-EntityPathfindEvent.patch b/Spigot-Server-Patches/0103-EntityPathfindEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0104-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0103-EntityPathfindEvent.patch
index 8bc31e5f67..f79d2557ef 100644
--- a/Spigot-Server-Patches/0104-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0103-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 11fe39b95d0d96d380cee15223eb4153a987f2ce Mon Sep 17 00:00:00 2001
+From 7288ca42285898ba7a54d71ff19d20cb5e60caf0 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0105-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0104-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0105-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0104-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index fcd9a99a16..9bb2f8fc0d 100644
--- a/Spigot-Server-Patches/0105-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0104-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From e4cb01011a8eac5453584a41f68a05436b1e6f8c Mon Sep 17 00:00:00 2001
+From ecb9dba3254e2296f732959131afccde0c823752 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0106-Minecart-drop-name-workaround.patch b/Spigot-Server-Patches/0105-Minecart-drop-name-workaround.patch
similarity index 92%
rename from Spigot-Server-Patches/0106-Minecart-drop-name-workaround.patch
rename to Spigot-Server-Patches/0105-Minecart-drop-name-workaround.patch
index 505c55fb54..88a9a87265 100644
--- a/Spigot-Server-Patches/0106-Minecart-drop-name-workaround.patch
+++ b/Spigot-Server-Patches/0105-Minecart-drop-name-workaround.patch
@@ -1,4 +1,4 @@
-From 7eb8cf7577ac2dfcca7744c89c9dfe883b5aa356 Mon Sep 17 00:00:00 2001
+From 8a94f4550cf262cc0d651b0f080673bd7316b6d1 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0107-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0106-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 95%
rename from Spigot-Server-Patches/0107-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0106-Reduce-IO-ops-opening-a-new-region-file.patch
index b3f26dda54..a29c78a829 100644
--- a/Spigot-Server-Patches/0107-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0106-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From d099ea7b5cb2c8828602a35a4195c14aa1911a3a Mon Sep 17 00:00:00 2001
+From 9b329259fc400d42ff5cf475495f78d62895d6df 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0108-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0107-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0108-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0107-Sanitise-RegionFileCache-and-make-configurable.patch
index a7068c4c58..41eab1a234 100644
--- a/Spigot-Server-Patches/0108-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0107-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From 51ef59e61048ce1cf3722e0e58a2314a441ef011 Mon Sep 17 00:00:00 2001
+From 4ff272556b10e7aa88f616e93100ca49e44a7a79 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.
@@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c1c168a..d5ee3ae 100644
+index a60aee6..1b9c852 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -205,4 +205,9 @@ public class PaperConfig {
@@ -77,5 +77,5 @@ index 2121e84..a7ab262 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0108-Add-getEntity-by-UUID-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
rename to Spigot-Server-Patches/0108-Add-getEntity-by-UUID-API.patch
index 2a4cc5e9d9..b0addf7ba5 100644
--- a/Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0108-Add-getEntity-by-UUID-API.patch
@@ -1,4 +1,4 @@
-From 6d145e5a2fd5ae436b9fd776e43a8ec7f840f557 Mon Sep 17 00:00:00 2001
+From ecd53891c287dde51e1bc92bd2a4624c7c5d0cef 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/Spigot-Server-Patches/0110-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0109-Use-Optimized-Collections.patch
similarity index 95%
rename from Spigot-Server-Patches/0110-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0109-Use-Optimized-Collections.patch
index f938404fcb..c666bfb95b 100644
--- a/Spigot-Server-Patches/0110-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0109-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 28ae278b19a3091b675ae90c7dfeb2eb220bf351 Mon Sep 17 00:00:00 2001
+From 3159962f7eb8d20c1fe453f71898def9d8b7685f 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
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9077696..d4587c7 100644
+index ad94c5a..37fac92 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -23,7 +23,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
@@ -47,5 +47,5 @@ index 47968a8..1f5e6c0 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0111-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0110-Do-not-load-chunks-for-light-checks.patch
similarity index 92%
rename from Spigot-Server-Patches/0111-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0110-Do-not-load-chunks-for-light-checks.patch
index d3f4860338..8483e25b9a 100644
--- a/Spigot-Server-Patches/0111-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0110-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 37abd77dffd548b87c9185481c42944c56394873 Mon Sep 17 00:00:00 2001
+From 3d03fc9bd125d878d67e631adaefac99cae57060 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0112-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0111-Add-PlayerUseUnknownEntityEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0112-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0111-Add-PlayerUseUnknownEntityEvent.patch
index 182f5c5c53..7ecab928b5 100644
--- a/Spigot-Server-Patches/0112-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0111-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From ec6b2334152da279e684eacd3912dca9e0fdc0d7 Mon Sep 17 00:00:00 2001
+From 0fc2cae5ea62f9ada2cd85b0370610281ef9827a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
diff --git a/Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0112-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0112-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 0fc340deee..c7d1d2d12e 100644
--- a/Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0112-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,4 +1,4 @@
-From 633439d83c79873b6854921b4352bb2b1837f987 Mon Sep 17 00:00:00 2001
+From 8b2930b890375f69765ba4276e1adea5c717ee18 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/Spigot-Server-Patches/0114-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0113-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0114-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0113-Configurable-Grass-Spread-Tick-Rate.patch
index de1841bb3d..f715cb336b 100644
--- a/Spigot-Server-Patches/0114-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0113-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From 6dc4b9f917be307b6b5473fcd4b59fe82555a7fa Mon Sep 17 00:00:00 2001
+From 0f3548ee8b973ee84a6ff4e82be5e62addac9a48 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
@@ -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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0115-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0114-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0115-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0114-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 10874393b3..74190276e7 100644
--- a/Spigot-Server-Patches/0115-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0114-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From e72874054a8fd9ee684a1ab104561c6952713daf Mon Sep 17 00:00:00 2001
+From 77d643755417d3d0c1e147c1e164227c2350ebf6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -21,7 +21,7 @@ index bc3515c..84694b2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 35a8602..8e364de 100644
+index 7bb6033..e35341b 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
@@ -81,5 +81,5 @@ index 9ef8fc1..e85a0a0 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0116-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0115-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 90%
rename from Spigot-Server-Patches/0116-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0115-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 38afec787b..18f80efc95 100644
--- a/Spigot-Server-Patches/0116-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0115-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,4 +1,4 @@
-From 9d594315e16f67e42a026ecc7088aa2903889248 Mon Sep 17 00:00:00 2001
+From 964fa46b5db53f5ccb4a3a53876cee69afc93a1d 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0117-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0116-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 94%
rename from Spigot-Server-Patches/0117-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0116-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 7cec4417de..c2d6287e50 100644
--- a/Spigot-Server-Patches/0117-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0116-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From f92ff94754c90af1cc7556ed76a3f6c69baac671 Mon Sep 17 00:00:00 2001
+From 5469bbf12cf3ecc8f5c41c8567a042c13a860331 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0118-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0117-Remove-Debug-checks-from-DataBits.patch
similarity index 95%
rename from Spigot-Server-Patches/0118-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0117-Remove-Debug-checks-from-DataBits.patch
index 326c14e0ef..b7e05158bb 100644
--- a/Spigot-Server-Patches/0118-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0117-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From b465b832aa290d4f490a966fe12bfbec7186059e Mon Sep 17 00:00:00 2001
+From 63642fdecddb32e6fa31a1e83ca10f67c7869bb7 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.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0118-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 97%
rename from Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0118-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index a9a0005539..c407a58aa9 100644
--- a/Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0118-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From e39c81ef1649441812673b7c5069aba34b69c633 Mon Sep 17 00:00:00 2001
+From e2f61166eff742d9581e4566bdce26ff7a05c4b9 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/Spigot-Server-Patches/0120-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0119-Workaround-for-setting-passengers-on-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0120-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0119-Workaround-for-setting-passengers-on-players.patch
index d7392b6482..9d2f2ecafa 100644
--- a/Spigot-Server-Patches/0120-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0119-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From f304394cd9cccd385159a8aa904c9770e6ac7ef8 Mon Sep 17 00:00:00 2001
+From ec76fc711f8238be492858ea353f3137ad9b6381 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 d5aed11..5b6d4aa 100644
+index d3f4c3f..aff5f44 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 d5aed11..5b6d4aa 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0121-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0120-Remove-unused-World-Tile-Entity-List.patch
similarity index 98%
rename from Spigot-Server-Patches/0121-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0120-Remove-unused-World-Tile-Entity-List.patch
index de85bb4b7d..916b42d0a5 100644
--- a/Spigot-Server-Patches/0121-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0120-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 7c3fa5fe202b2951336d98e3a5050150b4d8fd93 Mon Sep 17 00:00:00 2001
+From 788688033b2b6ff1a13273b94ebe06f5b00841be 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
diff --git a/Spigot-Server-Patches/0122-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0121-Don-t-tick-Skulls-unused-code.patch
similarity index 92%
rename from Spigot-Server-Patches/0122-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0121-Don-t-tick-Skulls-unused-code.patch
index d24bb0ffe8..18563c0193 100644
--- a/Spigot-Server-Patches/0122-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0121-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From a0198e446aba2732c1fcfe683f084402c3596ec5 Mon Sep 17 00:00:00 2001
+From 65e19363d0f72f23d13d3aeb92633dc47c2c22f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
diff --git a/Spigot-Server-Patches/0123-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0122-Configurable-Player-Collision.patch
similarity index 99%
rename from Spigot-Server-Patches/0123-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0122-Configurable-Player-Collision.patch
index 66e2ca5997..2c594bb780 100644
--- a/Spigot-Server-Patches/0123-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0122-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From f35b511e3a9ef80b3e980fa0d2f1928f26b8400a Mon Sep 17 00:00:00 2001
+From 55150e10ff8e9ecfc60e5f3fe405b2e198ac923a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
diff --git a/Spigot-Server-Patches/0124-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0123-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 97%
rename from Spigot-Server-Patches/0124-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0123-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index a95b151b19..8fe2be8865 100644
--- a/Spigot-Server-Patches/0124-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0123-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From e476c7994be055e805e8aab6899869f8bf393fd6 Mon Sep 17 00:00:00 2001
+From 2ee2eb0c74d6b990591792c663d776c43ecdbb9f 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
diff --git a/Spigot-Server-Patches/0125-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0124-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 94%
rename from Spigot-Server-Patches/0125-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0124-Water-mobs-should-only-spawn-in-the-water.patch
index b9e5f3a4dd..4a05fa0ac7 100644
--- a/Spigot-Server-Patches/0125-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0124-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From ca06f314e5f7f982fb8a3ff52ebc2aa1d9d6556b Mon Sep 17 00:00:00 2001
+From 2a1076770051ea8059e20def150902e9ede862b5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
diff --git a/Spigot-Server-Patches/0126-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0125-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 97%
rename from Spigot-Server-Patches/0126-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0125-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index 7dcb1a96b0..b015c29c77 100644
--- a/Spigot-Server-Patches/0126-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0125-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From 130bc3af336b71fe7026e8d297b782e3f551d441 Mon Sep 17 00:00:00 2001
+From e6187234d2194ca23789522ec025538a4efdd172 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
diff --git a/Spigot-Server-Patches/0127-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0126-Configurable-RCON-IP-address.patch
similarity index 93%
rename from Spigot-Server-Patches/0127-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0126-Configurable-RCON-IP-address.patch
index d25ca534ec..836395815d 100644
--- a/Spigot-Server-Patches/0127-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0126-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 50ce247e26363cb1a35cb4c757cb8ad4f0f7662d Mon Sep 17 00:00:00 2001
+From 002a231d8f4491978da33ad0dfb3526d56b48888 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
diff --git a/Spigot-Server-Patches/0128-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0127-Prevent-Fire-from-loading-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0128-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0127-Prevent-Fire-from-loading-chunks.patch
index d2c4c56e28..d997ab83e3 100644
--- a/Spigot-Server-Patches/0128-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0127-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 144397a2bbef30c05482b444852402488bccb5eb Mon Sep 17 00:00:00 2001
+From f4a6c2de1a43254aee4275315b475d8b860f6e46 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
diff --git a/Spigot-Server-Patches/0129-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0128-Implement-PlayerLocaleChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0129-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0128-Implement-PlayerLocaleChangeEvent.patch
index 2896fcda6e..3fbe749e00 100644
--- a/Spigot-Server-Patches/0129-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0128-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 8d6e03df88f8b9738fec770cc10219cba1b9f55c Mon Sep 17 00:00:00 2001
+From 637cce0bdf5b0902430a8a3e7c7453954e6b3ef4 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/Spigot-Server-Patches/0130-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0129-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0130-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0129-EntityRegainHealthEvent-isFastRegen-API.patch
index 1f2f364e12..6078e146cb 100644
--- a/Spigot-Server-Patches/0130-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0129-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From dc171fdf1622f27a12047757050f62aedb1a7e79 Mon Sep 17 00:00:00 2001
+From 7bb022a63ec88614d0775f9ffae7476bc160a9a5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
diff --git a/Spigot-Server-Patches/0131-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0130-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 97%
rename from Spigot-Server-Patches/0131-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0130-Add-ability-to-configure-frosted_ice-properties.patch
index 749236d810..247770616b 100644
--- a/Spigot-Server-Patches/0131-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0130-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From a0a7521252ef02cc44ae990c6a84e526265ef51d Mon Sep 17 00:00:00 2001
+From e0f927b29e3d9220ff2c5e19461c09dcd0d950eb Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
diff --git a/Spigot-Server-Patches/0132-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0131-Vehicle-Event-Cancellation-Changes.patch
similarity index 98%
rename from Spigot-Server-Patches/0132-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0131-Vehicle-Event-Cancellation-Changes.patch
index 68980fbaea..87b98e6ec4 100644
--- a/Spigot-Server-Patches/0132-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0131-Vehicle-Event-Cancellation-Changes.patch
@@ -1,4 +1,4 @@
-From 5b0e21a8998e4a9da0cc086a93a4d4e8334b02a4 Mon Sep 17 00:00:00 2001
+From c8c8e6fd31deca3a63f0f2f9ed8c90ccfdcc447a 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/0133-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0132-Arrow-pickup-rule-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0133-Arrow-pickup-rule-API.patch
rename to Spigot-Server-Patches/0132-Arrow-pickup-rule-API.patch
index bd9ea42acc..c48651211e 100644
--- a/Spigot-Server-Patches/0133-Arrow-pickup-rule-API.patch
+++ b/Spigot-Server-Patches/0132-Arrow-pickup-rule-API.patch
@@ -1,4 +1,4 @@
-From d79e914dc33ddb6b92ceb3bac2fbad9083d15082 Mon Sep 17 00:00:00 2001
+From 948413ece85f37a42a4ebcab8f43da8a5689b7af Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:16:11 -0500
 Subject: [PATCH] Arrow pickup rule API
diff --git a/Spigot-Server-Patches/0134-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0133-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 97%
rename from Spigot-Server-Patches/0134-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to Spigot-Server-Patches/0133-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index 21cc873145..c6f31903af 100644
--- a/Spigot-Server-Patches/0134-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0133-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,4 +1,4 @@
-From 18a87a492e0ebb90e6af71a9a705fd873bc3d60a Mon Sep 17 00:00:00 2001
+From 1d0cad6c4498505dbd5c0b78cde9281ac9f84124 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
diff --git a/Spigot-Server-Patches/0135-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0134-Improve-Minecraft-Hopper-Performance.patch
similarity index 97%
rename from Spigot-Server-Patches/0135-Improve-Minecraft-Hopper-Performance.patch
rename to Spigot-Server-Patches/0134-Improve-Minecraft-Hopper-Performance.patch
index 9abb97d12c..5d08583445 100644
--- a/Spigot-Server-Patches/0135-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0134-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From b3b4eb9469067c56b7ed140b5e473f374bead215 Mon Sep 17 00:00:00 2001
+From 0faf22bd477e057cec232a0f8070302ac2cd05d9 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/0136-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0135-remove-null-possibility-for-getServer-singleton.patch
similarity index 96%
rename from Spigot-Server-Patches/0136-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0135-remove-null-possibility-for-getServer-singleton.patch
index 4247b9db45..0e34b0c7c9 100644
--- a/Spigot-Server-Patches/0136-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0135-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From ba8cbe80928ba8473d215dccef5cbe2e2684ccbc Mon Sep 17 00:00:00 2001
+From 26895c2866c74f0e2c1c9c8972c0f7270513b667 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
diff --git a/Spigot-Server-Patches/0137-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0136-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 99%
rename from Spigot-Server-Patches/0137-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0136-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 6c4e2c1983..01855fd35c 100644
--- a/Spigot-Server-Patches/0137-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0136-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 26411724ca061061a106c890f7a2ebaeb562ca6f Mon Sep 17 00:00:00 2001
+From 86add9029e3a04c6a1811ee4dd4f822d86dde9c8 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/0138-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0137-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0138-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0137-LootTable-API-Replenishable-Lootables-Feature.patch
index 11d4df48dd..c3e4d0133c 100644
--- a/Spigot-Server-Patches/0138-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0137-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 93d2ba949a9f934fe3152622f6bec3783f598bdf Mon Sep 17 00:00:00 2001
+From 17dd011270e049f59229ecb9e970d8cd3b7f4dcf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
diff --git a/Spigot-Server-Patches/0139-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0138-Do-not-load-chunks-for-pathfinding.patch
similarity index 92%
rename from Spigot-Server-Patches/0139-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0138-Do-not-load-chunks-for-pathfinding.patch
index 5b4b4c0f32..f70f9a92a5 100644
--- a/Spigot-Server-Patches/0139-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0138-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From c1be666366724109693f64c165f5755918b56c8d Mon Sep 17 00:00:00 2001
+From 9a95abab256b2be57c15fdbd73726da5c2ac716f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
diff --git a/Spigot-Server-Patches/0140-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0139-Entity-Tracking-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0140-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0139-Entity-Tracking-Improvements.patch
index 1442dd7394..e03d3dd2c5 100644
--- a/Spigot-Server-Patches/0140-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0139-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 238ef72e181b6d3baccc788f1d18150b4ba280ff Mon Sep 17 00:00:00 2001
+From 0c4e3c7362f83ddb7bc1ebda742972c11740a536 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/0141-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0140-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 96%
rename from Spigot-Server-Patches/0141-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0140-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 831f052643..dafa925334 100644
--- a/Spigot-Server-Patches/0141-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0140-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,4 +1,4 @@
-From 85b07be021a9d0a0e38869187e91e9e444434121 Mon Sep 17 00:00:00 2001
+From 343c815b816f30c637aaf720da8a1e83e50d1a62 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
diff --git a/Spigot-Server-Patches/0142-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0141-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0142-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0141-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 1d715f4dee..a944af1838 100644
--- a/Spigot-Server-Patches/0142-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0141-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From 83d7ab2cb698e496c3c1a68fc86cccc338bc769b Mon Sep 17 00:00:00 2001
+From 58b3bab4987b97c0c963f72537ba7aa87c242ea3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
diff --git a/Spigot-Server-Patches/0143-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0142-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0143-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0142-Fix-Chunk-Unload-Queue-Issues.patch
index d456a3d4d6..25279cb7fa 100644
--- a/Spigot-Server-Patches/0143-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0142-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 753f76b3d779e04899d7916a3bc28172e550f1ec Mon Sep 17 00:00:00 2001
+From 94237b29dd4202a034115841c7de9517822962c2 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/0144-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0143-System-property-for-disabling-watchdoge.patch
similarity index 93%
rename from Spigot-Server-Patches/0144-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0143-System-property-for-disabling-watchdoge.patch
index d44a61bdf0..f99ee34764 100644
--- a/Spigot-Server-Patches/0144-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0143-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From b1de1dda47090e2a4b8eb2f52e33ba405d338106 Mon Sep 17 00:00:00 2001
+From a52f37aa86e762fc7251695efa2138aeff54db44 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
diff --git a/Spigot-Server-Patches/0145-Optimize-EAR.patch b/Spigot-Server-Patches/0144-Optimize-EAR.patch
similarity index 97%
rename from Spigot-Server-Patches/0145-Optimize-EAR.patch
rename to Spigot-Server-Patches/0144-Optimize-EAR.patch
index bdddaf95ef..f336323fad 100644
--- a/Spigot-Server-Patches/0145-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0144-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 94998573aa681f314d5f584f240574580ba919f9 Mon Sep 17 00:00:00 2001
+From df7eb12dcbd7ff5062de3722781de79c441dd6d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
diff --git a/Spigot-Server-Patches/0146-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0145-Optimize-UserCache-Thread-Safe.patch
similarity index 98%
rename from Spigot-Server-Patches/0146-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0145-Optimize-UserCache-Thread-Safe.patch
index 869de576af..99ad6ef50c 100644
--- a/Spigot-Server-Patches/0146-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0145-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From 3cb0b6d7c63707cbd9f2b2c7c043f82fc5eda9e6 Mon Sep 17 00:00:00 2001
+From 763ff325102685fbab2b700723e50c07de30dc02 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
diff --git a/Spigot-Server-Patches/0147-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0146-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0147-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0146-Avoid-blocking-on-Network-Manager-creation.patch
index 07c166853c..6cfad163ec 100644
--- a/Spigot-Server-Patches/0147-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0146-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 4e7010c88892330d42b3824575b42558c43540bb Mon Sep 17 00:00:00 2001
+From 3f50a73a68e5d547f039a3efe4319d66e4d9dd4d 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/0148-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0147-Optional-old-TNT-cannon-behaviors.patch
similarity index 99%
rename from Spigot-Server-Patches/0148-Optional-old-TNT-cannon-behaviors.patch
rename to Spigot-Server-Patches/0147-Optional-old-TNT-cannon-behaviors.patch
index acdfa757f9..e82b117105 100644
--- a/Spigot-Server-Patches/0148-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0147-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From 1118c99292b787d46d36d393fbf1e68a870f8c58 Mon Sep 17 00:00:00 2001
+From 0d8e31682fbfcf5dc282799bdec377e75ef83f7e 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/Spigot-Server-Patches/0149-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0148-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 96%
rename from Spigot-Server-Patches/0149-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0148-Faster-redstone-torch-rapid-clock-removal.patch
index c742faa168..ae49f74203 100644
--- a/Spigot-Server-Patches/0149-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0148-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 76851a9642f1529fa292e87aee5f449356b20776 Mon Sep 17 00:00:00 2001
+From 5ff9abfac92da57a85854903f2afbabcea87f7fd 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/0150-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0149-Ensure-Chunks-never-ever-load-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0150-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0149-Ensure-Chunks-never-ever-load-async.patch
index 39513a1cd2..a9c1476eee 100644
--- a/Spigot-Server-Patches/0150-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0149-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 67b0b1e0bd6c369b0266a2533cf2f96a36410acb Mon Sep 17 00:00:00 2001
+From 4a674c97f0d61cc35fa114b853e3175acbfc0a59 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
diff --git a/Spigot-Server-Patches/0151-Add-server-name-parameter.patch b/Spigot-Server-Patches/0150-Add-server-name-parameter.patch
similarity index 93%
rename from Spigot-Server-Patches/0151-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0150-Add-server-name-parameter.patch
index 114b53a95f..5512f8f4df 100644
--- a/Spigot-Server-Patches/0151-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0150-Add-server-name-parameter.patch
@@ -1,4 +1,4 @@
-From 792a41e4a8564f50f81fcebba2313f430314b1e7 Mon Sep 17 00:00:00 2001
+From 499d2f9db7b463c1d69d9c3a00053e23298f37f0 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
diff --git a/Spigot-Server-Patches/0152-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0151-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0152-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0151-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index c77718feca..f83b283d1f 100644
--- a/Spigot-Server-Patches/0152-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0151-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From d663cba92f0a0e9a2c2b3dc45b35f758ffb24016 Mon Sep 17 00:00:00 2001
+From 5e508e3ae7c65b547be73ae5b1ec9d3b2b4ee2ea 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
diff --git a/Spigot-Server-Patches/0153-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0152-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 98%
rename from Spigot-Server-Patches/0153-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0152-Fix-FallingBlocks-being-stuck-on-fences.patch
index 0a6bcca759..a2928fbf01 100644
--- a/Spigot-Server-Patches/0153-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0152-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From 31effe329c315350ced8e35a5e5836101dbbb3ae Mon Sep 17 00:00:00 2001
+From 305e1c5af0b4945544e66903f24509905d75ad49 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
diff --git a/Spigot-Server-Patches/0154-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0153-Make-entities-look-for-hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0154-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0153-Make-entities-look-for-hoppers.patch
index 7212ddffa2..3034b0ac21 100644
--- a/Spigot-Server-Patches/0154-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0153-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From ccbab8adeb660a94e4f12664a70158626de51419 Mon Sep 17 00:00:00 2001
+From 37fa1474bd50065165753e5bdc8eacec00990464 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
diff --git a/Spigot-Server-Patches/0155-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch b/Spigot-Server-Patches/0154-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
similarity index 96%
rename from Spigot-Server-Patches/0155-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
rename to Spigot-Server-Patches/0154-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
index 470f6a3e38..b3946f3a39 100644
--- a/Spigot-Server-Patches/0155-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
+++ b/Spigot-Server-Patches/0154-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
@@ -1,4 +1,4 @@
-From 52d29c8c800096b1ae9a8769b1e3490a51e5beb9 Mon Sep 17 00:00:00 2001
+From 4920562b7fa90aae47dc8b2ede5bd9457f1f5689 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/0156-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0155-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 99%
rename from Spigot-Server-Patches/0156-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0155-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 41d17d57aa..25fd48199d 100644
--- a/Spigot-Server-Patches/0156-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0155-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 55462a92013d43eb2b79ab16e59c62434e526f33 Mon Sep 17 00:00:00 2001
+From cb8a4ef2f2cae276ed7ced8095f7722e59eb9732 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
diff --git a/Spigot-Server-Patches/0157-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0156-Toggleable-Elytra-Wall-Damage.patch
similarity index 96%
rename from Spigot-Server-Patches/0157-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0156-Toggleable-Elytra-Wall-Damage.patch
index 3a9579179b..5f90245417 100644
--- a/Spigot-Server-Patches/0157-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0156-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From ea17b15308036b862db32ff6cf226095909ec210 Mon Sep 17 00:00:00 2001
+From c43b955acf98710d223232875e3b0586090c60a5 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
diff --git a/Spigot-Server-Patches/0158-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0157-Fix-Double-World-Add-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0158-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0157-Fix-Double-World-Add-issues.patch
index b697e044b6..4abf498fe6 100644
--- a/Spigot-Server-Patches/0158-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0157-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 108c2e5e0381bc97414192d9dd61e42e4fdd93bd Mon Sep 17 00:00:00 2001
+From a0a57bded92c1e47fbd4b615262387a8e668922a 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
diff --git a/Spigot-Server-Patches/0159-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0158-Fix-Old-Sign-Conversion.patch
similarity index 98%
rename from Spigot-Server-Patches/0159-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0158-Fix-Old-Sign-Conversion.patch
index 459af63c1c..6dd67544c5 100644
--- a/Spigot-Server-Patches/0159-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0158-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 8444305ca3681b5614c8649fb0bc7c13ad064fc9 Mon Sep 17 00:00:00 2001
+From 85c5067d98b0e5f612563d2b0422a232f19b812e 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
diff --git a/Spigot-Server-Patches/0160-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0159-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 93%
rename from Spigot-Server-Patches/0160-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0159-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 9a12b8da6c..9dc151457c 100644
--- a/Spigot-Server-Patches/0160-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0159-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From f817b89f08f583bfe833f01895e5e37b77c79083 Mon Sep 17 00:00:00 2001
+From 61dfedf10fd0db21e09a830ec963edc1802b0e33 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
diff --git a/Spigot-Server-Patches/0161-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0160-More-informative-vehicle-moved-wrongly-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0161-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0160-More-informative-vehicle-moved-wrongly-message.patch
index 2e275c4840..c4a2f21eb2 100644
--- a/Spigot-Server-Patches/0161-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0160-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,4 +1,4 @@
-From 6afb5fa60e5424d24bddedb3e6812c9791b4768b Mon Sep 17 00:00:00 2001
+From 83bd048489dd3e6a1de7e6b6d224eb680f6aab00 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/0162-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0161-Re-track-players-that-dismount-from-other-players.patch
similarity index 94%
rename from Spigot-Server-Patches/0162-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0161-Re-track-players-that-dismount-from-other-players.patch
index f7737c4c0f..bf2e8a5f49 100644
--- a/Spigot-Server-Patches/0162-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0161-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From 985ad542fefc2c7c6701e3b87df6a54752bcc58b Mon Sep 17 00:00:00 2001
+From 250e0bb7e863f271cd7bd1af013c356786a337bb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
diff --git a/Spigot-Server-Patches/0163-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0162-Add-setting-for-proxy-online-mode-status.patch
similarity index 97%
rename from Spigot-Server-Patches/0163-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0162-Add-setting-for-proxy-online-mode-status.patch
index 58be5acdad..f7df3ac55c 100644
--- a/Spigot-Server-Patches/0163-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0162-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From 1af870b576aae5783fe40da1ec502b0f67ed4efc Mon Sep 17 00:00:00 2001
+From db400deddc2037f271ec50ed905de61f2dbbef06 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
diff --git a/Spigot-Server-Patches/0164-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0163-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 97%
rename from Spigot-Server-Patches/0164-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0163-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 0886aefa0c..028d60c031 100644
--- a/Spigot-Server-Patches/0164-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0163-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From 15ce05737a55c54bfa0fb16f55bf697886954f82 Mon Sep 17 00:00:00 2001
+From dfb4a18ee99b99c3de3d43e4f8d4e7926e0d05eb Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
diff --git a/Spigot-Server-Patches/0165-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0164-Disable-ticking-of-snow-blocks.patch
similarity index 94%
rename from Spigot-Server-Patches/0165-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0164-Disable-ticking-of-snow-blocks.patch
index 1e24cf9a56..6dc672e8cc 100644
--- a/Spigot-Server-Patches/0165-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0164-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From daf29f80106970b4f6c0b77b3e3aced3cbab90f7 Mon Sep 17 00:00:00 2001
+From 222eaff023f8aa11e1b15d48bd62702723f6e2e4 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
diff --git a/Spigot-Server-Patches/0166-Convert-new-health-to-a-float-during-set.patch b/Spigot-Server-Patches/0165-Convert-new-health-to-a-float-during-set.patch
similarity index 94%
rename from Spigot-Server-Patches/0166-Convert-new-health-to-a-float-during-set.patch
rename to Spigot-Server-Patches/0165-Convert-new-health-to-a-float-during-set.patch
index d9545e18ec..c275b14544 100644
--- a/Spigot-Server-Patches/0166-Convert-new-health-to-a-float-during-set.patch
+++ b/Spigot-Server-Patches/0165-Convert-new-health-to-a-float-during-set.patch
@@ -1,4 +1,4 @@
-From 50c7fd9737b110863a6c0e98044df83866d2e782 Mon Sep 17 00:00:00 2001
+From 9bcfc25cb5b46f1eb8ed4bd6312fac4bcdab43a8 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 1 Sep 2016 09:51:31 +0000
 Subject: [PATCH] Convert new health to a float during set
diff --git a/Spigot-Server-Patches/0167-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0166-Fix-AIOOBE-in-inventory-handling.patch
similarity index 94%
rename from Spigot-Server-Patches/0167-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0166-Fix-AIOOBE-in-inventory-handling.patch
index bd30a5ed92..55f4465064 100644
--- a/Spigot-Server-Patches/0167-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0166-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,4 +1,4 @@
-From 872a064a40696f3e19fc8b2b0c733334124c28e6 Mon Sep 17 00:00:00 2001
+From 8ecdc74dfc0ad8778129911d59a8489821ce3837 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
diff --git a/Spigot-Server-Patches/0168-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0167-Configurable-packet-in-spam-threshold.patch
similarity index 97%
rename from Spigot-Server-Patches/0168-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0167-Configurable-packet-in-spam-threshold.patch
index a8cdd89861..bbf62277dd 100644
--- a/Spigot-Server-Patches/0168-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0167-Configurable-packet-in-spam-threshold.patch
@@ -1,4 +1,4 @@
-From f1fd52fce2177f5e93443e89ccc16a00028d1c6c Mon Sep 17 00:00:00 2001
+From e013242e770933d8af0161f53d7d8e2455ebd55e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
diff --git a/Spigot-Server-Patches/0169-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0168-Configurable-flying-kick-messages.patch
similarity index 97%
rename from Spigot-Server-Patches/0169-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0168-Configurable-flying-kick-messages.patch
index 79937d42d4..7d72355f25 100644
--- a/Spigot-Server-Patches/0169-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0168-Configurable-flying-kick-messages.patch
@@ -1,4 +1,4 @@
-From 465abb72cac9eeb154ee4a3d1538324897c65ab4 Mon Sep 17 00:00:00 2001
+From 027de108d3cc8bad73b9076d300b9c8ad4ee4aa6 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
diff --git a/Spigot-Server-Patches/0170-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0169-Auto-Save-Improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0170-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0169-Auto-Save-Improvements.patch
index 13ea94fc02..9c3d021b82 100644
--- a/Spigot-Server-Patches/0170-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0169-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 5f8378d558d5891a25c0a347c4a4879f3ef35c05 Mon Sep 17 00:00:00 2001
+From 11a88b05460b3817a48f74e5326416ef447b9eb2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
diff --git a/Spigot-Server-Patches/0171-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0170-Chunk-registration-fixes.patch
similarity index 93%
rename from Spigot-Server-Patches/0171-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0170-Chunk-registration-fixes.patch
index 3158a03aeb..b971c4e5c4 100644
--- a/Spigot-Server-Patches/0171-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0170-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From c4ec0ab8720ecb9ad022d3347f0de493b3e5c951 Mon Sep 17 00:00:00 2001
+From 20d1d0572b6d0d77e40cbc628ae09f6b4cbd4c2c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
diff --git a/Spigot-Server-Patches/0172-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch b/Spigot-Server-Patches/0171-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
similarity index 97%
rename from Spigot-Server-Patches/0172-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
rename to Spigot-Server-Patches/0171-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
index c2e1337a63..6f470802a9 100644
--- a/Spigot-Server-Patches/0172-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
+++ b/Spigot-Server-Patches/0171-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
@@ -1,4 +1,4 @@
-From 757ec2bb90744f04fce7b35c7e93e16ddb95a538 Mon Sep 17 00:00:00 2001
+From 7e706a63ea208997d90b520de7f47a0a9c5ac6b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:31:18 -0400
 Subject: [PATCH] Process NMS Data Conversion post ItemMeta on Copy
diff --git a/Spigot-Server-Patches/0173-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0172-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 93%
rename from Spigot-Server-Patches/0173-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0172-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index d81f520730..908a4af184 100644
--- a/Spigot-Server-Patches/0173-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0172-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From ec7b47649a8b1c4b036818f3fc798c9cac2025fb Mon Sep 17 00:00:00 2001
+From 254fe9bda050a3dcdaac74d61250355f1c410470 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
diff --git a/Spigot-Server-Patches/0174-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0173-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 92%
rename from Spigot-Server-Patches/0174-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0173-Auto-fix-bad-Y-levels-on-player-login.patch
index c3ad2b95e8..95d8e028c7 100644
--- a/Spigot-Server-Patches/0174-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0173-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From e01f697ab9cfa02790a92041949e7b407a0e3723 Mon Sep 17 00:00:00 2001
+From 92614475f61be436eb118ace870194ac18d76b61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
diff --git a/Spigot-Server-Patches/0175-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0174-Raise-string-limit-for-packet-serialization.patch
similarity index 95%
rename from Spigot-Server-Patches/0175-Raise-string-limit-for-packet-serialization.patch
rename to Spigot-Server-Patches/0174-Raise-string-limit-for-packet-serialization.patch
index cef6b86061..8597b3fd5b 100644
--- a/Spigot-Server-Patches/0175-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0174-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From 2cf81206a3da85b16153b908df063ec1527a6c88 Mon Sep 17 00:00:00 2001
+From b764aff15a3ec79ee2a19559650e88ef279f1f3b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:54:20 -0400
 Subject: [PATCH] Raise string limit for packet serialization
diff --git a/Spigot-Server-Patches/0176-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0175-Disable-Vanilla-Chunk-GC.patch
similarity index 95%
rename from Spigot-Server-Patches/0176-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0175-Disable-Vanilla-Chunk-GC.patch
index f849b324ca..4d3b9f8c79 100644
--- a/Spigot-Server-Patches/0176-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0175-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 749b88d2159fe452ccb51881004c3f878b5977c4 Mon Sep 17 00:00:00 2001
+From 96cd80a98cf8702e37dcfb3b9ed6f2c1fbfa2bca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
diff --git a/Spigot-Server-Patches/0177-Add-hit-entity-to-ProjectileHitEvent.patch b/Spigot-Server-Patches/0176-Add-hit-entity-to-ProjectileHitEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0177-Add-hit-entity-to-ProjectileHitEvent.patch
rename to Spigot-Server-Patches/0176-Add-hit-entity-to-ProjectileHitEvent.patch
index 713d5d3137..fce6a918a8 100644
--- a/Spigot-Server-Patches/0177-Add-hit-entity-to-ProjectileHitEvent.patch
+++ b/Spigot-Server-Patches/0176-Add-hit-entity-to-ProjectileHitEvent.patch
@@ -1,4 +1,4 @@
-From 05ef428d5cc669cc3d36fc7065beb194f4611be1 Mon Sep 17 00:00:00 2001
+From 181ebeba38bebb388ce49764af07cb1e9d56658c Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Wed, 21 Sep 2016 20:40:46 -0700
 Subject: [PATCH] Add hit entity to ProjectileHitEvent
diff --git a/Spigot-Server-Patches/0178-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0177-Option-to-remove-corrupt-tile-entities.patch
similarity index 96%
rename from Spigot-Server-Patches/0178-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0177-Option-to-remove-corrupt-tile-entities.patch
index 624bf2d268..97f10100de 100644
--- a/Spigot-Server-Patches/0178-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0177-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From 2371c3f9301dfe640f384b35b08b2d1f06cf4038 Mon Sep 17 00:00:00 2001
+From e479dcac7e3df3695921c10fab905906e393ee84 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities