From 974b0afca91844fed61c5fda9293bbcd88752c2f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 29 Apr 2017 05:27:31 -0500
Subject: [PATCH] Remove last bit of chunk exists region file fix

CraftBukkit removed their implementation that caused this issue,
switching to Mojang's implementation which doesn't appear to share it. I
already removed the important bit in the last upstream merge, this is
just unused and unnecessary now. So we remove it.
---
 ...=> 0047-Add-PlayerInitialSpawnEvent.patch} |  6 +--
 ...ion-File-s-when-checking-if-chunk-ex.patch | 37 -------------------
 ...=> 0048-Disable-chest-cat-detection.patch} |  4 +-
 ...9-Ensure-commands-are-not-ran-async.patch} |  4 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |  4 +-
 ....patch => 0051-Optimize-Pathfinding.patch} |  4 +-
 ...pper-searches-if-there-are-no-items.patch} |  4 +-
 ...ch => 0053-Expose-server-CommandMap.patch} |  4 +-
 ...-informative-in-maxHealth-exception.patch} |  4 +-
 ...0055-Player-Tab-List-and-Title-APIs.patch} |  6 +--
 ...> 0056-Ensure-inv-drag-is-in-bounds.patch} |  4 +-
 ...ntation-of-tile-entity-removal-list.patch} |  4 +-
 ...d-configurable-portal-search-radius.patch} |  4 +-
 ...patch => 0059-Add-velocity-warnings.patch} |  4 +-
 ...-inter-world-teleportation-glitches.patch} |  6 +--
 ... 0061-Add-exception-reporting-event.patch} |  6 +--
 ...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 +-
 ... => 0065-Complete-resource-pack-API.patch} |  6 +--
 ... 0066-Chunk-save-queue-improvements.patch} |  2 +-
 ....patch => 0067-Chunk-Save-Reattempt.patch} |  2 +-
 ...ding-permissions.yml-before-plugins.patch} |  4 +-
 ...low-Reloading-of-Custom-Permissions.patch} |  4 +-
 ...h => 0070-Remove-Metadata-on-reload.patch} |  4 +-
 ...patch => 0071-Undead-horse-leashing.patch} |  4 +-
 ...h => 0072-Fix-Furnace-cook-time-bug.patch} |  4 +-
 ...73-Handle-Item-Meta-Inconsistencies.patch} |  2 +-
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |  4 +-
 ...atch => 0075-Add-World-Util-Methods.patch} |  4 +-
 ...6-Optimized-Light-Level-Comparisons.patch} |  4 +-
 ...0077-Pass-world-to-Village-creation.patch} |  4 +-
 ...-Custom-replacement-for-eaten-items.patch} |  4 +-
 ... 0079-Set-health-before-death-event.patch} |  4 +-
 ...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 => 0083-Fix-SkullCache-case-bug.patch} |  4 +-
 ...ch => 0084-Waving-banner-workaround.patch} |  4 +-
 ...85-Use-a-Shared-Random-for-Entities.patch} |  4 +-
 ...> 0086-Don-t-teleport-dead-entities.patch} |  4 +-
 ...patch => 0087-Optimize-Chunk-Access.patch} |  6 +--
 ...e-spawn-chances-for-skeleton-horses.patch} |  4 +-
 ...ocation-getType-and-getBlockData-fo.patch} |  4 +-
 ... 0090-Fix-cooked-fish-legacy-import.patch} |  4 +-
 ... 0091-Access-items-by-EquipmentSlot.patch} |  4 +-
 ...eck-async-remove-unused-vars-GH-159.patch} |  4 +-
 ...able-BlockPhysicsEvent-for-Redstone.patch} |  4 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  4 +-
 ...-Configurable-Chunk-Inhabited-Timer.patch} |  4 +-
 ...t.patch => 0096-EntityPathfindEvent.patch} |  4 +-
 ...-BlockFromToEvent-from-loading-chun.patch} |  4 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |  6 +--
 ...gionFileCache-and-make-configurable.patch} | 12 +++---
 ...h => 0100-Use-Optimized-Collections.patch} |  6 +--
 ...Do-not-load-chunks-for-light-checks.patch} |  4 +-
 ...102-Add-PlayerUseUnknownEntityEvent.patch} |  4 +-
 ...DebugInfo-not-initialized-on-client.patch} |  6 +--
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  4 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  4 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |  4 +-
 ...m-reload-spawn-chunks-in-nether-end.patch} |  4 +-
 ...8-Remove-Debug-checks-from-DataBits.patch} |  4 +-
 ...illa-per-world-scoreboard-coloring-.patch} |  4 +-
 ...d-for-setting-passengers-on-players.patch} |  6 +--
 ...emove-unused-World-Tile-Entity-List.patch} |  4 +-
 ... 0112-Don-t-tick-Skulls-unused-code.patch} |  4 +-
 ... 0113-Configurable-Player-Collision.patch} |  2 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |  4 +-
 ...mobs-should-only-spawn-in-the-water.patch} |  4 +-
 ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} |  4 +-
 ...> 0117-Configurable-RCON-IP-address.patch} |  4 +-
 ...18-Prevent-Fire-from-loading-chunks.patch} |  4 +-
 ...9-Implement-PlayerLocaleChangeEvent.patch} |  2 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  4 +-
 ...to-configure-frosted_ice-properties.patch} |  4 +-
 ...-Vehicle-Event-Cancellation-Changes.patch} |  4 +-
 ...dispenser-dropper-furnace-placement.patch} |  4 +-
 ...mprove-Minecraft-Hopper-Performance.patch} |  4 +-
 ...possibility-for-getServer-singleton.patch} |  4 +-
 ...tem-frames-performance-and-bug-fixe.patch} |  4 +-
 ...API-Replenishable-Lootables-Feature.patch} |  4 +-
 ...-Do-not-load-chunks-for-pathfinding.patch} |  4 +-
 ...> 0129-Entity-Tracking-Improvements.patch} |  4 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  4 +-
 ...unks-as-active-for-neighbor-updates.patch} |  4 +-
 ... 0132-Fix-Chunk-Unload-Queue-Issues.patch} |  6 +--
 ...em-property-for-disabling-watchdoge.patch} |  4 +-
 ...mize-EAR.patch => 0134-Optimize-EAR.patch} |  4 +-
 ...0135-Optimize-UserCache-Thread-Safe.patch} |  4 +-
 ...locking-on-Network-Manager-creation.patch} |  4 +-
 ...7-Optional-old-TNT-cannon-behaviors.patch} |  4 +-
 ...-redstone-torch-rapid-clock-removal.patch} |  4 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |  4 +-
 ...h => 0140-Add-server-name-parameter.patch} |  4 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |  4 +-
 ...FallingBlocks-being-stuck-on-fences.patch} |  4 +-
 ...0143-Make-entities-look-for-hoppers.patch} |  4 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |  6 +--
 ... 0145-Toggleable-Elytra-Wall-Damage.patch} |  4 +-
 ...=> 0146-Fix-Double-World-Add-issues.patch} |  2 +-
 ...tch => 0147-Fix-Old-Sign-Conversion.patch} |  4 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |  4 +-
 ...ative-vehicle-moved-wrongly-message.patch} |  4 +-
 ...rs-that-dismount-from-other-players.patch} |  2 +-
 ...etting-for-proxy-online-mode-status.patch} |  4 +-
 ...-BlockStateEnum-hashCode-and-equals.patch} |  4 +-
 ...0153-Disable-ticking-of-snow-blocks.patch} |  4 +-
 ...54-Fix-AIOOBE-in-inventory-handling.patch} |  4 +-
 ...nfigurable-packet-in-spam-threshold.patch} |  4 +-
 ...6-Configurable-flying-kick-messages.patch} |  4 +-
 ...atch => 0157-Auto-Save-Improvements.patch} |  2 +-
 ...ch => 0158-Chunk-registration-fixes.patch} |  4 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  4 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |  2 +-
 ...ring-limit-for-packet-serialization.patch} |  4 +-
 ...ch => 0162-Disable-Vanilla-Chunk-GC.patch} |  4 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  4 +-
 ...nt.patch => 0164-Add-EntityZapEvent.patch} |  4 +-
 ...hunks-from-Hoppers-and-other-things.patch} |  4 +-
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} |  2 +-
 ... 0167-Chunk-Save-Stats-Debug-Option.patch} |  2 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  4 +-
 ...69-Cache-user-authenticator-threads.patch} |  4 +-
 ...atch => 0170-Optimize-Network-Queue.patch} |  4 +-
 ...tch => 0171-Optimise-NetworkManager.patch} |  4 +-
 ....patch => 0172-Optimise-removeQueue.patch} |  2 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  4 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  4 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  4 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  4 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |  4 +-
 ... => 0178-Add-ProjectileCollideEvent.patch} |  4 +-
 ...-Vanished-players-don-t-have-rights.patch} |  4 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |  4 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |  8 ++--
 ...igurable-Cartographer-Treasure-Maps.patch} |  8 ++--
 ... => 0183-Optimize-ItemStack.isEmpty.patch} |  6 +--
 ...o-control-if-armour-stands-can-move.patch} |  8 ++--
 ...-armor-stands-from-doing-entity-loo.patch} |  8 ++--
 ...option-to-remove-invalid-statistics.patch} |  8 ++--
 ...nt.patch => 0187-IllegalPacketEvent.patch} |  6 +--
 ...8-Properly-fix-item-duplication-bug.patch} |  2 +-
 ...=> 0189-String-based-Action-Bar-API.patch} |  8 ++--
 ... 0190-Activation-Range-Improvements.patch} | 18 ++++-----
 ...-API-s.patch => 0191-Firework-API-s.patch} | 12 +++---
 ...ated-Build-Download-URL-to-Paper-CI.patch} |  6 +--
 ... 0193-PlayerTeleportEndGatewayEvent.patch} |  6 +--
 ...re-Improper-Anvil-Item-Name-Packets.patch} |  6 +--
 ...low-31-instead-of-30-for-item-names.patch} |  6 +--
 ... => 0196-ShulkerBox-Dupe-Prevention.patch} |  6 +--
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  6 +--
 ...h => 0198-Enforce-Sync-Player-Saves.patch} |  2 +-
 ... => 0199-Enforce-Sync-Chunk-Unloads.patch} |  6 +--
 ...low-entities-to-ride-themselves-572.patch} |  6 +--
 ...atch => 0201-Fix-block-break-desync.patch} |  6 +--
 ...ign-the-World-in-WorldGenStronghold.patch} |  6 +--
 ...-fromBottle-flag-to-Experience-Orbs.patch} | 10 ++---
 ...-Remove-the-Vanilla-Method-Profiler.patch} |  8 ++--
 ...patch => 0205-Cap-Entity-Collisions.patch} | 10 ++---
 ...ow-a-zero-max-height-in-BiomeJungle.patch} |  8 ++--
 ...-CraftScheduler-Async-Task-Debugger.patch} |  6 +--
 ...g.patch => 0208-Shame-on-you-Mojang.patch} |  6 +--
 ...ore-aggressive-in-the-chunk-unload-.patch} |  6 +--
 ...> 0210-Do-not-let-armorstands-drown.patch} |  8 ++--
 ...-attempting-to-read-EMPTY-ItemStack.patch} |  6 +--
 166 files changed, 384 insertions(+), 421 deletions(-)
 rename Spigot-Server-Patches/{0048-Add-PlayerInitialSpawnEvent.patch => 0047-Add-PlayerInitialSpawnEvent.patch} (93%)
 delete mode 100644 Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
 rename Spigot-Server-Patches/{0049-Disable-chest-cat-detection.patch => 0048-Disable-chest-cat-detection.patch} (95%)
 rename Spigot-Server-Patches/{0050-Ensure-commands-are-not-ran-async.patch => 0049-Ensure-commands-are-not-ran-async.patch} (98%)
 rename Spigot-Server-Patches/{0051-All-chunks-are-slime-spawn-chunks-toggle.patch => 0050-All-chunks-are-slime-spawn-chunks-toggle.patch} (95%)
 rename Spigot-Server-Patches/{0052-Optimize-Pathfinding.patch => 0051-Optimize-Pathfinding.patch} (95%)
 rename Spigot-Server-Patches/{0053-Avoid-hopper-searches-if-there-are-no-items.patch => 0052-Avoid-hopper-searches-if-there-are-no-items.patch} (98%)
 rename Spigot-Server-Patches/{0054-Expose-server-CommandMap.patch => 0053-Expose-server-CommandMap.patch} (88%)
 rename Spigot-Server-Patches/{0055-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0054-Be-a-bit-more-informative-in-maxHealth-exception.patch} (93%)
 rename Spigot-Server-Patches/{0056-Player-Tab-List-and-Title-APIs.patch => 0055-Player-Tab-List-and-Title-APIs.patch} (98%)
 rename Spigot-Server-Patches/{0057-Ensure-inv-drag-is-in-bounds.patch => 0056-Ensure-inv-drag-is-in-bounds.patch} (92%)
 rename Spigot-Server-Patches/{0058-Change-implementation-of-tile-entity-removal-list.patch => 0057-Change-implementation-of-tile-entity-removal-list.patch} (97%)
 rename Spigot-Server-Patches/{0059-Add-configurable-portal-search-radius.patch => 0058-Add-configurable-portal-search-radius.patch} (96%)
 rename Spigot-Server-Patches/{0060-Add-velocity-warnings.patch => 0059-Add-velocity-warnings.patch} (97%)
 rename Spigot-Server-Patches/{0061-Fix-inter-world-teleportation-glitches.patch => 0060-Fix-inter-world-teleportation-glitches.patch} (95%)
 rename Spigot-Server-Patches/{0062-Add-exception-reporting-event.patch => 0061-Add-exception-reporting-event.patch} (99%)
 rename Spigot-Server-Patches/{0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0062-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (94%)
 rename Spigot-Server-Patches/{0064-Disable-Scoreboards-for-non-players-by-default.patch => 0063-Disable-Scoreboards-for-non-players-by-default.patch} (96%)
 rename Spigot-Server-Patches/{0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (95%)
 rename Spigot-Server-Patches/{0066-Complete-resource-pack-API.patch => 0065-Complete-resource-pack-API.patch} (96%)
 rename Spigot-Server-Patches/{0067-Chunk-save-queue-improvements.patch => 0066-Chunk-save-queue-improvements.patch} (99%)
 rename Spigot-Server-Patches/{0068-Chunk-Save-Reattempt.patch => 0067-Chunk-Save-Reattempt.patch} (97%)
 rename Spigot-Server-Patches/{0069-Default-loading-permissions.yml-before-plugins.patch => 0068-Default-loading-permissions.yml-before-plugins.patch} (97%)
 rename Spigot-Server-Patches/{0070-Allow-Reloading-of-Custom-Permissions.patch => 0069-Allow-Reloading-of-Custom-Permissions.patch} (94%)
 rename Spigot-Server-Patches/{0071-Remove-Metadata-on-reload.patch => 0070-Remove-Metadata-on-reload.patch} (92%)
 rename Spigot-Server-Patches/{0072-Undead-horse-leashing.patch => 0071-Undead-horse-leashing.patch} (95%)
 rename Spigot-Server-Patches/{0073-Fix-Furnace-cook-time-bug.patch => 0072-Fix-Furnace-cook-time-bug.patch} (93%)
 rename Spigot-Server-Patches/{0074-Handle-Item-Meta-Inconsistencies.patch => 0073-Handle-Item-Meta-Inconsistencies.patch} (99%)
 rename Spigot-Server-Patches/{0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0074-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (95%)
 rename Spigot-Server-Patches/{0076-Add-World-Util-Methods.patch => 0075-Add-World-Util-Methods.patch} (97%)
 rename Spigot-Server-Patches/{0077-Optimized-Light-Level-Comparisons.patch => 0076-Optimized-Light-Level-Comparisons.patch} (99%)
 rename Spigot-Server-Patches/{0078-Pass-world-to-Village-creation.patch => 0077-Pass-world-to-Village-creation.patch} (94%)
 rename Spigot-Server-Patches/{0079-Custom-replacement-for-eaten-items.patch => 0078-Custom-replacement-for-eaten-items.patch} (96%)
 rename Spigot-Server-Patches/{0080-Set-health-before-death-event.patch => 0079-Set-health-before-death-event.patch} (96%)
 rename Spigot-Server-Patches/{0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0080-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (95%)
 rename Spigot-Server-Patches/{0082-Catch-Async-PlayerChunkMap-operations.patch => 0081-Catch-Async-PlayerChunkMap-operations.patch} (91%)
 rename Spigot-Server-Patches/{0083-Support-offline-mode-in-whitelist-command-as-well.patch => 0082-Support-offline-mode-in-whitelist-command-as-well.patch} (98%)
 rename Spigot-Server-Patches/{0084-Fix-SkullCache-case-bug.patch => 0083-Fix-SkullCache-case-bug.patch} (92%)
 rename Spigot-Server-Patches/{0085-Waving-banner-workaround.patch => 0084-Waving-banner-workaround.patch} (94%)
 rename Spigot-Server-Patches/{0086-Use-a-Shared-Random-for-Entities.patch => 0085-Use-a-Shared-Random-for-Entities.patch} (94%)
 rename Spigot-Server-Patches/{0087-Don-t-teleport-dead-entities.patch => 0086-Don-t-teleport-dead-entities.patch} (92%)
 rename Spigot-Server-Patches/{0088-Optimize-Chunk-Access.patch => 0087-Optimize-Chunk-Access.patch} (93%)
 rename Spigot-Server-Patches/{0089-Configurable-spawn-chances-for-skeleton-horses.patch => 0088-Configurable-spawn-chances-for-skeleton-horses.patch} (95%)
 rename Spigot-Server-Patches/{0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (99%)
 rename Spigot-Server-Patches/{0091-Fix-cooked-fish-legacy-import.patch => 0090-Fix-cooked-fish-legacy-import.patch} (93%)
 rename Spigot-Server-Patches/{0092-Access-items-by-EquipmentSlot.patch => 0091-Access-items-by-EquipmentSlot.patch} (96%)
 rename Spigot-Server-Patches/{0093-Check-async-remove-unused-vars-GH-159.patch => 0092-Check-async-remove-unused-vars-GH-159.patch} (95%)
 rename Spigot-Server-Patches/{0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (98%)
 rename Spigot-Server-Patches/{0095-Entity-AddTo-RemoveFrom-World-Events.patch => 0094-Entity-AddTo-RemoveFrom-World-Events.patch} (92%)
 rename Spigot-Server-Patches/{0096-Configurable-Chunk-Inhabited-Timer.patch => 0095-Configurable-Chunk-Inhabited-Timer.patch} (94%)
 rename Spigot-Server-Patches/{0097-EntityPathfindEvent.patch => 0096-EntityPathfindEvent.patch} (95%)
 rename Spigot-Server-Patches/{0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch => 0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch} (97%)
 rename Spigot-Server-Patches/{0099-Reduce-IO-ops-opening-a-new-region-file.patch => 0098-Reduce-IO-ops-opening-a-new-region-file.patch} (94%)
 rename Spigot-Server-Patches/{0100-Sanitise-RegionFileCache-and-make-configurable.patch => 0099-Sanitise-RegionFileCache-and-make-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0101-Use-Optimized-Collections.patch => 0100-Use-Optimized-Collections.patch} (95%)
 rename Spigot-Server-Patches/{0102-Do-not-load-chunks-for-light-checks.patch => 0101-Do-not-load-chunks-for-light-checks.patch} (92%)
 rename Spigot-Server-Patches/{0103-Add-PlayerUseUnknownEntityEvent.patch => 0102-Add-PlayerUseUnknownEntityEvent.patch} (95%)
 rename Spigot-Server-Patches/{0104-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0103-Fix-reducedDebugInfo-not-initialized-on-client.patch} (90%)
 rename Spigot-Server-Patches/{0105-Configurable-Grass-Spread-Tick-Rate.patch => 0104-Configurable-Grass-Spread-Tick-Rate.patch} (95%)
 rename Spigot-Server-Patches/{0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (98%)
 rename Spigot-Server-Patches/{0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (91%)
 rename Spigot-Server-Patches/{0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (93%)
 rename Spigot-Server-Patches/{0109-Remove-Debug-checks-from-DataBits.patch => 0108-Remove-Debug-checks-from-DataBits.patch} (95%)
 rename Spigot-Server-Patches/{0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (97%)
 rename Spigot-Server-Patches/{0111-Workaround-for-setting-passengers-on-players.patch => 0110-Workaround-for-setting-passengers-on-players.patch} (90%)
 rename Spigot-Server-Patches/{0112-Remove-unused-World-Tile-Entity-List.patch => 0111-Remove-unused-World-Tile-Entity-List.patch} (97%)
 rename Spigot-Server-Patches/{0113-Don-t-tick-Skulls-unused-code.patch => 0112-Don-t-tick-Skulls-unused-code.patch} (90%)
 rename Spigot-Server-Patches/{0114-Configurable-Player-Collision.patch => 0113-Configurable-Player-Collision.patch} (99%)
 rename Spigot-Server-Patches/{0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (97%)
 rename Spigot-Server-Patches/{0116-Water-mobs-should-only-spawn-in-the-water.patch => 0115-Water-mobs-should-only-spawn-in-the-water.patch} (93%)
 rename Spigot-Server-Patches/{0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch => 0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} (97%)
 rename Spigot-Server-Patches/{0118-Configurable-RCON-IP-address.patch => 0117-Configurable-RCON-IP-address.patch} (92%)
 rename Spigot-Server-Patches/{0119-Prevent-Fire-from-loading-chunks.patch => 0118-Prevent-Fire-from-loading-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0120-Implement-PlayerLocaleChangeEvent.patch => 0119-Implement-PlayerLocaleChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0121-EntityRegainHealthEvent-isFastRegen-API.patch => 0120-EntityRegainHealthEvent-isFastRegen-API.patch} (96%)
 rename Spigot-Server-Patches/{0122-Add-ability-to-configure-frosted_ice-properties.patch => 0121-Add-ability-to-configure-frosted_ice-properties.patch} (96%)
 rename Spigot-Server-Patches/{0123-Vehicle-Event-Cancellation-Changes.patch => 0122-Vehicle-Event-Cancellation-Changes.patch} (96%)
 rename Spigot-Server-Patches/{0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch => 0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch} (97%)
 rename Spigot-Server-Patches/{0125-Improve-Minecraft-Hopper-Performance.patch => 0124-Improve-Minecraft-Hopper-Performance.patch} (98%)
 rename Spigot-Server-Patches/{0126-remove-null-possibility-for-getServer-singleton.patch => 0125-remove-null-possibility-for-getServer-singleton.patch} (95%)
 rename Spigot-Server-Patches/{0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0126-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (98%)
 rename Spigot-Server-Patches/{0128-LootTable-API-Replenishable-Lootables-Feature.patch => 0127-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0129-Do-not-load-chunks-for-pathfinding.patch => 0128-Do-not-load-chunks-for-pathfinding.patch} (90%)
 rename Spigot-Server-Patches/{0130-Entity-Tracking-Improvements.patch => 0129-Entity-Tracking-Improvements.patch} (98%)
 rename Spigot-Server-Patches/{0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0130-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (95%)
 rename Spigot-Server-Patches/{0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0131-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (97%)
 rename Spigot-Server-Patches/{0133-Fix-Chunk-Unload-Queue-Issues.patch => 0132-Fix-Chunk-Unload-Queue-Issues.patch} (93%)
 rename Spigot-Server-Patches/{0134-System-property-for-disabling-watchdoge.patch => 0133-System-property-for-disabling-watchdoge.patch} (92%)
 rename Spigot-Server-Patches/{0135-Optimize-EAR.patch => 0134-Optimize-EAR.patch} (96%)
 rename Spigot-Server-Patches/{0136-Optimize-UserCache-Thread-Safe.patch => 0135-Optimize-UserCache-Thread-Safe.patch} (97%)
 rename Spigot-Server-Patches/{0137-Avoid-blocking-on-Network-Manager-creation.patch => 0136-Avoid-blocking-on-Network-Manager-creation.patch} (97%)
 rename Spigot-Server-Patches/{0138-Optional-old-TNT-cannon-behaviors.patch => 0137-Optional-old-TNT-cannon-behaviors.patch} (99%)
 rename Spigot-Server-Patches/{0139-Faster-redstone-torch-rapid-clock-removal.patch => 0138-Faster-redstone-torch-rapid-clock-removal.patch} (95%)
 rename Spigot-Server-Patches/{0140-Ensure-Chunks-never-ever-load-async.patch => 0139-Ensure-Chunks-never-ever-load-async.patch} (97%)
 rename Spigot-Server-Patches/{0141-Add-server-name-parameter.patch => 0140-Add-server-name-parameter.patch} (92%)
 rename Spigot-Server-Patches/{0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0141-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%)
 rename Spigot-Server-Patches/{0143-Fix-FallingBlocks-being-stuck-on-fences.patch => 0142-Fix-FallingBlocks-being-stuck-on-fences.patch} (98%)
 rename Spigot-Server-Patches/{0144-Make-entities-look-for-hoppers.patch => 0143-Make-entities-look-for-hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0144-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (98%)
 rename Spigot-Server-Patches/{0146-Toggleable-Elytra-Wall-Damage.patch => 0145-Toggleable-Elytra-Wall-Damage.patch} (96%)
 rename Spigot-Server-Patches/{0147-Fix-Double-World-Add-issues.patch => 0146-Fix-Double-World-Add-issues.patch} (96%)
 rename Spigot-Server-Patches/{0148-Fix-Old-Sign-Conversion.patch => 0147-Fix-Old-Sign-Conversion.patch} (98%)
 rename Spigot-Server-Patches/{0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0148-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (92%)
 rename Spigot-Server-Patches/{0150-More-informative-vehicle-moved-wrongly-message.patch => 0149-More-informative-vehicle-moved-wrongly-message.patch} (92%)
 rename Spigot-Server-Patches/{0151-Re-track-players-that-dismount-from-other-players.patch => 0150-Re-track-players-that-dismount-from-other-players.patch} (94%)
 rename Spigot-Server-Patches/{0152-Add-setting-for-proxy-online-mode-status.patch => 0151-Add-setting-for-proxy-online-mode-status.patch} (97%)
 rename Spigot-Server-Patches/{0153-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0152-Optimise-BlockStateEnum-hashCode-and-equals.patch} (96%)
 rename Spigot-Server-Patches/{0154-Disable-ticking-of-snow-blocks.patch => 0153-Disable-ticking-of-snow-blocks.patch} (93%)
 rename Spigot-Server-Patches/{0155-Fix-AIOOBE-in-inventory-handling.patch => 0154-Fix-AIOOBE-in-inventory-handling.patch} (92%)
 rename Spigot-Server-Patches/{0156-Configurable-packet-in-spam-threshold.patch => 0155-Configurable-packet-in-spam-threshold.patch} (96%)
 rename Spigot-Server-Patches/{0157-Configurable-flying-kick-messages.patch => 0156-Configurable-flying-kick-messages.patch} (96%)
 rename Spigot-Server-Patches/{0158-Auto-Save-Improvements.patch => 0157-Auto-Save-Improvements.patch} (99%)
 rename Spigot-Server-Patches/{0159-Chunk-registration-fixes.patch => 0158-Chunk-registration-fixes.patch} (92%)
 rename Spigot-Server-Patches/{0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0159-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (91%)
 rename Spigot-Server-Patches/{0161-Auto-fix-bad-Y-levels-on-player-login.patch => 0160-Auto-fix-bad-Y-levels-on-player-login.patch} (92%)
 rename Spigot-Server-Patches/{0162-Raise-string-limit-for-packet-serialization.patch => 0161-Raise-string-limit-for-packet-serialization.patch} (93%)
 rename Spigot-Server-Patches/{0163-Disable-Vanilla-Chunk-GC.patch => 0162-Disable-Vanilla-Chunk-GC.patch} (94%)
 rename Spigot-Server-Patches/{0164-Option-to-remove-corrupt-tile-entities.patch => 0163-Option-to-remove-corrupt-tile-entities.patch} (95%)
 rename Spigot-Server-Patches/{0165-Add-EntityZapEvent.patch => 0164-Add-EntityZapEvent.patch} (97%)
 rename Spigot-Server-Patches/{0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0165-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (95%)
 rename Spigot-Server-Patches/{0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0166-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (98%)
 rename Spigot-Server-Patches/{0168-Chunk-Save-Stats-Debug-Option.patch => 0167-Chunk-Save-Stats-Debug-Option.patch} (98%)
 rename Spigot-Server-Patches/{0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0168-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (97%)
 rename Spigot-Server-Patches/{0170-Cache-user-authenticator-threads.patch => 0169-Cache-user-authenticator-threads.patch} (97%)
 rename Spigot-Server-Patches/{0171-Optimize-Network-Queue.patch => 0170-Optimize-Network-Queue.patch} (92%)
 rename Spigot-Server-Patches/{0172-Optimise-NetworkManager.patch => 0171-Optimise-NetworkManager.patch} (98%)
 rename Spigot-Server-Patches/{0173-Optimise-removeQueue.patch => 0172-Optimise-removeQueue.patch} (97%)
 rename Spigot-Server-Patches/{0174-Allow-Reloading-of-Command-Aliases.patch => 0173-Allow-Reloading-of-Command-Aliases.patch} (94%)
 rename Spigot-Server-Patches/{0175-Add-source-to-PlayerExpChangeEvent.patch => 0174-Add-source-to-PlayerExpChangeEvent.patch} (96%)
 rename Spigot-Server-Patches/{0176-Optimize-World.isLoaded-BlockPosition-Z.patch => 0175-Optimize-World.isLoaded-BlockPosition-Z.patch} (90%)
 rename Spigot-Server-Patches/{0177-Speedup-BlockPos-by-fixing-inlining.patch => 0176-Speedup-BlockPos-by-fixing-inlining.patch} (99%)
 rename Spigot-Server-Patches/{0178-Don-t-let-fishinghooks-use-portals.patch => 0177-Don-t-let-fishinghooks-use-portals.patch} (94%)
 rename Spigot-Server-Patches/{0179-Add-ProjectileCollideEvent.patch => 0178-Add-ProjectileCollideEvent.patch} (98%)
 rename Spigot-Server-Patches/{0180-Vanished-players-don-t-have-rights.patch => 0179-Vanished-players-don-t-have-rights.patch} (98%)
 rename Spigot-Server-Patches/{0181-Prevent-Pathfinding-out-of-World-Border.patch => 0180-Prevent-Pathfinding-out-of-World-Border.patch} (96%)
 rename Spigot-Server-Patches/{0182-Bound-Treasure-Maps-to-World-Border.patch => 0181-Bound-Treasure-Maps-to-World-Border.patch} (94%)
 rename Spigot-Server-Patches/{0183-Configurable-Cartographer-Treasure-Maps.patch => 0182-Configurable-Cartographer-Treasure-Maps.patch} (94%)
 rename Spigot-Server-Patches/{0184-Optimize-ItemStack.isEmpty.patch => 0183-Optimize-ItemStack.isEmpty.patch} (91%)
 rename Spigot-Server-Patches/{0185-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0184-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%)
 rename Spigot-Server-Patches/{0186-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (90%)
 rename Spigot-Server-Patches/{0187-Add-option-to-remove-invalid-statistics.patch => 0186-Add-option-to-remove-invalid-statistics.patch} (94%)
 rename Spigot-Server-Patches/{0188-IllegalPacketEvent.patch => 0187-IllegalPacketEvent.patch} (97%)
 rename Spigot-Server-Patches/{0189-Properly-fix-item-duplication-bug.patch => 0188-Properly-fix-item-duplication-bug.patch} (95%)
 rename Spigot-Server-Patches/{0190-String-based-Action-Bar-API.patch => 0189-String-based-Action-Bar-API.patch} (95%)
 rename Spigot-Server-Patches/{0191-Activation-Range-Improvements.patch => 0190-Activation-Range-Improvements.patch} (95%)
 rename Spigot-Server-Patches/{0192-Firework-API-s.patch => 0191-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0193-Change-Outdated-Build-Download-URL-to-Paper-CI.patch => 0192-Change-Outdated-Build-Download-URL-to-Paper-CI.patch} (90%)
 rename Spigot-Server-Patches/{0194-PlayerTeleportEndGatewayEvent.patch => 0193-PlayerTeleportEndGatewayEvent.patch} (91%)
 rename Spigot-Server-Patches/{0195-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch => 0194-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch} (91%)
 rename Spigot-Server-Patches/{0196-MC-112017-Allow-31-instead-of-30-for-item-names.patch => 0195-MC-112017-Allow-31-instead-of-30-for-item-names.patch} (90%)
 rename Spigot-Server-Patches/{0197-ShulkerBox-Dupe-Prevention.patch => 0196-ShulkerBox-Dupe-Prevention.patch} (89%)
 rename Spigot-Server-Patches/{0198-Provide-E-TE-Chunk-count-stat-methods.patch => 0197-Provide-E-TE-Chunk-count-stat-methods.patch} (93%)
 rename Spigot-Server-Patches/{0199-Enforce-Sync-Player-Saves.patch => 0198-Enforce-Sync-Player-Saves.patch} (94%)
 rename Spigot-Server-Patches/{0200-Enforce-Sync-Chunk-Unloads.patch => 0199-Enforce-Sync-Chunk-Unloads.patch} (91%)
 rename Spigot-Server-Patches/{0201-Don-t-allow-entities-to-ride-themselves-572.patch => 0200-Don-t-allow-entities-to-ride-themselves-572.patch} (87%)
 rename Spigot-Server-Patches/{0202-Fix-block-break-desync.patch => 0201-Fix-block-break-desync.patch} (87%)
 rename Spigot-Server-Patches/{0203-Assign-the-World-in-WorldGenStronghold.patch => 0202-Assign-the-World-in-WorldGenStronghold.patch} (86%)
 rename Spigot-Server-Patches/{0204-Add-fromBottle-flag-to-Experience-Orbs.patch => 0203-Add-fromBottle-flag-to-Experience-Orbs.patch} (93%)
 rename Spigot-Server-Patches/{0205-Remove-the-Vanilla-Method-Profiler.patch => 0204-Remove-the-Vanilla-Method-Profiler.patch} (95%)
 rename Spigot-Server-Patches/{0206-Cap-Entity-Collisions.patch => 0205-Cap-Entity-Collisions.patch} (93%)
 rename Spigot-Server-Patches/{0207-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch => 0206-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch} (92%)
 rename Spigot-Server-Patches/{0208-Remove-CraftScheduler-Async-Task-Debugger.patch => 0207-Remove-CraftScheduler-Async-Task-Debugger.patch} (96%)
 rename Spigot-Server-Patches/{0209-Shame-on-you-Mojang.patch => 0208-Shame-on-you-Mojang.patch} (95%)
 rename Spigot-Server-Patches/{0210-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0209-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (90%)
 rename Spigot-Server-Patches/{0211-Do-not-let-armorstands-drown.patch => 0210-Do-not-let-armorstands-drown.patch} (92%)
 rename Spigot-Server-Patches/{0212-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch => 0211-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch} (89%)

diff --git a/Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch
index 5c38cea4f1..dd0cd845af 100644
--- a/Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 2e3b2f159778b82cd48210b44e1ce8dffeb91c78 Mon Sep 17 00:00:00 2001
+From 5f5ff59c74f2094741e3cf0f5c615d34d2231005 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d778eafb3..d6a2bbc08 100644
+index 80bf61164..59c7e78b8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -104,6 +104,21 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index d778eafb3..d6a2bbc08 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch b/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
deleted file mode 100644
index ad7e06eaf5..0000000000
--- a/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9d265dc548c5d1e3df9129a15865e70b1597451d 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
-
-Plugins like Dynmap can end up creating tons of emtpy Region Files
-when using chunkExists.
-
-diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 6ec72689c..0163a4e59 100644
---- a/src/main/java/net/minecraft/server/RegionFileCache.java
-+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
-@@ -12,7 +12,13 @@ public class RegionFileCache {
- 
-     public static final Map<File, RegionFile> a = Maps.newHashMap(); // Spigot - private -> public
- 
-+    // Paper start
-     public static synchronized RegionFile a(File file, int i, int j) {
-+        return a(file, i, j, true);
-+    }
-+
-+    public static synchronized RegionFile a(File file, int i, int j, boolean create) {
-+        // Paper end
-         File file1 = new File(file, "region");
-         File file2 = new File(file1, "r." + (i >> 5) + "." + (j >> 5) + ".mca");
-         RegionFile regionfile = (RegionFile) RegionFileCache.a.get(file2);
-@@ -20,6 +26,7 @@ public class RegionFileCache {
-         if (regionfile != null) {
-             return regionfile;
-         } else {
-+            if (!create && !file2.exists()) { return null; } // Paper
-             if (!file1.exists()) {
-                 file1.mkdirs();
-             }
--- 
-2.12.2.windows.2
-
diff --git a/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0048-Disable-chest-cat-detection.patch
similarity index 95%
rename from Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch
rename to Spigot-Server-Patches/0048-Disable-chest-cat-detection.patch
index 7082f8485f..7636e780aa 100644
--- a/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0048-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From 1c4b779cc2accfe5eae2d1435bdf0e1e2a74f319 Mon Sep 17 00:00:00 2001
+From d76321993eecd60cc0a0410ff8b45a0303134b81 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 c75ed8a36..9c4d1c938 100644
  
          EntityOcelot entityocelot;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
similarity index 98%
rename from Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
index 6e7cd59624..ed38f7e4b5 100644
--- a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From acaa4a559a33fe2e2dae4fb4f59aaea68ff00490 Mon Sep 17 00:00:00 2001
+From c121bda3726ac920a54e7d3462c86cc16e114a8c 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
@@ -82,5 +82,5 @@ index 0f77d0674..5302bb283 100644
              return true;
          }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0050-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 95%
rename from Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0050-All-chunks-are-slime-spawn-chunks-toggle.patch
index d1347c3e67..1bb8773509 100644
--- a/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0050-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From 71575ec7e7c01c6ffae6465bb584e0bbb5d4e109 Mon Sep 17 00:00:00 2001
+From 6b81f8f28de16733bff9a2d833a2397f6af7fe9e 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 8fb14d6b5..c68429fb1 100644
                  }
              }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0052-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0051-Optimize-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0052-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0051-Optimize-Pathfinding.patch
index b9d1e3766c..ddcf2d546f 100644
--- a/Spigot-Server-Patches/0052-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0051-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 0a119adb2127be5db1c6efba9c6cfeeecc3926d4 Mon Sep 17 00:00:00 2001
+From 3cca34b5a315231f82eaf848a700b684e4263560 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 4f28b8819..43b2be505 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0052-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0052-Avoid-hopper-searches-if-there-are-no-items.patch
index f823900a13..cfa611bb17 100644
--- a/Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0052-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 082fa781df2dfffd7b1774cfe10089544daa70a9 Mon Sep 17 00:00:00 2001
+From 0c1ce95af25b8c95b34c255e9c0a440d64a100d7 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 b80f95159..e1fc4ea6c 100644
  
              while (iterator.hasNext()) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
similarity index 88%
rename from Spigot-Server-Patches/0054-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
index 5a7623c480..d6b7155d96 100644
--- a/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
@@ -1,4 +1,4 @@
-From ccbbc6329f8ab2240eabdc1e2eb4bdc5e3e29834 Mon Sep 17 00:00:00 2001
+From bf934f8ce2b8aed42e8412904cf5bd84f5163e3d 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 5302bb283..cab671d68 100644
          return commandMap;
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 93%
rename from Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 7f322e5017..017b794085 100644
--- a/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,4 +1,4 @@
-From ae0cf0afb053eb18ce36346f330d8940c9f8aeea Mon Sep 17 00:00:00 2001
+From a95f24eee446165a8c8006583b0de0f793c168da 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 27cd0d43d..61032eb2f 100644
  
          if (health == 0) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch
similarity index 98%
rename from Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch
index b2b8d90a39..7f09037aba 100644
--- a/Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From ca1b52f9e3a17711934151e7ff7a2af41d700320 Mon Sep 17 00:00:00 2001
+From 1de05f6089976c4332bb594dfcae72d598747e42 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 7bcafa8bb..4f6c1c2e7 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 16dcaba3f..0e7086da3 100644
+index c86a48070..0df01186f 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 @@
@@ -175,5 +175,5 @@ index 16dcaba3f..0e7086da3 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0056-Ensure-inv-drag-is-in-bounds.patch
similarity index 92%
rename from Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0056-Ensure-inv-drag-is-in-bounds.patch
index b7fa50f524..e62f60a9ec 100644
--- a/Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0056-Ensure-inv-drag-is-in-bounds.patch
@@ -1,4 +1,4 @@
-From 20d8fcc6f23ec8125341558bdf29c7dc015258b1 Mon Sep 17 00:00:00 2001
+From 3a9666f74e085cef316955a628fb5dbd7c63c214 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 686250ea8..b826089d1 100644
                  itemstack1 = playerinventory.getCarried();
                  if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
similarity index 97%
rename from Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
index 4db00e534a..414cc51e04 100644
--- a/Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,4 +1,4 @@
-From 87607d3f2bf2e768f4e192bd97576dd95fe3efd5 Mon Sep 17 00:00:00 2001
+From 19528dbbeee2a72cb791ff414a47e84fd9e30efb 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
@@ -84,5 +84,5 @@ index a1cdcd71b..354a7309b 100644
          this.f.clear();
          this.l();
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0058-Add-configurable-portal-search-radius.patch
similarity index 96%
rename from Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0058-Add-configurable-portal-search-radius.patch
index a447ec9c55..330c2f1327 100644
--- a/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0058-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From d04bed0a2739870f17f68f432a430319d515e2d9 Mon Sep 17 00:00:00 2001
+From c7880597e2dfa64fde32529848c07aff78bad349 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 1d5dce10e..7ca2617a8 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0060-Add-velocity-warnings.patch b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
similarity index 97%
rename from Spigot-Server-Patches/0060-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0059-Add-velocity-warnings.patch
index c1c50dc052..5020c623b2 100644
--- a/Spigot-Server-Patches/0060-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
@@ -1,4 +1,4 @@
-From e5d75fd43f1e772df59e499fced596ef2eefdb25 Mon Sep 17 00:00:00 2001
+From c310ea8c337901ad0bfa65949f78a0716a7fd0e0 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
@@ -58,5 +58,5 @@ index 3ed983cc0..6384d50e7 100644
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
                  dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch
similarity index 95%
rename from Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
rename to Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch
index b44d2936d1..c116a19892 100644
--- a/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From fa4d2110a0ca3cc431097ca324b6e370212f8ac4 Mon Sep 17 00:00:00 2001
+From c91c1828836d0c7465029ed20177dcb79f267005 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 4cc74cd65..fa49397ea 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0e7086da3..d72ff0af2 100644
+index 0df01186f..88fcadbfd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -579,7 +579,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -39,5 +39,5 @@ index 0e7086da3..d72ff0af2 100644
          return true;
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0062-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
index fd0948cde5..46f17774c3 100644
--- a/Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 810379dfd7052f869995fd68b8e139a640b10899 Mon Sep 17 00:00:00 2001
+From cbc43c201ce24ad2ba92a6720ec15fade9c971ef 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
@@ -225,7 +225,7 @@ index 8d1b65885..5f9678aad 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 0163a4e59..57d6443cd 100644
+index 6ec72689c..02b9bc8df 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -1,5 +1,6 @@
@@ -235,7 +235,7 @@ index 0163a4e59..57d6443cd 100644
  import com.google.common.collect.Maps;
  import java.io.DataInputStream;
  import java.io.DataOutputStream;
-@@ -75,6 +76,7 @@ public class RegionFileCache {
+@@ -68,6 +69,7 @@ public class RegionFileCache {
                  }
              } catch (IOException ioexception) {
                  ioexception.printStackTrace();
diff --git a/Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0062-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 94%
rename from Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0062-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 84291798bc..31cf9f47b7 100644
--- a/Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0062-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From 7c5e2edf7bd7a935b905f4ddd48137c861634f8d Mon Sep 17 00:00:00 2001
+From 517b94fca16325f04702e129596f9d9f1fa4a50a 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 9fc83c4a3..b3b13ba11 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 96%
rename from Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
index b52b4590f6..4e8c04d389 100644
--- a/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 94c3548d2ce0fa0ab60e04d21caf2c842eca3df3 Mon Sep 17 00:00:00 2001
+From 60f5daf8819357295a0fe9cbf2c9e6eaed5832d3 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 5b5e0e73c..be54c807b 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 95%
rename from Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 34913fbf2a..e570c71530 100644
--- a/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From 6d83a42776d8dcc58a966d6f8da8b5056c273026 Mon Sep 17 00:00:00 2001
+From b8425c39d7e6296671d9ddc5862172ab9da70d57 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 61032eb2f..348a8c758 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
index b5f29fafea..0c658d1092 100644
--- a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From db92fcc38686e0be97b3244eb5eae2e6da8966e1 Mon Sep 17 00:00:00 2001
+From 258b0dd3501ba87edaadf75dc2bd065a29753105 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
@@ -23,7 +23,7 @@ index 57879c76d..b67837dd2 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d72ff0af2..5fd5e39fa 100644
+index 88fcadbfd..dd8380f71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -74,6 +74,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -71,5 +71,5 @@ index d72ff0af2..5fd5e39fa 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0066-Chunk-save-queue-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0066-Chunk-save-queue-improvements.patch
index 1a6669e596..5c61c385c6 100644
--- a/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0066-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From cfd598467afa046d6f71df7841c168df4758dca1 Mon Sep 17 00:00:00 2001
+From 6faebb0cebf9a14b2b752145de89394a16604e53 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
diff --git a/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0067-Chunk-Save-Reattempt.patch
similarity index 97%
rename from Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0067-Chunk-Save-Reattempt.patch
index 065b55e513..45e6b2bf57 100644
--- a/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0067-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 1a4ce4dfb31730e1359640c638688cbba006b68c Mon Sep 17 00:00:00 2001
+From 215acca8d61ac2957f84dc40dfda8bdf6ed7b14a 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/0069-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
similarity index 97%
rename from Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
index f5737e3b20..69ac736b4a 100644
--- a/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From 2cbb25a2774f83799823fe7362f067609bdffc0c Mon Sep 17 00:00:00 2001
+From 0c3c5d0949ca3e6635a5935f5e9cb162b6e28fa7 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
@@ -51,5 +51,5 @@ index 28da39cbd..9df6c0ebb 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
similarity index 94%
rename from Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
index c49e41e974..95e3241f43 100644
--- a/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From c17904b073dbf431afdc19c4dc09f444ad6ecb6c Mon Sep 17 00:00:00 2001
+From 1b592b3b573635540cf12d730926ede918b22e19 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 9df6c0ebb..e77307c35 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
similarity index 92%
rename from Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
index 27c349a80b..5e4a8d6408 100644
--- a/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From ef440adcb9e263901028407fe1ad0d2e02f2435c Mon Sep 17 00:00:00 2001
+From 6ad5adc9ed459e196fc415dba3914509def9b240 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 e77307c35..4d761d32a 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0072-Undead-horse-leashing.patch b/Spigot-Server-Patches/0071-Undead-horse-leashing.patch
similarity index 95%
rename from Spigot-Server-Patches/0072-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0071-Undead-horse-leashing.patch
index 5c4cd757ce..aa718954ef 100644
--- a/Spigot-Server-Patches/0072-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0071-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 2c430290f17c86c477c2c7a7d267fd23ddfbba3f Mon Sep 17 00:00:00 2001
+From 1e3c4136cd2e9eec214fb9b730c3a01e486d841c 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
@@ -33,5 +33,5 @@ index d74ccd68d..3416c7a7d 100644
  
      protected void q(float f) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0072-Fix-Furnace-cook-time-bug.patch
similarity index 93%
rename from Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0072-Fix-Furnace-cook-time-bug.patch
index cf4bac701f..36f1445198 100644
--- a/Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0072-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From f9d6774c585cdc37c69b774d8afee693a95dda02 Mon Sep 17 00:00:00 2001
+From 1f5e3b8cd3c4a90bd433b56172f9b84f11eb65ed 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 2f1f3edf5..e230d1608 100644
                  this.burn();
                  flag1 = true;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0073-Handle-Item-Meta-Inconsistencies.patch
similarity index 99%
rename from Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0073-Handle-Item-Meta-Inconsistencies.patch
index b2ff8917df..53c1e6c930 100644
--- a/Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0073-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 3ebd0b6e30d5bb88cd31408f92c49f79e928d2a9 Mon Sep 17 00:00:00 2001
+From 96ff410272199eb91bc1607e2b57ceaa9470b610 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
diff --git a/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0074-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0074-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 3bafafd76f..b631fdd608 100644
--- a/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0074-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From ccd2974a83c4fae5d48a01486ab8b8dffe414363 Mon Sep 17 00:00:00 2001
+From f97a0149fe312629f4b29fce2ac49eacc0456754 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 65689f26d..8cda47518 100644
                  }
              }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0076-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0075-Add-World-Util-Methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0075-Add-World-Util-Methods.patch
index fa9710a215..47e7307023 100644
--- a/Spigot-Server-Patches/0076-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0075-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From cc98ddd19cc2afe5d8afcd704383ead8d44c36fd Mon Sep 17 00:00:00 2001
+From e6cab2b2737495bda0da7f5bea283749cf2d99be 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 cc7369e52..1d2d174e8 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0076-Optimized-Light-Level-Comparisons.patch
similarity index 99%
rename from Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0076-Optimized-Light-Level-Comparisons.patch
index 0379be7100..c8eec49f6c 100644
--- a/Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0076-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From f9f7cf2e61b9417615c1eec1229bb54569db0d0d Mon Sep 17 00:00:00 2001
+From ca1b25eea56895788212adb3ecb23dedc8ae132c 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 897882c97..970fabf71 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0077-Pass-world-to-Village-creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0077-Pass-world-to-Village-creation.patch
index 0ccf26d36d..192e3aefce 100644
--- a/Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0077-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From 2914df909b71dac220c18c9b220de90f2fce300c Mon Sep 17 00:00:00 2001
+From 7cb360d7aec57c15e7ce8b669d28fd9de086ffc3 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 2ab381d50..817c836c3 100644
          this.d = BlockPosition.ZERO;
          this.j = Maps.newHashMap();
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
similarity index 96%
rename from Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
index 70608f2819..4893c0baf7 100644
--- a/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From 37773c2d575050daa8addd625bf40b28ee74a5a0 Mon Sep 17 00:00:00 2001
+From c267a846efc3860d0dd8c2664eb5363fcf2c2f01 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
@@ -46,5 +46,5 @@ index 247224117..9cb3b22fb 100644
  
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0080-Set-health-before-death-event.patch b/Spigot-Server-Patches/0079-Set-health-before-death-event.patch
similarity index 96%
rename from Spigot-Server-Patches/0080-Set-health-before-death-event.patch
rename to Spigot-Server-Patches/0079-Set-health-before-death-event.patch
index 295892b195..5efb3cfdc5 100644
--- a/Spigot-Server-Patches/0080-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0079-Set-health-before-death-event.patch
@@ -1,4 +1,4 @@
-From 376c4082cf93f2688de0d051a121f20b5c8ba326 Mon Sep 17 00:00:00 2001
+From 4cea4a67fa45178c59807df4f21b86b09b88574e 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
@@ -45,5 +45,5 @@ index 348a8c758..c0103cb39 100644
  
      public double getMaxHealth() {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0080-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 95%
rename from Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0080-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index bb4e675b62..4261b88323 100644
--- a/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0080-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From 04de121f6f8d6af28cb652b11cd17feec668ce9e Mon Sep 17 00:00:00 2001
+From 59332750bfa25c9dafc31afa9d52f2442ec5205f 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 9cb3b22fb..c70f14a15 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5fd5e39fa..80a6a0b41 100644
+index dd8380f71..0a9e8b9cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1398,6 +1398,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -56,5 +56,5 @@ index 5fd5e39fa..80a6a0b41 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0081-Catch-Async-PlayerChunkMap-operations.patch
similarity index 91%
rename from Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0081-Catch-Async-PlayerChunkMap-operations.patch
index b4d23c424e..e204f25dcb 100644
--- a/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0081-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From a5080daa55ef68c39c367086483795eb455cf451 Mon Sep 17 00:00:00 2001
+From 7a4c9cc8f43dd8cb13ceafc6b4360c58a40c5e7a 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 9012a63a0..5b27bd1c5 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0082-Support-offline-mode-in-whitelist-command-as-well.patch
similarity index 98%
rename from Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
rename to Spigot-Server-Patches/0082-Support-offline-mode-in-whitelist-command-as-well.patch
index ff4beb4abb..4db1720329 100644
--- a/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0082-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,4 +1,4 @@
-From 139e93117fa8452adb2be851e7dd957dd824d702 Mon Sep 17 00:00:00 2001
+From 08efbaa590f1d22457b23dac04cc88535f84da74 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 c74d1d2be..0f4237db1 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0083-Fix-SkullCache-case-bug.patch
similarity index 92%
rename from Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
rename to Spigot-Server-Patches/0083-Fix-SkullCache-case-bug.patch
index b3741f9043..9113bf809b 100644
--- a/Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0083-Fix-SkullCache-case-bug.patch
@@ -1,4 +1,4 @@
-From 41e002267b87e75db128ca73dec84b7636afde2b Mon Sep 17 00:00:00 2001
+From b15951b4c90b25f3db552de1d9032a5daf99fc43 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 91ca4a279..edd6fb69e 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0085-Waving-banner-workaround.patch b/Spigot-Server-Patches/0084-Waving-banner-workaround.patch
similarity index 94%
rename from Spigot-Server-Patches/0085-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0084-Waving-banner-workaround.patch
index 88f7957eb8..c78b289980 100644
--- a/Spigot-Server-Patches/0085-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0084-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From ba98d3629b53c82bc96d097c0ee3086345af2300 Mon Sep 17 00:00:00 2001
+From 9db8303c4d0edf7f783e2f8656b2f8f68fae80cb 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 c5c3f40ce..6413f76e7 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0085-Use-a-Shared-Random-for-Entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0085-Use-a-Shared-Random-for-Entities.patch
index 6df31a9107..e133a7e842 100644
--- a/Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0085-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 7db79cee3f3587bced0e3d249bb50aa4ee3b1fef Mon Sep 17 00:00:00 2001
+From ce002ce8991131c9acfba45b64c942a8b97b932d 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
@@ -27,5 +27,5 @@ index be54c807b..42bd79b10 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0086-Don-t-teleport-dead-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0086-Don-t-teleport-dead-entities.patch
index 9ba115e4cc..c4fedec25a 100644
--- a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0086-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 978d5af9bceeb871be2b1cbfffb45f9de62b5636 Mon Sep 17 00:00:00 2001
+From 3a9555ca894972a6e5c4e7bb7bf5d1e616235334 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 42bd79b10..70a431a63 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0087-Optimize-Chunk-Access.patch
similarity index 93%
rename from Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0087-Optimize-Chunk-Access.patch
index 86cd49fb74..d8e864fa8c 100644
--- a/Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0087-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 15890a007fe5797522d8b42f028835b2b2ff6d05 Mon Sep 17 00:00:00 2001
+From 580a3c1e39db0c716b97f47e00d39ebd145d9d1c 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 b0a82e7ed..a7e8a3f7d 100644
+index 0ad57afba..b49f4e292 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -27,7 +27,27 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -42,5 +42,5 @@ index b0a82e7ed..a7e8a3f7d 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0088-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 95%
rename from Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0088-Configurable-spawn-chances-for-skeleton-horses.patch
index 4149ebdd6b..9913f36e53 100644
--- a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0088-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From 4bc32176e261712428bd91475ec9a4da500a582d Mon Sep 17 00:00:00 2001
+From 76935253a4bfcc967fde6cc7d3e034f537c6160d 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
@@ -32,5 +32,5 @@ index ac8dc5f2f..39ed0d533 100644
  
                              entityhorseskeleton.p(true);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 99%
rename from Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 466555a9c6..d3b68513b2 100644
--- a/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 22e1661666d7e149b0fddf9a6f45cad52af4b917 Mon Sep 17 00:00:00 2001
+From a76eee72a3134e780d7e75a0705c1db66c5e21e4 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 1d2d174e8..9427fc080 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0090-Fix-cooked-fish-legacy-import.patch
similarity index 93%
rename from Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0090-Fix-cooked-fish-legacy-import.patch
index e0154dcc50..c7e5591be4 100644
--- a/Spigot-Server-Patches/0091-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0090-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From c4390170763cc895adafa3fd63614c0423b6a761 Mon Sep 17 00:00:00 2001
+From 0dcc62d3626178628c8a2f9e1c55a7a1d6e97ab7 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 87b82eb35..a7c71f406 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0091-Access-items-by-EquipmentSlot.patch
similarity index 96%
rename from Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0091-Access-items-by-EquipmentSlot.patch
index 4c55a3172f..80d3336bab 100644
--- a/Spigot-Server-Patches/0092-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0091-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From 52393541b308a635b69f891b01eb41c1776e8f07 Mon Sep 17 00:00:00 2001
+From 9a9ff76273935fe0116ddb2fd757452542354c51 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 67c54899d..3f58c34e0 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0092-Check-async-remove-unused-vars-GH-159.patch
similarity index 95%
rename from Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0092-Check-async-remove-unused-vars-GH-159.patch
index 16bff70638..fe5c7ccbb9 100644
--- a/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0092-Check-async-remove-unused-vars-GH-159.patch
@@ -1,4 +1,4 @@
-From 931dd1b6fbddd6576e436007a749078ceae64f1a Mon Sep 17 00:00:00 2001
+From 5d65ae660c3bc6c62f38dc327121df456f8b9e32 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 c79fb7d57..8749a1879 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 98%
rename from Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 1e0fd7ebe4..e780e9b3b3 100644
--- a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From c80433172ca35367589f748c6ac3a0270f33b8f3 Mon Sep 17 00:00:00 2001
+From fb9b6e2de28107a733bfc5b55b4d446e115027fd 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
@@ -67,5 +67,5 @@ index 39ed0d533..f969d2a72 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0094-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 92%
rename from Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0094-Entity-AddTo-RemoveFrom-World-Events.patch
index 7690888efe..249699e62f 100644
--- a/Spigot-Server-Patches/0095-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0094-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From e87ca8c0409093b76e27c0077e2b3a86c26e045b Mon Sep 17 00:00:00 2001
+From 92c341a06e29d044aae2b75fa6b940613ab4744f 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 8cbdbda92..f86c64cb2 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0095-Configurable-Chunk-Inhabited-Timer.patch
similarity index 94%
rename from Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0095-Configurable-Chunk-Inhabited-Timer.patch
index d8eaf22d1a..df5d12d77f 100644
--- a/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0095-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 2f4d4c62f46ec42fef570d76224b5e12257eb95b Mon Sep 17 00:00:00 2001
+From 49abb603029c245c5d3946c3a941437ceeae0c3c 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 736fa1f62..61d34fc37 100644
  
      public void c(long i) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0097-EntityPathfindEvent.patch b/Spigot-Server-Patches/0096-EntityPathfindEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0097-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0096-EntityPathfindEvent.patch
index dc1e483d49..7d41201621 100644
--- a/Spigot-Server-Patches/0097-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0096-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 45f66cc197d1dcd2090286f05210c9acef78ca40 Mon Sep 17 00:00:00 2001
+From 8b31a83fcf313a58a3d2657eb4a618fe27452a35 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 43b2be505..c0ef2400b 100644
                  float f = this.h();
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index 928b555b1b..d0adde3580 100644
--- a/Spigot-Server-Patches/0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From 063a6b2a26bfabac382e663575b0a98e517346d9 Mon Sep 17 00:00:00 2001
+From 58e7452d99c66366f890d624f3ee8315fe87eb8c 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 0a2823686..8eba70b01 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0098-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 94%
rename from Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0098-Reduce-IO-ops-opening-a-new-region-file.patch
index 18ee6f8d42..0e9e804207 100644
--- a/Spigot-Server-Patches/0099-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0098-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,11 +1,11 @@
-From 5fd361c508284348b1fe96835571b9d871da0ddc Mon Sep 17 00:00:00 2001
+From 4e9603ee0e06578012952c18fe907aff009b583c Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
 
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 9cfc46bc2..637e5baaf 100644
+index ed840dbc9..4008a2143 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -8,9 +8,12 @@ import java.io.ByteArrayInputStream;
@@ -49,5 +49,5 @@ index 9cfc46bc2..637e5baaf 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0099-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0099-Sanitise-RegionFileCache-and-make-configurable.patch
index 61f928c687..05510d35eb 100644
--- a/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0099-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From 61c14766f4cf6eb0ac45cfcd60aae9fdcba217e8 Mon Sep 17 00:00:00 2001
+From e9bec1384df97f7d694ebfa1dad07e0ae0e3faab 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.
@@ -25,7 +25,7 @@ index 6907d4680..c3ff47e00 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 19fbf9b4a..ad00c39ce 100644
+index 02b9bc8df..91b55074e 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -8,10 +8,12 @@ import java.io.File;
@@ -40,9 +40,9 @@ index 19fbf9b4a..ad00c39ce 100644
 -    public static final Map<File, RegionFile> a = Maps.newHashMap(); // Spigot - private -> public
 +    public static final Map<File, RegionFile> a = new LinkedHashMap(PaperConfig.regionFileCacheSize, 0.75f, true); // Spigot - private -> public, Paper - HashMap -> LinkedHashMap
  
-     // Paper start
      public static synchronized RegionFile a(File file, int i, int j) {
-@@ -32,8 +34,8 @@ public class RegionFileCache {
+         File file1 = new File(file, "region");
+@@ -25,8 +27,8 @@ public class RegionFileCache {
                  file1.mkdirs();
              }
  
@@ -53,7 +53,7 @@ index 19fbf9b4a..ad00c39ce 100644
              }
  
              RegionFile regionfile1 = new RegionFile(file2);
-@@ -64,6 +66,22 @@ public class RegionFileCache {
+@@ -57,6 +59,22 @@ public class RegionFileCache {
          }
      }
  
@@ -77,5 +77,5 @@ index 19fbf9b4a..ad00c39ce 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0101-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0100-Use-Optimized-Collections.patch
similarity index 95%
rename from Spigot-Server-Patches/0101-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0100-Use-Optimized-Collections.patch
index 793086bf92..44fc35b3bb 100644
--- a/Spigot-Server-Patches/0101-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0100-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 0d5d2097b72aa92d7199dd4b84adc080cb9df775 Mon Sep 17 00:00:00 2001
+From bf55746ae8469ec426c19372f7fd267fc13b976e 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 a7e8a3f7d..54b454fe3 100644
+index b49f4e292..dd37bec73 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -24,7 +24,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
@@ -47,5 +47,5 @@ index 419add5db..820c15278 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0101-Do-not-load-chunks-for-light-checks.patch
similarity index 92%
rename from Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0101-Do-not-load-chunks-for-light-checks.patch
index c4db3b2789..0adcf8eaa8 100644
--- a/Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0101-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 22757113dc8d4014c7fe8ef4fb3d8a734fddf9fe Mon Sep 17 00:00:00 2001
+From 0528c8e87adbb3e0ca9714a8c7cdada59d34319a 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 f86c64cb2..7e6459654 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0102-Add-PlayerUseUnknownEntityEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0102-Add-PlayerUseUnknownEntityEvent.patch
index 4813c52b9d..a126211f05 100644
--- a/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0102-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From a143c953207c29ed4c31626f8a19e2aaa5ef72c0 Mon Sep 17 00:00:00 2001
+From ce229663241dcac2571047f5a1c9af02acd3c1c3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -39,5 +39,5 @@ index b67837dd2..840448995 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0103-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 90%
rename from Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0103-Fix-reducedDebugInfo-not-initialized-on-client.patch
index bf318a6fe6..4c32cb1f8c 100644
--- a/Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0103-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From a93413a68948fca1c6565e2998d21c76031a7f04 Mon Sep 17 00:00:00 2001
+From 797ffb13230f48f427a2a5e354dce5cc853ae481 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d6a2bbc08..b8d48b45c 100644
+index 59c7e78b8..e303b45f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -154,6 +154,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index d6a2bbc08..b8d48b45c 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0104-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0104-Configurable-Grass-Spread-Tick-Rate.patch
index 2928d83bd5..38541c1730 100644
--- a/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0104-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From 2239e93f9ca22ddb356ed4ee329aae51355d6a5d Mon Sep 17 00:00:00 2001
+From 408594ec2da3c56bb04e5789c7fb2ccaa85dd7c2 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 8b43e6070..5cbc95f7c 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.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 98%
rename from Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index b323cea537..bcb8bf2f4f 100644
--- a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 02aceb5c58c3c99427fbc68765cf7ce5340d477d Mon Sep 17 00:00:00 2001
+From f825c7818bd1558c1371f174a954545f6959d539 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
@@ -83,5 +83,5 @@ index f65611a6a..9965235ab 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 91%
rename from Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index ffad2997ae..87376f9ffe 100644
--- a/Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,4 +1,4 @@
-From a22863594140aa2beb47672cc81f2eeca3a4424c Mon Sep 17 00:00:00 2001
+From a5d5dda4e43b4daafab005b8cf63e5eb148ebd56 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 dba3fb167..44108ab9a 100644
          this.a(blockposition.east(), block, blockposition);
          this.a(blockposition.down(), block, blockposition);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 93%
rename from Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 65a3174398..be3cddf75c 100644
--- a/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From b45bff5ab25d652697981a8e08b69d4d52edf888 Mon Sep 17 00:00:00 2001
+From 76d4bbc0f57b08ce52b6d3a4f3da9c7dc720c6e4 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
@@ -29,5 +29,5 @@ index a27512c0f..4691b3d8f 100644
      }
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0108-Remove-Debug-checks-from-DataBits.patch
similarity index 95%
rename from Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0108-Remove-Debug-checks-from-DataBits.patch
index 25599d4a18..6dad35ca53 100644
--- a/Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0108-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From 09e2228c9837b20fdc95318fbe4e2a2d8a396f57 Mon Sep 17 00:00:00 2001
+From bc6666b8fea7c026847ea036395301569eae5fa2 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 f3a6799a8..fa0fd8a9c 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 97%
rename from Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 201587187b..64619cd9e0 100644
--- a/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 961fafdaceab970599d69a51dd78cb93a0d93a25 Mon Sep 17 00:00:00 2001
+From c9d7dd9e35bd8ad3ec1b3ced918e0fdb1dae60b3 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
@@ -51,5 +51,5 @@ index 840448995..dfbae01f4 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch
index efbb98a3c9..3296b0bd10 100644
--- a/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 5fa0344f756b199b838d8addb7e3f50efe5a4f91 Mon Sep 17 00:00:00 2001
+From e5988d5b1cd40ac1a8b4fa2868e5214516b99c73 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 80a6a0b41..5f6b182d6 100644
+index 0a9e8b9cd..8e06c2140 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -589,6 +589,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index 80a6a0b41..5f6b182d6 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0111-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0111-Remove-unused-World-Tile-Entity-List.patch
index c3873355a9..308096a20f 100644
--- a/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0111-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From dcfc848c896f88a21c47d10b8e5914bdeeda4321 Mon Sep 17 00:00:00 2001
+From 0ee8a42416c06bb0ac9c29ab71474a8f97e0006f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -67,5 +67,5 @@ index 9bc8ce64c..2f4728b0d 100644
              }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0112-Don-t-tick-Skulls-unused-code.patch
similarity index 90%
rename from Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0112-Don-t-tick-Skulls-unused-code.patch
index c0064af2b3..8bfabdb113 100644
--- a/Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0112-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From 421db0871b70be8fbcee14ef32188a132e5e12d2 Mon Sep 17 00:00:00 2001
+From 6f8419e69afc9f0873ee2f8d073fa6aee9c9ff7b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
@@ -18,5 +18,5 @@ index edd6fb69e..380373c0e 100644
      private int a;
      public int rotation;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0113-Configurable-Player-Collision.patch
similarity index 99%
rename from Spigot-Server-Patches/0114-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0113-Configurable-Player-Collision.patch
index c8b37aa397..f5eff894ca 100644
--- a/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0113-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From 6e0a59b05544ff285c2775c54e01c0a5b08c8371 Mon Sep 17 00:00:00 2001
+From 5c7d4a23609617b8822fa851a9550b15a8bcf6ee 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/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 97%
rename from Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 9197eaab21..2d13371699 100644
--- a/Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 3112e052aea6a52a5959ddef046c307f09443bbd Mon Sep 17 00:00:00 2001
+From 5b040a6ee5d97a584ea1875d45f251066eb51e79 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -45,5 +45,5 @@ index a46df4b7f..f02263c34 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0115-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 93%
rename from Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0115-Water-mobs-should-only-spawn-in-the-water.patch
index ba2f7fa0bc..8f48e60239 100644
--- a/Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0115-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From b5d0b73e9f5dc13affbd3c6fa857fe45deeaaa19 Mon Sep 17 00:00:00 2001
+From adfe939e1377279c32fe68488f5285302613c9ba Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
@@ -26,5 +26,5 @@ index 90d33af95..251555713 100644
  
      public boolean canSpawn() {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 97%
rename from Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index 3edcec5827..f97633e425 100644
--- a/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From 0e4f44dde4037101a88ba017da160589dbf53b9e Mon Sep 17 00:00:00 2001
+From ce270a9774afd4425f09187b3dae122dab3a8943 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -56,5 +56,5 @@ index 8749a1879..29d4c0866 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0117-Configurable-RCON-IP-address.patch
similarity index 92%
rename from Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0117-Configurable-RCON-IP-address.patch
index 527777a6f9..13d59c3dab 100644
--- a/Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0117-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 3cc6bf088a830f76ece5e6bb0c607c16278258cc Mon Sep 17 00:00:00 2001
+From 82d1f04f8a674ab31b52e27e1987cd1785acf94d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -19,5 +19,5 @@ index a6a0d5a29..efcafe77f 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0118-Prevent-Fire-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0118-Prevent-Fire-from-loading-chunks.patch
index a41984480c..d34de7efb8 100644
--- a/Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0118-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 73b1b9d098df385f6eaad2694a09d0ad1b967c06 Mon Sep 17 00:00:00 2001
+From 0cf6a91a4ecb498d0867e197dbffb42a5280a096 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
@@ -47,5 +47,5 @@ index 94cb9d462..dfc328850 100644
  
              return i;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch
index 57d0b4d59c..2afa48d599 100644
--- a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 230b15e3cf0ecccba8688946cc029fd5d3a4a54d Mon Sep 17 00:00:00 2001
+From facac094d3f1909ca5c2d0100b0f343591690b5c 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/0121-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0120-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0120-EntityRegainHealthEvent-isFastRegen-API.patch
index a9ea4cd806..7d44f74edf 100644
--- a/Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0120-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From aef8810f99eda6a4fd16bb1dfdb0b03100e36362 Mon Sep 17 00:00:00 2001
+From 0be7d9227878e2d4b44885aa146bdbd64bda3fc5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -41,5 +41,5 @@ index b6e978668..8d95d148f 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0121-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 96%
rename from Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0121-Add-ability-to-configure-frosted_ice-properties.patch
index 2276492ac2..014762288f 100644
--- a/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0121-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 4166ec0c617ad78d508f015a1d4da5199641c20f Mon Sep 17 00:00:00 2001
+From 6a3db8a7752bb7e49c4577771c3b92c763c0e159 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
@@ -44,5 +44,5 @@ index 73855826e..f079c3389 100644
  
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0122-Vehicle-Event-Cancellation-Changes.patch
similarity index 96%
rename from Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0122-Vehicle-Event-Cancellation-Changes.patch
index fe509deea6..15ad6b94d2 100644
--- a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0122-Vehicle-Event-Cancellation-Changes.patch
@@ -1,4 +1,4 @@
-From 49d999a37165c4441c7479b021a7768a2f2d0c31 Mon Sep 17 00:00:00 2001
+From 293a7018d32c2e0e9aaf9eb4080530122a83d5fa 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
@@ -41,5 +41,5 @@ index 8908d8b8d..0f4a1b66b 100644
              entity.j = 60;
          }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 97%
rename from Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to Spigot-Server-Patches/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index 06e8b1b88a..6413e2f607 100644
--- a/Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,4 +1,4 @@
-From fbebca9bf7a3e0aa8517e1009a3336ab8246e77c Mon Sep 17 00:00:00 2001
+From 043c470686058669deac012958193f1bddfa2a10 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
@@ -51,5 +51,5 @@ index 528005446..b0d03e408 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0124-Improve-Minecraft-Hopper-Performance.patch
similarity index 98%
rename from Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch
rename to Spigot-Server-Patches/0124-Improve-Minecraft-Hopper-Performance.patch
index 178841c220..38e4153791 100644
--- a/Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0124-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From 3d13d3f46d166118a68be71adde74e57d7cb1d0f Mon Sep 17 00:00:00 2001
+From bf25b8717b9a888b98fe9542ac860429350c61bb 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
@@ -86,5 +86,5 @@ index 6acce15e7..44b6ecc5d 100644
          return this.f > 0;
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0125-remove-null-possibility-for-getServer-singleton.patch
similarity index 95%
rename from Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0125-remove-null-possibility-for-getServer-singleton.patch
index c661ce95e5..f34b62446b 100644
--- a/Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0125-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 062ba076f982db42212697357f485aa5d920df0a Mon Sep 17 00:00:00 2001
+From 13ae7fd9680c4c26bfb24bc38f5372dab2c0f303 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
@@ -35,5 +35,5 @@ index 430168d21..83b62da55 100644
      // CraftBukkit end
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0126-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 98%
rename from Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0126-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index ed4b9fff2d..19c3943e2d 100644
--- a/Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0126-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 014e66039c805fb82717b0f6fe7c6b8d30f3699a Mon Sep 17 00:00:00 2001
+From 7c6cdf790cf13759abac08cc78be4f7e82689711 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
@@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644
  
      public RenderData() {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0127-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0127-LootTable-API-Replenishable-Lootables-Feature.patch
index 711c5c35fc..24617487a0 100644
--- a/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0127-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 7d61f1ae6c1042b230ece85761341c36ce482e6d Mon Sep 17 00:00:00 2001
+From bfc069f2e9f925c0f10d95b9cdbdd33ea8a3f8f7 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
@@ -782,5 +782,5 @@ index e9963e21c..acb4dee04 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0128-Do-not-load-chunks-for-pathfinding.patch
similarity index 90%
rename from Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0128-Do-not-load-chunks-for-pathfinding.patch
index d9deb4a10f..cebfc41856 100644
--- a/Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0128-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From bd0317665aa18996d5e315cf993f1ee8c705efc8 Mon Sep 17 00:00:00 2001
+From 0e544cd8d1e8174c68a97013f8898d58741d0340 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index 08b986fd7..786d1dd22 100644
          }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0129-Entity-Tracking-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0129-Entity-Tracking-Improvements.patch
index 1389f2d469..349a9c13ad 100644
--- a/Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0129-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From dfc386797ff567e4f4c54a63e24ddb8240df07d7 Mon Sep 17 00:00:00 2001
+From d0d65d40d665bd4857968bce815a16b73fb71992 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
@@ -99,5 +99,5 @@ index fbda70a39..c28b4bd44 100644
  
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0130-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 95%
rename from Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0130-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 91db886b86..5386a82010 100644
--- a/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0130-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,4 +1,4 @@
-From c08c205ecb62164eb4e00f5356319ced19481ab3 Mon Sep 17 00:00:00 2001
+From 0886e9d5e5edb0b883647a0ac6b83aa38b602b29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
@@ -31,5 +31,5 @@ index 230004b4a..62752f816 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0131-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0131-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index c1b64592a8..6d69b6cde3 100644
--- a/Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0131-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From 540962bdce2796a369838635bbb1f15eafeb414c Mon Sep 17 00:00:00 2001
+From b45938c5752cc909b6cb49cef6768cda18a5788c 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
@@ -44,5 +44,5 @@ index a6cf1d83d..3db29161d 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0132-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 93%
rename from Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0132-Fix-Chunk-Unload-Queue-Issues.patch
index e69374207b..c67db5d1ac 100644
--- a/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0132-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 9e02e7677c27c8b05f69b00620f98b3f6a583e31 Mon Sep 17 00:00:00 2001
+From 2f0e1a92eb0215f3ea7481cc54eeaf6b8ba23cac 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
@@ -22,7 +22,7 @@ index 3db29161d..98f2cff15 100644
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 54b454fe3..57ae50d2e 100644
+index dd37bec73..eb3225ef2 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -299,6 +299,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -34,5 +34,5 @@ index 54b454fe3..57ae50d2e 100644
                              continue;
                          }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0133-System-property-for-disabling-watchdoge.patch
similarity index 92%
rename from Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0133-System-property-for-disabling-watchdoge.patch
index ae5f115c6a..0b88f39dc8 100644
--- a/Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0133-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From 922d126f9e81684c5ca795fbbf67a7c38aaf1c18 Mon Sep 17 00:00:00 2001
+From 16152841f16f55980d1d9ed723c60c33832f64c0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@@ -18,5 +18,5 @@ index 6384d50e7..cb1fcf0f4 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0135-Optimize-EAR.patch b/Spigot-Server-Patches/0134-Optimize-EAR.patch
similarity index 96%
rename from Spigot-Server-Patches/0135-Optimize-EAR.patch
rename to Spigot-Server-Patches/0134-Optimize-EAR.patch
index e1e4c93b19..654afa58e1 100644
--- a/Spigot-Server-Patches/0135-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0134-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 1dc6b412b3e0bed7ef8c58885a37931bd3467f06 Mon Sep 17 00:00:00 2001
+From a5d200f5f9ac0a6be1c90e383adeadc8b151e34a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
@@ -65,5 +65,5 @@ index c411ce886..c8a6ff3d4 100644
                  }
              }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0135-Optimize-UserCache-Thread-Safe.patch
similarity index 97%
rename from Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0135-Optimize-UserCache-Thread-Safe.patch
index df0e2f3bd8..9097c497ae 100644
--- a/Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0135-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From 9541bcf765a36a89596125b143980a9565b96454 Mon Sep 17 00:00:00 2001
+From f8298bd0e0b7b50c1e71d97df928320f537323e6 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
@@ -96,5 +96,5 @@ index ccfc755d2..989758cdf 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch
index 07c5715db9..2318b30dd6 100644
--- a/Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 65e18c08092da1309dc93d0853d3e80e10395ea8 Mon Sep 17 00:00:00 2001
+From fe563a5eab9483cb69f2b7bfc2c750fafe263b50 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
@@ -43,5 +43,5 @@ index 6a71ebbd2..faf7b60af 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0137-Optional-old-TNT-cannon-behaviors.patch
similarity index 99%
rename from Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch
rename to Spigot-Server-Patches/0137-Optional-old-TNT-cannon-behaviors.patch
index 62440326fa..1c9579533b 100644
--- a/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0137-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From 82e8f7a4a44e9c66dfc85f545c4ce71cf719c1b8 Mon Sep 17 00:00:00 2001
+From 4570a07bfc85628581dfb4338637c0264f34df85 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
@@ -389,5 +389,5 @@ index d7bc6a0ed..f2785d86c 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0138-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 95%
rename from Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0138-Faster-redstone-torch-rapid-clock-removal.patch
index e35c4bffcb..305a5a21cf 100644
--- a/Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0138-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 8529869d620ac19136bca541423009322e9f3e3a Mon Sep 17 00:00:00 2001
+From ae790beb03eba954c38947720990f2f273b1d4e0 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
@@ -39,5 +39,5 @@ index 741236289..25a2a5d36 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0139-Ensure-Chunks-never-ever-load-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0139-Ensure-Chunks-never-ever-load-async.patch
index 00733f4564..31e23a2f55 100644
--- a/Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0139-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 0f1b139badcecfe47ada01bf5a643f6691154341 Mon Sep 17 00:00:00 2001
+From 7dacb06906b8a49f5fff6ac5d3e13f44e0921a4b 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
@@ -42,5 +42,5 @@ index b5efb9c3f..ef9529add 100644
              return;
          }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0141-Add-server-name-parameter.patch b/Spigot-Server-Patches/0140-Add-server-name-parameter.patch
similarity index 92%
rename from Spigot-Server-Patches/0141-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0140-Add-server-name-parameter.patch
index 2da74da40a..fcf79c9900 100644
--- a/Spigot-Server-Patches/0141-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0140-Add-server-name-parameter.patch
@@ -1,4 +1,4 @@
-From b2f2babfb133493364ec75644bc1952350434355 Mon Sep 17 00:00:00 2001
+From c325795fa35577349654d913c5be60aeddd6e6b4 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
@@ -24,5 +24,5 @@ index 4399faf69..59d4e2e6f 100644
          };
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0141-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0141-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index efbfb96c24..a646c2821f 100644
--- a/Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0141-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From c2807401573c8f0758a9ce02696466bc911439c2 Mon Sep 17 00:00:00 2001
+From 309f96980dba21738a6b1d9d802bc2c9f67301b4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -44,5 +44,5 @@ index 9af34ba60..031507574 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0142-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 98%
rename from Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0142-Fix-FallingBlocks-being-stuck-on-fences.patch
index ae258a96df..0d6f9e3dd3 100644
--- a/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0142-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From 33ecb4b8cf5348bc04ebf70d86f3d0a82c06c00a Mon Sep 17 00:00:00 2001
+From a57b2a20bfc3edce691470ca6def1e166dc6cfa4 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
@@ -102,5 +102,5 @@ index bb01929e8..8059e6dcd 100644
          Block block = this.block.getBlock();
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0143-Make-entities-look-for-hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0143-Make-entities-look-for-hoppers.patch
index 99d810654c..125875ed30 100644
--- a/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0143-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From 93a2af841f6352063d22593927b334434bae3383 Mon Sep 17 00:00:00 2001
+From 5e24b91319bb930c470e28e5751d7f9b758fe063 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
@@ -378,5 +378,5 @@ index 44b6ecc5d..022e64520 100644
  
              if (!list.isEmpty()) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0144-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 98%
rename from Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0144-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index e5cf53bf95..6faf012e78 100644
--- a/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0144-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 47bc97578256db7c8dc522c0810655ebc94b512a Mon Sep 17 00:00:00 2001
+From 42eb9c7ff29419933afefaaa21c757752b817666 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
@@ -47,7 +47,7 @@ index 98f2cff15..88437d77a 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 57ae50d2e..0a8e09e5e 100644
+index eb3225ef2..81b9bb884 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -315,6 +315,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -140,5 +140,5 @@ index 9965235ab..3f8859a1f 100644
              }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0145-Toggleable-Elytra-Wall-Damage.patch
similarity index 96%
rename from Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0145-Toggleable-Elytra-Wall-Damage.patch
index be17bab921..ecdf42102c 100644
--- a/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0145-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From bc29002b6c5ff86ac128aee61f9e8d08c20eeeb5 Mon Sep 17 00:00:00 2001
+From dcfa2ba7251ae9627d3dda488cbdf7e3cc31892e 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
@@ -41,5 +41,5 @@ index ec901150d..b8ac99e5d 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0146-Fix-Double-World-Add-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0146-Fix-Double-World-Add-issues.patch
index 5501f4edb3..a77b14b155 100644
--- a/Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0146-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From df9b45642a0350faf91c0100855ee2d22435f4ce Mon Sep 17 00:00:00 2001
+From 54c81de7d1b0aa3d7741b255d4fda4f562d20c8a 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/0148-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0147-Fix-Old-Sign-Conversion.patch
similarity index 98%
rename from Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0147-Fix-Old-Sign-Conversion.patch
index ac751f8a5f..e1c05a0160 100644
--- a/Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0147-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From b186fced2094d441de37e5b76a68e2b8dd8f0bda Mon Sep 17 00:00:00 2001
+From 0ae70ecc0b9df6e3dfedfaa196ff7d1484f59294 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -67,5 +67,5 @@ index 34ade146c..242552c36 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0148-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 92%
rename from Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0148-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 650466cb0b..6d6b6cb12a 100644
--- a/Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0148-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From 9c9779271b3982365fb2e2cd4c779dc8f918ab04 Mon Sep 17 00:00:00 2001
+From 8596066290cfcde927c9d9f5b49898b3788e6f3e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
@@ -18,5 +18,5 @@ index 989758cdf..1c619c596 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0149-More-informative-vehicle-moved-wrongly-message.patch
similarity index 92%
rename from Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0149-More-informative-vehicle-moved-wrongly-message.patch
index f720c1aea9..eb3786568a 100644
--- a/Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0149-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,4 +1,4 @@
-From 8fa14bdc0cab3b0e51f4255fb748ba1a5305cf13 Mon Sep 17 00:00:00 2001
+From 6d446eaa300db8b349d0c5813e6bf2758beb8816 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
@@ -18,5 +18,5 @@ index dfbae01f4..4b79031f0 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0150-Re-track-players-that-dismount-from-other-players.patch
similarity index 94%
rename from Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0150-Re-track-players-that-dismount-from-other-players.patch
index ed5eb22756..0cee8d1517 100644
--- a/Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0150-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From 44ea66d13039d7c00b6fb87a41a187ba42690249 Mon Sep 17 00:00:00 2001
+From db3336329ce3d39657824be9a6af3f84b4123532 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/0152-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0151-Add-setting-for-proxy-online-mode-status.patch
similarity index 97%
rename from Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0151-Add-setting-for-proxy-online-mode-status.patch
index 3a4bd2be25..ac0ecea9c3 100644
--- a/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0151-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From cdcf33ebe123e94c1e5a9882232d064285482ab0 Mon Sep 17 00:00:00 2001
+From a9a7d486128aa9801cbc4733db287bd1dadb961f 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
@@ -47,5 +47,5 @@ index a958ce998..8ade16865 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0152-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 96%
rename from Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0152-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 80ac491d47..234464447e 100644
--- a/Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0152-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From 7293031a9dea2d01c59bc139f80b4a4f50b6c083 Mon Sep 17 00:00:00 2001
+From 451df5c9f607c0f8f087b70c06ec5736521cf7b6 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
@@ -58,5 +58,5 @@ index 288c52c55..66c459d83 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0153-Disable-ticking-of-snow-blocks.patch
similarity index 93%
rename from Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0153-Disable-ticking-of-snow-blocks.patch
index 1e93d97703..35bcecdf5f 100644
--- a/Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0153-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From a9215f422226e93bd492641c5ae02bb3b9fa0d10 Mon Sep 17 00:00:00 2001
+From b1c66cf190817911beb2855fba6f91504dc805ef 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
@@ -34,5 +34,5 @@ index 8123d7295..b6765e5bc 100644
 +    //Paper end
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0154-Fix-AIOOBE-in-inventory-handling.patch
similarity index 92%
rename from Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0154-Fix-AIOOBE-in-inventory-handling.patch
index 8325c597c4..f5b59c4d9b 100644
--- a/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0154-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,4 +1,4 @@
-From 7f2c080841b1462ac6e08fbd788aade8f8b4c23c Mon Sep 17 00:00:00 2001
+From aeab5af95f6f6914dab1a5752c42c8e387113e62 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
@@ -18,5 +18,5 @@ index 4b79031f0..060434f32 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0155-Configurable-packet-in-spam-threshold.patch
similarity index 96%
rename from Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0155-Configurable-packet-in-spam-threshold.patch
index 036c8eb0f5..f8f6bad143 100644
--- a/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0155-Configurable-packet-in-spam-threshold.patch
@@ -1,4 +1,4 @@
-From 00dd9ebe392fba212ccd1dcae0f5585f65e9249b Mon Sep 17 00:00:00 2001
+From 866083bdb8aff3ba41f93b93486c5150d86bb6bf 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
@@ -44,5 +44,5 @@ index 060434f32..6281fe4d5 100644
              limitedPackets = 0;
              return true;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0156-Configurable-flying-kick-messages.patch
similarity index 96%
rename from Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0156-Configurable-flying-kick-messages.patch
index 3b4170c613..291f24eda7 100644
--- a/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0156-Configurable-flying-kick-messages.patch
@@ -1,4 +1,4 @@
-From 88776c9c8191cc75cb70d2239b19bcd53ea8445f Mon Sep 17 00:00:00 2001
+From 9f4d0c83940ae2666504ab4a5625b894be1d162a 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
@@ -43,5 +43,5 @@ index 6281fe4d5..51d27351d 100644
                  }
              } else {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0157-Auto-Save-Improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0158-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0157-Auto-Save-Improvements.patch
index 2e2fe6051c..0c670e551c 100644
--- a/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0157-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 4978f444ee1bb732f34447349281f25b8f470a13 Mon Sep 17 00:00:00 2001
+From f2eb7e545edd482486bfd002608f6b2b12d44d78 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/0159-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0158-Chunk-registration-fixes.patch
similarity index 92%
rename from Spigot-Server-Patches/0159-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0158-Chunk-registration-fixes.patch
index 764bbcfb34..21c5628bcf 100644
--- a/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0158-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 65b94463de969e5f6657dd234d06e25f328a60c0 Mon Sep 17 00:00:00 2001
+From 08b118ed5d51e80df7a701c4e11e5ed101207af7 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
@@ -21,5 +21,5 @@ index 7900fca57..ec0a28cff 100644
  
              if (!entity.aa || entity.ab != k || entity.ac != l || entity.ad != i1) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0159-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 91%
rename from Spigot-Server-Patches/0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0159-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index be1521f5df..8d086b5d38 100644
--- a/Spigot-Server-Patches/0160-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0159-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From 7c28aed99b9afe7c37d5f9f0b70013dffb1c8a2b Mon Sep 17 00:00:00 2001
+From 0277b11a48f2d4779dd56452aef42aa40783cc43 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
@@ -26,5 +26,5 @@ index ecfc316bb..3f909c174 100644
      public LivingEntity _INVALID_getShooter() {
          return (LivingEntity) getShooter();
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0161-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0160-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 92%
rename from Spigot-Server-Patches/0161-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0160-Auto-fix-bad-Y-levels-on-player-login.patch
index eaf3adca37..e3ab9eed6a 100644
--- a/Spigot-Server-Patches/0161-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0160-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From d90efd20600735e017db928e235bde3740181dab Mon Sep 17 00:00:00 2001
+From e83fee4c7a5c51bb48c0ae699d12de348ae8589c 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/0162-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0161-Raise-string-limit-for-packet-serialization.patch
similarity index 93%
rename from Spigot-Server-Patches/0162-Raise-string-limit-for-packet-serialization.patch
rename to Spigot-Server-Patches/0161-Raise-string-limit-for-packet-serialization.patch
index d630fa5c1f..39138523f5 100644
--- a/Spigot-Server-Patches/0162-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0161-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From 392921840f177c1ab77c0ef174c08e1259ac174c Mon Sep 17 00:00:00 2001
+From cfc4ef10920340b7a0d02dc201354ac16d37f0a2 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
@@ -23,5 +23,5 @@ index 7a6619595..68e8c4671 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0163-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0162-Disable-Vanilla-Chunk-GC.patch
similarity index 94%
rename from Spigot-Server-Patches/0163-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0162-Disable-Vanilla-Chunk-GC.patch
index 00b91bfee5..d8ce8e3dd0 100644
--- a/Spigot-Server-Patches/0163-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0162-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From e4a3829e997f8eed10c0d7be3796031c3789aef2 Mon Sep 17 00:00:00 2001
+From 0a4cad3330e7c5b0b4b157b4a143a809b9cd4cca 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
@@ -29,5 +29,5 @@ index cc0e8d2c8..7a6d11f20 100644
          }
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0163-Option-to-remove-corrupt-tile-entities.patch
similarity index 95%
rename from Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0163-Option-to-remove-corrupt-tile-entities.patch
index 7707280fb1..41816497e2 100644
--- a/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0163-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From b51be29b2da1afbb7de35723ba0dad769edee720 Mon Sep 17 00:00:00 2001
+From c7e769e167626264f0fbc8a15080adcae1c4765e 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
@@ -41,5 +41,5 @@ index 9f7f32dc2..d850dbfc3 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0165-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0164-Add-EntityZapEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0165-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0164-Add-EntityZapEvent.patch
index 8ba04db23f..4c2297020c 100644
--- a/Spigot-Server-Patches/0165-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0164-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From 1eeb3eb2836dad8e57a9c72fc70284fad2856e0e Mon Sep 17 00:00:00 2001
+From dd9888bc9fafe9ec3bb38dc92d335f9f045ead78 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -67,5 +67,5 @@ index 95b12331e..4d252aa47 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0165-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 95%
rename from Spigot-Server-Patches/0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0165-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 313ea5d400..a36549ef22 100644
--- a/Spigot-Server-Patches/0166-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0165-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From a8c1693f11909a132dbe93641df6029626f45b08 Mon Sep 17 00:00:00 2001
+From d766004f07f7cb887283db77e0adc5ca4307c7b5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -32,5 +32,5 @@ index 9c4d1c938..dd1c1a39b 100644
                      if (block == this) {
                          if (this.e(world, blockposition1)) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0166-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 98%
rename from Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0166-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 698296a8f6..7bf4352f6e 100644
--- a/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0166-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From f8e15ecff289a756ab1e2cdf81ea4fbc150e4bd2 Mon Sep 17 00:00:00 2001
+From 76378e2f8f15b2354bbaeda957cd43eb6617d578 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
diff --git a/Spigot-Server-Patches/0168-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0167-Chunk-Save-Stats-Debug-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0168-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0167-Chunk-Save-Stats-Debug-Option.patch
index ffbcd8fc10..bd9288df3c 100644
--- a/Spigot-Server-Patches/0168-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0167-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From bdd1befe24e100ea6a31702f49dfbe8020bbf0cf Mon Sep 17 00:00:00 2001
+From ebb2c9fa657f2f5ed42df82a3b7ef1a5461027f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
diff --git a/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0168-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0168-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index e423936831..dec12bc5de 100644
--- a/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0168-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From b277f7f16147d91a04ac1708888225076084af68 Mon Sep 17 00:00:00 2001
+From fbcfb4bcbf57547d045729d75dac619eacc7b088 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
@@ -61,5 +61,5 @@ index 1a01a57d2..f914ad417 100644
                  entity.f(nbttagcompound1);
              }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0170-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0169-Cache-user-authenticator-threads.patch
similarity index 97%
rename from Spigot-Server-Patches/0170-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0169-Cache-user-authenticator-threads.patch
index 3e91a6f9b5..e337a7739a 100644
--- a/Spigot-Server-Patches/0170-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0169-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From 1bc16bd4b171e1b4ab7c48ebbe5c336b4f1eeae0 Mon Sep 17 00:00:00 2001
+From 08f57ad5059ec5d13942f6abd194ce96003c043a Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
@@ -63,5 +63,5 @@ index fe390feb9..350ec0323 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0171-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0170-Optimize-Network-Queue.patch
similarity index 92%
rename from Spigot-Server-Patches/0171-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0170-Optimize-Network-Queue.patch
index ef5e41e97e..c41e4677f0 100644
--- a/Spigot-Server-Patches/0171-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0170-Optimize-Network-Queue.patch
@@ -1,4 +1,4 @@
-From 65234da12571d96b72b7d55fb939a1a4b4c807d9 Mon Sep 17 00:00:00 2001
+From 50c7768c8c2458a09c65ab4034ee134336d33dc3 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
@@ -18,5 +18,5 @@ index 8134501c7..8df30e3d0 100644
      private long ab = aw();
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0172-Optimise-NetworkManager.patch b/Spigot-Server-Patches/0171-Optimise-NetworkManager.patch
similarity index 98%
rename from Spigot-Server-Patches/0172-Optimise-NetworkManager.patch
rename to Spigot-Server-Patches/0171-Optimise-NetworkManager.patch
index 2f80e680e1..05fc8a2868 100644
--- a/Spigot-Server-Patches/0172-Optimise-NetworkManager.patch
+++ b/Spigot-Server-Patches/0171-Optimise-NetworkManager.patch
@@ -1,4 +1,4 @@
-From a8811a6944cbbac091d661b2ca406b18929456bc Mon Sep 17 00:00:00 2001
+From 863b08010dbfe4e4046e553ced31acb9c2d2fde1 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 20:35:05 +0000
 Subject: [PATCH] Optimise NetworkManager
@@ -121,5 +121,5 @@ index 184ef32a8..be14c0b25 100644
  
          }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0173-Optimise-removeQueue.patch b/Spigot-Server-Patches/0172-Optimise-removeQueue.patch
similarity index 97%
rename from Spigot-Server-Patches/0173-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0172-Optimise-removeQueue.patch
index e16274e2ce..fae4b557f1 100644
--- a/Spigot-Server-Patches/0173-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0172-Optimise-removeQueue.patch
@@ -1,4 +1,4 @@
-From 8fe1d79d96efbc0d370340b62f9c9bbf85fa2bd4 Mon Sep 17 00:00:00 2001
+From e11ca040e04967c5991c13652e8d683f5d05d191 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
diff --git a/Spigot-Server-Patches/0174-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0173-Allow-Reloading-of-Command-Aliases.patch
similarity index 94%
rename from Spigot-Server-Patches/0174-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0173-Allow-Reloading-of-Command-Aliases.patch
index 0d7e053ef5..4a2ea54a79 100644
--- a/Spigot-Server-Patches/0174-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0173-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 786974fe4d33dfbcac920900a7b06e00b4ba6791 Mon Sep 17 00:00:00 2001
+From f54fafe71613988b003a239c2491d3f8c0f7e709 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -35,5 +35,5 @@ index 8ade16865..326196ce4 100644
      // Paper end
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0175-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0174-Add-source-to-PlayerExpChangeEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0175-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0174-Add-source-to-PlayerExpChangeEvent.patch
index f21802ae52..ad7453f5b1 100644
--- a/Spigot-Server-Patches/0175-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0174-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From 5dcc1c79bdd70bdae5d82c71da0de1ffcacd504f Mon Sep 17 00:00:00 2001
+From 5423a90a37ac2a7ed6e5aef52861e2d0d41c204f Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -48,5 +48,5 @@ index 4d252aa47..7e4982d93 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0176-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0175-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 90%
rename from Spigot-Server-Patches/0176-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0175-Optimize-World.isLoaded-BlockPosition-Z.patch
index 5812c5a3e8..50313c9821 100644
--- a/Spigot-Server-Patches/0176-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0175-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From c277520b112c71aaacbe585cd1b6333b5ed6bf9e Mon Sep 17 00:00:00 2001
+From 4f91a4c59c79d3e9f13ab9061515227913e5b92b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -19,5 +19,5 @@ index ec0a28cff..2fa63a27f 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0176-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 99%
rename from Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0176-Speedup-BlockPos-by-fixing-inlining.patch
index e1cbab6b6f..899acc0466 100644
--- a/Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0176-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 5a54f793b0f84d651b28c65ee6fd45937eeb290b Mon Sep 17 00:00:00 2001
+From a883117f5ebe4bf5f8179f3f2b6fb6b3e83ac45d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -177,5 +177,5 @@ index b3c1f550c..6a0b3a62d 100644
  
          public BlockPosition h() {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0178-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0177-Don-t-let-fishinghooks-use-portals.patch
similarity index 94%
rename from Spigot-Server-Patches/0178-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0177-Don-t-let-fishinghooks-use-portals.patch
index 3120e1e3ad..7fbe780ae5 100644
--- a/Spigot-Server-Patches/0178-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0177-Don-t-let-fishinghooks-use-portals.patch
@@ -1,4 +1,4 @@
-From 07f94f25a8a5c20683c36e3abfacc7f91892b779 Mon Sep 17 00:00:00 2001
+From f007be7ce27bdac76b9af0e066adcab134ce3f56 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
@@ -35,5 +35,5 @@ index 0c528c699..606160a17 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0178-Add-ProjectileCollideEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0178-Add-ProjectileCollideEvent.patch
index 04ccea1de1..3b2e548ba1 100644
--- a/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0178-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 3126a7e06fe1a789f090b648aeb41e4cd53006cb Mon Sep 17 00:00:00 2001
+From 29af77dd9cc1266a6f29936bae339983f799055c Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@@ -107,5 +107,5 @@ index 7e4982d93..a850a9634 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0179-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0179-Vanished-players-don-t-have-rights.patch
index 958e1566f4..f66dca0030 100644
--- a/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0179-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From d0f789b689a9098e7010653e23a7cfcec0a2aa37 Mon Sep 17 00:00:00 2001
+From 5b717c8de16974c9eec0185c3b003fddd49dc26a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
@@ -96,5 +96,5 @@ index a850a9634..59942d9cb 100644
          return event;
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0181-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0180-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 96%
rename from Spigot-Server-Patches/0181-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0180-Prevent-Pathfinding-out-of-World-Border.patch
index b6e02658d8..4667ab0441 100644
--- a/Spigot-Server-Patches/0181-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0180-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 42ba792fd1872a43fa70dacebb308dd7482f951d Mon Sep 17 00:00:00 2001
+From 7292ba902909ac5284a165b4fc2c422bf503486a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -39,5 +39,5 @@ index 9038d52eb..632eb1c9d 100644
      }
  
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0182-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0181-Bound-Treasure-Maps-to-World-Border.patch
similarity index 94%
rename from Spigot-Server-Patches/0182-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0181-Bound-Treasure-Maps-to-World-Border.patch
index d59a0b0e1b..93f820f634 100644
--- a/Spigot-Server-Patches/0182-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0181-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From 7318fd9b00548085fc7ed532a1541aa11916fd94 Mon Sep 17 00:00:00 2001
+From f9f30f2f2feec4b29dfe090139d5eef6fac615ec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 9c1605b1..77236760 100644
+index 9c1605b14..77236760f 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -233,6 +233,9 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -25,7 +25,7 @@ index 9c1605b1..77236760 100644
                              if (!flag1 || !world.b(l2, i3)) {
                                  return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 632eb1c9..1bb172bb 100644
+index 632eb1c9d..1bb172bbf 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -33,6 +33,18 @@ public class WorldBorder {
@@ -48,5 +48,5 @@ index 632eb1c9..1bb172bb 100644
          return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0183-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0182-Configurable-Cartographer-Treasure-Maps.patch
similarity index 94%
rename from Spigot-Server-Patches/0183-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0182-Configurable-Cartographer-Treasure-Maps.patch
index 35f1b75919..029d29890b 100644
--- a/Spigot-Server-Patches/0183-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0182-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 037a3547d5daa2d36dc0bd7f3dc1cf6958be8bed Mon Sep 17 00:00:00 2001
+From 3f73beb3e92deb8c057e8c9051d26dd342dc184b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dcf64efc..bf291680 100644
+index dcf64efcc..bf2916802 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -393,4 +393,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index dcf64efc..bf291680 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 4ad75468..ac6e2a9a 100644
+index 4ad75468c..ac6e2a9aa 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -761,7 +761,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -42,5 +42,5 @@ index 4ad75468..ac6e2a9a 100644
              if (blockposition != null) {
                  ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0184-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0183-Optimize-ItemStack.isEmpty.patch
similarity index 91%
rename from Spigot-Server-Patches/0184-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0183-Optimize-ItemStack.isEmpty.patch
index 466e443926..46ad1e891d 100644
--- a/Spigot-Server-Patches/0184-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0183-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 2f31a8392b51b3118e251416709c02fd8251bc05 Mon Sep 17 00:00:00 2001
+From b44bf1c80442b336a199ef736c5e055c6aa9a763 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 911bd879..45ebd3f6 100644
+index aca63be53..548da18e0 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -120,9 +120,15 @@ public final class ItemStack {
@@ -27,5 +27,5 @@ index 911bd879..45ebd3f6 100644
      public static void a(DataConverterManager dataconvertermanager) {
          dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0185-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0184-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 92%
rename from Spigot-Server-Patches/0185-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0184-Add-API-methods-to-control-if-armour-stands-can-move.patch
index c596123575..14a84e3063 100644
--- a/Spigot-Server-Patches/0185-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0184-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 97ba683a96e7d807faa7400a8acf3435bdd7f2a3 Mon Sep 17 00:00:00 2001
+From 4b84f76c9cb64b655951120ee73e732bcb545d00 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 96bb1100..7738ca38 100644
+index 96bb11005..7738ca385 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index 96bb1100..7738ca38 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08a..8a06cb16 100644
+index 2b66a08ad..8a06cb165 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -50,5 +50,5 @@ index 2b66a08a..8a06cb16 100644
 +    }
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0186-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 90%
rename from Spigot-Server-Patches/0186-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index adf1425488..55a45627a9 100644
--- a/Spigot-Server-Patches/0186-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From 153c50aca4dd903d388c955d0e94f48a9678dc55 Mon Sep 17 00:00:00 2001
+From 7f5079d03bd22c1497fe715871a55339268944ec Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bf291680..61efcc47 100644
+index bf2916802..61efcc479 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -403,4 +403,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index bf291680..61efcc47 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7af76e14..2028cf81 100644
+index 7af76e14c..2028cf81e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1331,6 +1331,7 @@ public abstract class World implements IBlockAccess {
@@ -31,5 +31,5 @@ index 7af76e14..2028cf81 100644
  
              for (int i = 0; i < list.size(); ++i) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0187-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0186-Add-option-to-remove-invalid-statistics.patch
similarity index 94%
rename from Spigot-Server-Patches/0187-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0186-Add-option-to-remove-invalid-statistics.patch
index 11ba7eca5c..888518a87e 100644
--- a/Spigot-Server-Patches/0187-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0186-Add-option-to-remove-invalid-statistics.patch
@@ -1,11 +1,11 @@
-From 1266f16b4aa8a1dc81aa3fcbbdabea44fc54ab1d Mon Sep 17 00:00:00 2001
+From bde76955ebf689676626f9556eb9fdcfb14a4062 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 009bf0c8..a901cd85 100644
+index 009bf0c8b..a901cd85c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -261,4 +261,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 009bf0c8..a901cd85 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 99466dbd..d1bee025 100644
+index 99466dbde..d1bee0257 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -104,6 +104,7 @@ public class ServerStatisticManager extends StatisticManager {
@@ -53,5 +53,5 @@ index 99466dbd..d1bee025 100644
          }
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0188-IllegalPacketEvent.patch b/Spigot-Server-Patches/0187-IllegalPacketEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0188-IllegalPacketEvent.patch
rename to Spigot-Server-Patches/0187-IllegalPacketEvent.patch
index 9749502ab1..bfed8f8061 100644
--- a/Spigot-Server-Patches/0188-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0187-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 296392390487981d5c0f092afa3b1cb69cd3e90c Mon Sep 17 00:00:00 2001
+From 4fc99496df25951ad23dbc3826251451b0b3648b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 51d27351..43757500 100644
+index 51d27351d..437575003 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -67,5 +67,5 @@ index 51d27351..43757500 100644
                      }
                      // CraftBukkit start
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0189-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0188-Properly-fix-item-duplication-bug.patch
similarity index 95%
rename from Spigot-Server-Patches/0189-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0188-Properly-fix-item-duplication-bug.patch
index 8562067b09..594531a444 100644
--- a/Spigot-Server-Patches/0189-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0188-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From bd8532227d23fe7a62d16e8d4695f237ad2fc408 Mon Sep 17 00:00:00 2001
+From 77f94e63e14562ee3fd6baee250aa08629d20294 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
diff --git a/Spigot-Server-Patches/0190-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0189-String-based-Action-Bar-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0190-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0189-String-based-Action-Bar-API.patch
index cdea69da14..29845d6170 100644
--- a/Spigot-Server-Patches/0190-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0189-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From cc90ff49f039ed8a4f6029ab012ebb54650af0e0 Mon Sep 17 00:00:00 2001
+From e3751676733cbb710d6a2bb4bea2352b06268c0e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 1159eea1..38359517 100644
+index 1159eea1a..38359517c 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,10 +1,13 @@
@@ -62,7 +62,7 @@ index 1159eea1..38359517 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 233903b5..a5703447 100644
+index 61c32223d..072b59125 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -165,6 +165,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -85,5 +85,5 @@ index 233903b5..a5703447 100644
          PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
          packet.header = header;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0191-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0190-Activation-Range-Improvements.patch
similarity index 95%
rename from Spigot-Server-Patches/0191-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0190-Activation-Range-Improvements.patch
index a8c8770983..8c6610ff72 100644
--- a/Spigot-Server-Patches/0191-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0190-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From c392e42cebf61a9533e604a387aa1a7fd702c613 Mon Sep 17 00:00:00 2001
+From 2fdcf26f32ce8995e73577b04c3fa62daed47b0b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index fdfe5b9e..ce390743 100644
+index fdfe5b9ed..ce3907438 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -10,6 +10,7 @@ public abstract class EntityCreature extends EntityInsentient {
@@ -18,7 +18,7 @@ index fdfe5b9e..ce390743 100644
      private float b;
      private float c;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b8ac99e5..7242da9c 100644
+index b8ac99e5d..7242da9cc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity {
@@ -31,7 +31,7 @@ index b8ac99e5..7242da9c 100644
      protected int ticksFarFromPlayer;
      protected float aW;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 13ae7a03..7e3aa6ee 100644
+index 13ae7a030..7e3aa6ee6 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -363,7 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -44,7 +44,7 @@ index 13ae7a03..7e3aa6ee 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ac6e2a9a..e6c190d4 100644
+index ac6e2a9aa..e6c190d43 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -20,7 +20,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -57,7 +57,7 @@ index ac6e2a9a..e6c190d4 100644
      Village village;
      private EntityHuman tradingPlayer;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 83d9c43f..1cb6652c 100644
+index 83d9c43f3..1cb6652c2 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@@ -73,7 +73,7 @@ index 83d9c43f..1cb6652c 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index e5b5e988..e3781f3a 100644
+index e5b5e9887..e3781f3a8 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -2,12 +2,21 @@ package net.minecraft.server;
@@ -110,7 +110,7 @@ index e5b5e988..e3781f3a 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c8a6ff3d..428912cb 100644
+index c8a6ff3d4..428912cbc 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball;
@@ -155,5 +155,5 @@ index c8a6ff3d..428912cb 100644
              {
                  EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0192-Firework-API-s.patch b/Spigot-Server-Patches/0191-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0192-Firework-API-s.patch
rename to Spigot-Server-Patches/0191-Firework-API-s.patch
index c31386a122..ca0d8523f0 100644
--- a/Spigot-Server-Patches/0192-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0191-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From efd9d25626205508f7eebb859fbbf11dd67f67d1 Mon Sep 17 00:00:00 2001
+From 77cab89358556aee79c19fc27856885bcc29174b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 572f4dea..f9cf382b 100644
+index 572f4dead..f9cf382b2 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 572f4dea..f9cf382b 100644
  
      public boolean aV() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 4fc36d24..5cd68bfa 100644
+index 4fc36d243..5cd68bfaf 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -9,6 +9,7 @@ public class ItemFireworks extends Item {
@@ -73,7 +73,7 @@ index 4fc36d24..5cd68bfa 100644
                  if (!entityhuman.abilities.canInstantlyBuild) {
                      itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 2a2f53c8..266741fc 100644
+index 2a2f53c82..266741fcd 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -103,7 +103,7 @@ public class NBTTagCompound extends NBTBase {
@@ -86,7 +86,7 @@ index 2a2f53c8..266741fc 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 99746b3c..d4fbe31d 100644
+index 99746b3c2..d4fbe31d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -1,6 +1,7 @@
@@ -129,5 +129,5 @@ index 99746b3c..d4fbe31d 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0193-Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/0192-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
similarity index 90%
rename from Spigot-Server-Patches/0193-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
rename to Spigot-Server-Patches/0192-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
index 1efdc27ed9..0655c4c429 100644
--- a/Spigot-Server-Patches/0193-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
+++ b/Spigot-Server-Patches/0192-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
@@ -1,11 +1,11 @@
-From aa61f3fe07ad74f26194edff03cd511a0ac490f1 Mon Sep 17 00:00:00 2001
+From 2c39eddf8fae574d0799de86543aee218c5de0c2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 29 Dec 2016 00:56:51 -0500
 Subject: [PATCH] Change Outdated Build Download URL to Paper CI
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 59d4e2e6..e4ec213e 100644
+index 59d4e2e6f..e4ec213e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -200,7 +200,7 @@ public class Main {
@@ -18,5 +18,5 @@ index 59d4e2e6..e4ec213e 100644
                          Thread.sleep(TimeUnit.SECONDS.toMillis(15));
                      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0194-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0193-PlayerTeleportEndGatewayEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0194-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0193-PlayerTeleportEndGatewayEvent.patch
index 87f797c189..81f78a9811 100644
--- a/Spigot-Server-Patches/0194-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0193-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 9005f191ef06a9e704811f05166da220da96bc00 Mon Sep 17 00:00:00 2001
+From 2bdc6f5272c0edc55981f9be27551637da1cd57b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 065d0bbf..ea8992d7 100644
+index 065d0bbfc..ea8992d72 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -124,7 +124,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index 065d0bbf..ea8992d7 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0195-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch b/Spigot-Server-Patches/0194-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
similarity index 91%
rename from Spigot-Server-Patches/0195-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
rename to Spigot-Server-Patches/0194-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
index b65a02a5d6..b477751f80 100644
--- a/Spigot-Server-Patches/0195-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
+++ b/Spigot-Server-Patches/0194-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
@@ -1,4 +1,4 @@
-From c36f506b1200efce56cc66a11e2930dcc4803de1 Mon Sep 17 00:00:00 2001
+From c4db7822f7900b67d446e850eddc5c1072189c43 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 02:07:24 -0500
 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets
@@ -11,7 +11,7 @@ This breaks the ability to rename more than 1 item at a time.
 See: https://bugs.mojang.com/browse/MC-111699
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7c2d43ac..cbe5d36d 100644
+index 7c2d43ac2..cbe5d36d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2449,7 +2449,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,5 +24,5 @@ index 7c2d43ac..cbe5d36d 100644
                              } else {
                                  containeranvil.a("");
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0196-MC-112017-Allow-31-instead-of-30-for-item-names.patch b/Spigot-Server-Patches/0195-MC-112017-Allow-31-instead-of-30-for-item-names.patch
similarity index 90%
rename from Spigot-Server-Patches/0196-MC-112017-Allow-31-instead-of-30-for-item-names.patch
rename to Spigot-Server-Patches/0195-MC-112017-Allow-31-instead-of-30-for-item-names.patch
index 4e9bf31581..298b6f374a 100644
--- a/Spigot-Server-Patches/0196-MC-112017-Allow-31-instead-of-30-for-item-names.patch
+++ b/Spigot-Server-Patches/0195-MC-112017-Allow-31-instead-of-30-for-item-names.patch
@@ -1,11 +1,11 @@
-From 8cbb563ef82d04f6723b7d3cfc4363da1d833249 Mon Sep 17 00:00:00 2001
+From 598f7eb64194ea079dd66291a32f825ed4e790e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 02:43:22 -0500
 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cbe5d36d..70af4ebb 100644
+index cbe5d36d0..70af4ebbb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2448,7 +2448,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index cbe5d36d..70af4ebb 100644
                                  }
                              } else {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0197-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0196-ShulkerBox-Dupe-Prevention.patch
similarity index 89%
rename from Spigot-Server-Patches/0197-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0196-ShulkerBox-Dupe-Prevention.patch
index 851a3814b6..de6d5c1b9c 100644
--- a/Spigot-Server-Patches/0197-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0196-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From bbf93cd5704f8d700fcb1154b75085f7406c1a53 Mon Sep 17 00:00:00 2001
+From b8d59828da1c0c02e2c8bbd465097280823dca75 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.
 
 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index fcb1a6c6..12fb8163 100644
+index fcb1a6c66..12fb81635 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -109,6 +109,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@@ -19,5 +19,5 @@ index fcb1a6c6..12fb8163 100644
  
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0198-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0197-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0198-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0197-Provide-E-TE-Chunk-count-stat-methods.patch
index 9508b74200..94854a7ecd 100644
--- a/Spigot-Server-Patches/0198-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0197-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From df856ad0cf3f52de980e71a1e0c7288beff54334 Mon Sep 17 00:00:00 2001
+From 02c793d3104d8e5020e4a3a52f84ff4dcedc7cb3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3f8859a1..b4207470 100644
+index 3f8859a1f..b42074706 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -78,6 +78,29 @@ public class CraftWorld implements World {
@@ -41,5 +41,5 @@ index 3f8859a1..b4207470 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0199-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0198-Enforce-Sync-Player-Saves.patch
similarity index 94%
rename from Spigot-Server-Patches/0199-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0198-Enforce-Sync-Player-Saves.patch
index 31ff6fbbc0..ae74e6baa7 100644
--- a/Spigot-Server-Patches/0199-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0198-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From ec9ab2991de89ca5c7c8c51bb4ab8abbee15d5d0 Mon Sep 17 00:00:00 2001
+From 99d5619fef40baa566b55e9b3502d44a39ad3bf0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
diff --git a/Spigot-Server-Patches/0200-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0199-Enforce-Sync-Chunk-Unloads.patch
similarity index 91%
rename from Spigot-Server-Patches/0200-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0199-Enforce-Sync-Chunk-Unloads.patch
index 62d8f26a3d..5dd16ec3a0 100644
--- a/Spigot-Server-Patches/0200-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0199-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 2b343988be36223a17839d831ea5297856599981 Mon Sep 17 00:00:00 2001
+From 99af5e5c170122720f987589ca7d0102dda88197 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b4207470..b837a921 100644
+index b42074706..b837a921c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -238,6 +238,7 @@ public class CraftWorld implements World {
@@ -27,5 +27,5 @@ index b4207470..b837a921 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0201-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0200-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 87%
rename from Spigot-Server-Patches/0201-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0200-Don-t-allow-entities-to-ride-themselves-572.patch
index 49ce781f7d..85a14cd9fe 100644
--- a/Spigot-Server-Patches/0201-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0200-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From ae7ef20b19148e89f33b465fd8ff1dc210755dd6 Mon Sep 17 00:00:00 2001
+From 760288d1cb35ce28612916f1fe13f03a80ea8b73 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1e295432..6fcced92 100644
+index 1e295432e..6fcced926 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1917,6 +1917,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,5 +17,5 @@ index 1e295432..6fcced92 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0202-Fix-block-break-desync.patch b/Spigot-Server-Patches/0201-Fix-block-break-desync.patch
similarity index 87%
rename from Spigot-Server-Patches/0202-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0201-Fix-block-break-desync.patch
index a43a90eb20..2c441cefae 100644
--- a/Spigot-Server-Patches/0202-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0201-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From 4455838df6bf9026d3ac21af134d2f7cf7d311a7 Mon Sep 17 00:00:00 2001
+From b3d90b43866f0dbc59b6f35d3e0223776d228fb7 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 70af4ebb..0e2f43b9 100644
+index 70af4ebbb..0e2f43b96 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -830,6 +830,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -17,5 +17,5 @@ index 70af4ebb..0e2f43b9 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0203-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0202-Assign-the-World-in-WorldGenStronghold.patch
similarity index 86%
rename from Spigot-Server-Patches/0203-Assign-the-World-in-WorldGenStronghold.patch
rename to Spigot-Server-Patches/0202-Assign-the-World-in-WorldGenStronghold.patch
index bbd74c79f5..01d84ab7c8 100644
--- a/Spigot-Server-Patches/0203-Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/0202-Assign-the-World-in-WorldGenStronghold.patch
@@ -1,11 +1,11 @@
-From ee446bce1a72c18ec83261e53a8536f72ffc2b5c Mon Sep 17 00:00:00 2001
+From d87b02439ca632436aa045cadb984c0274c866c1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 14 Jan 2017 01:22:07 -0600
 Subject: [PATCH] Assign the World in WorldGenStronghold
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index c9375470..a3b958e0 100644
+index c93754704..a3b958e01 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -56,6 +56,7 @@ public class WorldGenStronghold extends StructureGenerator {
@@ -17,5 +17,5 @@ index c9375470..a3b958e0 100644
              this.c();
              this.b = true;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0204-Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/0203-Add-fromBottle-flag-to-Experience-Orbs.patch
similarity index 93%
rename from Spigot-Server-Patches/0204-Add-fromBottle-flag-to-Experience-Orbs.patch
rename to Spigot-Server-Patches/0203-Add-fromBottle-flag-to-Experience-Orbs.patch
index 7d4b45fb22..28c13b3003 100644
--- a/Spigot-Server-Patches/0204-Add-fromBottle-flag-to-Experience-Orbs.patch
+++ b/Spigot-Server-Patches/0203-Add-fromBottle-flag-to-Experience-Orbs.patch
@@ -1,11 +1,11 @@
-From 11f2e6a94b8554c5c3c40740b6931bcec25a59a4 Mon Sep 17 00:00:00 2001
+From a35b6a34e34c3e3ae1117ff6bef65b22385b8d5b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 14 Jan 2017 16:15:26 -0600
 Subject: [PATCH] Add fromBottle flag to Experience Orbs
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 14431b8a..54c9200a 100644
+index 14431b8ad..54c9200a9 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,6 +15,14 @@ public class EntityExperienceOrb extends Entity {
@@ -37,7 +37,7 @@ index 14431b8a..54c9200a 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0255986f..28931295 100644
+index 0255986fd..289312950 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -40,7 +40,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -50,7 +50,7 @@ index 0255986f..28931295 100644
  
              this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3..61e3c6c3 100644
+index 3a09cab3d..61e3c6c3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -18,6 +18,13 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@@ -68,5 +68,5 @@ index 3a09cab3..61e3c6c3 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0205-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0204-Remove-the-Vanilla-Method-Profiler.patch
similarity index 95%
rename from Spigot-Server-Patches/0205-Remove-the-Vanilla-Method-Profiler.patch
rename to Spigot-Server-Patches/0204-Remove-the-Vanilla-Method-Profiler.patch
index 24dcba73d0..1efc2bdca9 100644
--- a/Spigot-Server-Patches/0205-Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/0204-Remove-the-Vanilla-Method-Profiler.patch
@@ -1,4 +1,4 @@
-From 6c4294e444a8a0bce3a404b84cd25388a2c3b25b Mon Sep 17 00:00:00 2001
+From c7306a084e0db72c5ecf0bae8d8463c69826e7f9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jan 2017 02:00:33 -0500
 Subject: [PATCH] Remove the Vanilla Method Profiler
@@ -11,7 +11,7 @@ added, so we do not want any risk of performance degredation.
 Paper has a proper Timings system that makes the Vanilla Method profiler obsolete and inferior.
 
 diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
-index fe58d428..938f62f8 100644
+index fe58d428f..938f62f83 100644
 --- a/src/main/java/net/minecraft/server/CommandDebug.java
 +++ b/src/main/java/net/minecraft/server/CommandDebug.java
 @@ -33,12 +33,11 @@ public class CommandDebug extends CommandAbstract {
@@ -40,7 +40,7 @@ index fe58d428..938f62f8 100644
  
      public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/MethodProfiler.java b/src/main/java/net/minecraft/server/MethodProfiler.java
-index 65465291..27698348 100644
+index 654652916..276983485 100644
 --- a/src/main/java/net/minecraft/server/MethodProfiler.java
 +++ b/src/main/java/net/minecraft/server/MethodProfiler.java
 @@ -9,8 +9,9 @@ import java.util.List;
@@ -79,5 +79,5 @@ index 65465291..27698348 100644
 +    }
 +}
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0206-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0205-Cap-Entity-Collisions.patch
similarity index 93%
rename from Spigot-Server-Patches/0206-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0205-Cap-Entity-Collisions.patch
index 03fbb17253..f5d390b9c6 100644
--- a/Spigot-Server-Patches/0206-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0205-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From f9ef38071405f1b311bf12dacd221d2b17fe298c Mon Sep 17 00:00:00 2001
+From 3c00d6376d7fc8505bce90568180af8da00e2c13 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 61efcc47..4898e8bc 100644
+index 61efcc479..4898e8bce 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -408,4 +408,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 61efcc47..4898e8bc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6fcced92..cfeff7c4 100644
+index 6fcced926..cfeff7c48 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -168,6 +168,7 @@ public abstract class Entity implements ICommandListener {
@@ -39,7 +39,7 @@ index 6fcced92..cfeff7c4 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 7242da9c..53486e20 100644
+index 7242da9cc..53486e205 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2132,8 +2132,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index 7242da9c..53486e20 100644
                  this.C(entity);
              }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0207-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0206-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
similarity index 92%
rename from Spigot-Server-Patches/0207-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
rename to Spigot-Server-Patches/0206-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
index d3484f0d31..d0447c4f8f 100644
--- a/Spigot-Server-Patches/0207-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/0206-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@@ -1,11 +1,11 @@
-From 058a0cb81978b5cf20cc32ab63e81de4b1a0f63c Mon Sep 17 00:00:00 2001
+From 2ee2dc9a86f49234475babaaedbe77a8e738e1a5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 23 Jan 2017 15:10:25 -0600
 Subject: [PATCH] Do not allow a zero max height in BiomeJungle
 
 
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index a4e5e493..20c18cdb 100644
+index a4e5e4933..20c18cdbd 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -39,7 +39,11 @@ public class BiomeJungle extends BiomeBase {
@@ -22,7 +22,7 @@ index a4e5e493..20c18cdb 100644
          (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j));
          WorldGenVines worldgenvines = new WorldGenVines();
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 6a0b3a62..38a7af58 100644
+index 6a0b3a62d..38a7af58c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -34,5 +34,5 @@ index 6a0b3a62..38a7af58 100644
          return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2);
      }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0208-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0207-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 96%
rename from Spigot-Server-Patches/0208-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0207-Remove-CraftScheduler-Async-Task-Debugger.patch
index a8990f0cd5..e4d9028f28 100644
--- a/Spigot-Server-Patches/0208-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0207-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 3e17aa98688af91237bb7e386a5846e55d6a1aed Mon Sep 17 00:00:00 2001
+From bc4620bc17988c0b738d7a19641dff1a42f38458 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e30cfb7b..448c27cc 100644
+index e30cfb7b7..448c27cc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -80,8 +80,8 @@ public class CraftScheduler implements BukkitScheduler {
@@ -58,5 +58,5 @@ index e30cfb7b..448c27cc 100644
  
      @Deprecated
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0209-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0208-Shame-on-you-Mojang.patch
similarity index 95%
rename from Spigot-Server-Patches/0209-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0208-Shame-on-you-Mojang.patch
index bf7412685d..a4af73cbb9 100644
--- a/Spigot-Server-Patches/0209-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0208-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 6e834104fb58905edaea685fe77342ccc26bd5eb Mon Sep 17 00:00:00 2001
+From 5659da37e2d30e64da7f749817355ad96899a4a8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@@ -12,7 +12,7 @@ This then triggers async chunk loads!
 What in the hell were you thinking?
 
 diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index f44f0562..74c37117 100644
+index f44f05620..74c371179 100644
 --- a/src/main/java/net/minecraft/server/BlockBeacon.java
 +++ b/src/main/java/net/minecraft/server/BlockBeacon.java
 @@ -62,8 +62,8 @@ public class BlockBeacon extends BlockTileEntity {
@@ -55,5 +55,5 @@ index f44f0562..74c37117 100644
      }
  }
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0210-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0209-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 90%
rename from Spigot-Server-Patches/0210-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0209-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 9f403f809a..66407fb849 100644
--- a/Spigot-Server-Patches/0210-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0209-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From d9a36a3de6454128f14ae7c8f154e00b17cb3d89 Mon Sep 17 00:00:00 2001
+From 4781c61848dc79486a9eb366c01b27c40c26a15b Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7006466b..c32fb3ef 100644
+index dabe4137f..fb4f11958 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -325,7 +325,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -18,5 +18,5 @@ index 7006466b..c32fb3ef 100644
  
                  Iterator iterator = this.unloadQueue.iterator();
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0211-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0210-Do-not-let-armorstands-drown.patch
similarity index 92%
rename from Spigot-Server-Patches/0211-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0210-Do-not-let-armorstands-drown.patch
index 99630f47d9..535d0070da 100644
--- a/Spigot-Server-Patches/0211-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0210-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 67b246c935f33eacd625d35e7d16d2f3dcf5f1dc Mon Sep 17 00:00:00 2001
+From e3e92ddb40f19cb76fd012b57ad8388526bc5972 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 7738ca38..5818aa5e 100644
+index 7738ca385..5818aa5e9 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -772,5 +772,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 7738ca38..5818aa5e 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 53486e20..9b715945 100644
+index 53486e205..9b7159450 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -188,6 +188,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 53486e20..9b715945 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.12.2
+2.12.2.windows.2
 
diff --git a/Spigot-Server-Patches/0212-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0211-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
similarity index 89%
rename from Spigot-Server-Patches/0212-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
rename to Spigot-Server-Patches/0211-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
index 285b70e149..1e1f885743 100644
--- a/Spigot-Server-Patches/0212-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
+++ b/Spigot-Server-Patches/0211-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
@@ -1,4 +1,4 @@
-From 2f6bff5870596a421be90ada961ce01b515e9089 Mon Sep 17 00:00:00 2001
+From 409d9321d3f2a0e641c01c82db43c5c0c719f3dc Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Sun, 9 Apr 2017 23:50:15 -0700
 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
 Thanks @gabizou
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 45ebd3f6..cf204f41 100644
+index 548da18e0..29902769f 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -97,7 +97,7 @@ public final class ItemStack {
@@ -19,5 +19,5 @@ index 45ebd3f6..cf204f41 100644
          // CraftBukkit start - Route through setData for filtering
          // this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
 -- 
-2.12.2
+2.12.2.windows.2