From 272f130b5a52ec93f0aafe009af5eb3b4dfa1e29 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 18 Jun 2017 20:36:55 -0500
Subject: [PATCH] Update upstream CB/S

---
 Spigot-Server-Patches/0001-POM-Changes.patch  | 16 ++--
 Spigot-Server-Patches/0006-Timings-v2.patch   | 78 +++++++++----------
 .../0017-Player-affects-spawning-API.patch    | 18 ++---
 ...event-tile-entity-and-entity-crashes.patch | 12 +--
 .../0045-Disable-spigot-tick-limiters.patch   | 10 +--
 ...entation-of-tile-entity-removal-list.patch | 10 +--
 .../0061-Add-exception-reporting-event.patch  | 30 +++----
 .../0082-Fix-SkullCache-case-bug.patch        | 22 ------
 ...ch => 0082-Waving-banner-workaround.patch} |  6 +-
 ...83-Use-a-Shared-Random-for-Entities.patch} |  6 +-
 ...> 0084-Don-t-teleport-dead-entities.patch} |  6 +-
 ...patch => 0085-Optimize-Chunk-Access.patch} |  6 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |  8 +-
 ...ocation-getType-and-getBlockData-fo.patch} | 20 ++---
 ... 0088-Fix-cooked-fish-legacy-import.patch} |  6 +-
 ... 0089-Access-items-by-EquipmentSlot.patch} |  6 +-
 ...eck-async-remove-unused-vars-GH-159.patch} |  6 +-
 ...able-BlockPhysicsEvent-for-Redstone.patch} | 10 +--
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  6 +-
 ...-Configurable-Chunk-Inhabited-Timer.patch} |  8 +-
 ...t.patch => 0094-EntityPathfindEvent.patch} |  6 +-
 ...-BlockFromToEvent-from-loading-chun.patch} |  6 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |  6 +-
 ...gionFileCache-and-make-configurable.patch} |  8 +-
 ...h => 0098-Use-Optimized-Collections.patch} |  8 +-
 ...Do-not-load-chunks-for-light-checks.patch} |  6 +-
 ...100-Add-PlayerUseUnknownEntityEvent.patch} |  8 +-
 ...DebugInfo-not-initialized-on-client.patch} |  6 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  8 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} | 16 ++--
 ...-BlockPlaceEvent-triggering-physics.patch} |  6 +-
 ...m-reload-spawn-chunks-in-nether-end.patch} | 10 +--
 ...6-Remove-Debug-checks-from-DataBits.patch} |  6 +-
 ...illa-per-world-scoreboard-coloring-.patch} | 10 +--
 ...d-for-setting-passengers-on-players.patch} |  6 +-
 ...emove-unused-World-Tile-Entity-List.patch} | 16 ++--
 ... 0110-Don-t-tick-Skulls-unused-code.patch} |  6 +-
 ... 0111-Configurable-Player-Collision.patch} | 14 ++--
 ...nt-to-allow-plugins-to-handle-clien.patch} |  6 +-
 ...mobs-should-only-spawn-in-the-water.patch} |  6 +-
 ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} |  8 +-
 ...> 0115-Configurable-RCON-IP-address.patch} |  6 +-
 ...16-Prevent-Fire-from-loading-chunks.patch} |  6 +-
 ...7-Implement-PlayerLocaleChangeEvent.patch} |  8 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  8 +-
 ...to-configure-frosted_ice-properties.patch} |  8 +-
 ...-Vehicle-Event-Cancellation-Changes.patch} |  6 +-
 ...dispenser-dropper-furnace-placement.patch} |  8 +-
 ...mprove-Minecraft-Hopper-Performance.patch} |  8 +-
 ...possibility-for-getServer-singleton.patch} |  6 +-
 ...tem-frames-performance-and-bug-fixe.patch} | 16 ++--
 ...API-Replenishable-Lootables-Feature.patch} | 32 ++++----
 ...-Do-not-load-chunks-for-pathfinding.patch} |  6 +-
 ...> 0127-Entity-Tracking-Improvements.patch} |  8 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  8 +-
 ...unks-as-active-for-neighbor-updates.patch} |  6 +-
 ... 0130-Fix-Chunk-Unload-Queue-Issues.patch} |  8 +-
 ...em-property-for-disabling-watchdoge.patch} |  6 +-
 ...mize-EAR.patch => 0132-Optimize-EAR.patch} |  6 +-
 ...0133-Optimize-UserCache-Thread-Safe.patch} |  8 +-
 ...locking-on-Network-Manager-creation.patch} |  6 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} | 10 +--
 ...-redstone-torch-rapid-clock-removal.patch} |  6 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |  8 +-
 ...h => 0138-Add-server-name-parameter.patch} |  6 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |  8 +-
 ...FallingBlocks-being-stuck-on-fences.patch} | 10 +--
 ...0141-Make-entities-look-for-hoppers.patch} | 22 +++---
 ...nk-Unloads-based-on-Player-Movement.patch} | 16 ++--
 ... 0143-Toggleable-Elytra-Wall-Damage.patch} |  8 +-
 ...=> 0144-Fix-Double-World-Add-issues.patch} |  8 +-
 ...tch => 0145-Fix-Old-Sign-Conversion.patch} | 10 +--
 ...-profiles-that-have-no-UUID-and-no-.patch} |  6 +-
 ...ative-vehicle-moved-wrongly-message.patch} |  6 +-
 ...rs-that-dismount-from-other-players.patch} |  6 +-
 ...etting-for-proxy-online-mode-status.patch} | 10 +--
 ...-BlockStateEnum-hashCode-and-equals.patch} |  6 +-
 ...0151-Disable-ticking-of-snow-blocks.patch} |  6 +-
 ...52-Fix-AIOOBE-in-inventory-handling.patch} |  6 +-
 ...nfigurable-packet-in-spam-threshold.patch} |  8 +-
 ...4-Configurable-flying-kick-messages.patch} |  8 +-
 ...atch => 0155-Auto-Save-Improvements.patch} | 20 ++---
 ...ch => 0156-Chunk-registration-fixes.patch} |  8 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  6 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |  6 +-
 ...ring-limit-for-packet-serialization.patch} |  6 +-
 ...ch => 0160-Disable-Vanilla-Chunk-GC.patch} |  6 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  8 +-
 ...nt.patch => 0162-Add-EntityZapEvent.patch} | 10 +--
 ...hunks-from-Hoppers-and-other-things.patch} |  6 +-
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} | 10 +--
 ... 0165-Chunk-Save-Stats-Debug-Option.patch} |  8 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} | 10 +--
 ...67-Cache-user-authenticator-threads.patch} |  6 +-
 ...atch => 0168-Optimize-Network-Queue.patch} |  6 +-
 ...tch => 0169-Optimise-NetworkManager.patch} |  6 +-
 ....patch => 0170-Optimise-removeQueue.patch} |  6 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  6 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  8 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  6 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  8 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |  8 +-
 ... => 0176-Add-ProjectileCollideEvent.patch} | 14 ++--
 ...-Vanished-players-don-t-have-rights.patch} | 16 ++--
 ...ent-Pathfinding-out-of-World-Border.patch} |  8 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |  8 +-
 ...igurable-Cartographer-Treasure-Maps.patch} |  8 +-
 ... => 0181-Optimize-ItemStack.isEmpty.patch} |  6 +-
 ...o-control-if-armour-stands-can-move.patch} |  8 +-
 ...-armor-stands-from-doing-entity-loo.patch} | 10 +--
 ...option-to-remove-invalid-statistics.patch} |  8 +-
 ...nt.patch => 0185-IllegalPacketEvent.patch} |  6 +-
 ...6-Properly-fix-item-duplication-bug.patch} |  8 +-
 ...=> 0187-String-based-Action-Bar-API.patch} |  8 +-
 ... 0188-Activation-Range-Improvements.patch} | 16 ++--
 ...-API-s.patch => 0189-Firework-API-s.patch} | 12 +--
 ... 0190-PlayerTeleportEndGatewayEvent.patch} |  6 +-
 ... => 0191-ShulkerBox-Dupe-Prevention.patch} |  6 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  6 +-
 ...h => 0193-Enforce-Sync-Player-Saves.patch} |  6 +-
 ... => 0194-Enforce-Sync-Chunk-Unloads.patch} |  6 +-
 ...low-entities-to-ride-themselves-572.patch} |  6 +-
 ...atch => 0196-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 => 0200-Cap-Entity-Collisions.patch} | 10 +--
 ...ow-a-zero-max-height-in-BiomeJungle.patch} |  8 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |  6 +-
 ...g.patch => 0203-Shame-on-you-Mojang.patch} |  6 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |  6 +-
 ...> 0205-Do-not-let-armorstands-drown.patch} |  8 +-
 ...-attempting-to-read-EMPTY-ItemStack.patch} |  6 +-
 ...e-async-calls-to-restart-the-server.patch} | 10 +--
 ...roperty-to-disable-book-size-limits.patch} |  6 +-
 ...e-parrots-stay-on-shoulders-despite.patch} | 10 +--
 ...-option-to-prevent-player-names-fro.patch} |  4 +-
 ...leAppender-for-console-improvements.patch} | 14 ++--
 ...rable-option-to-disable-creeper-lin.patch} |  8 +-
 ....patch => 0213-Item-canEntityPickup.patch} | 10 +--
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  6 +-
 ...> 0215-PlayerAttemptPickupItemEvent.patch} |  6 +-
 ...patch => 0216-EntityPickupItemEvent.patch} |  6 +-
 ...tch => 0217-Add-UnknownCommandEvent.patch} |  6 +-
 ... 0218-Shoulder-Entities-Release-API.patch} |  8 +-
 ...patch => 0219-Profile-Lookup-Events.patch} |  6 +-
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 148 files changed, 654 insertions(+), 676 deletions(-)
 delete mode 100644 Spigot-Server-Patches/0082-Fix-SkullCache-case-bug.patch
 rename Spigot-Server-Patches/{0083-Waving-banner-workaround.patch => 0082-Waving-banner-workaround.patch} (91%)
 rename Spigot-Server-Patches/{0084-Use-a-Shared-Random-for-Entities.patch => 0083-Use-a-Shared-Random-for-Entities.patch} (91%)
 rename Spigot-Server-Patches/{0085-Don-t-teleport-dead-entities.patch => 0084-Don-t-teleport-dead-entities.patch} (88%)
 rename Spigot-Server-Patches/{0086-Optimize-Chunk-Access.patch => 0085-Optimize-Chunk-Access.patch} (94%)
 rename Spigot-Server-Patches/{0087-Configurable-spawn-chances-for-skeleton-horses.patch => 0086-Configurable-spawn-chances-for-skeleton-horses.patch} (92%)
 rename Spigot-Server-Patches/{0088-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (96%)
 rename Spigot-Server-Patches/{0089-Fix-cooked-fish-legacy-import.patch => 0088-Fix-cooked-fish-legacy-import.patch} (90%)
 rename Spigot-Server-Patches/{0090-Access-items-by-EquipmentSlot.patch => 0089-Access-items-by-EquipmentSlot.patch} (95%)
 rename Spigot-Server-Patches/{0091-Check-async-remove-unused-vars-GH-159.patch => 0090-Check-async-remove-unused-vars-GH-159.patch} (93%)
 rename Spigot-Server-Patches/{0092-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (95%)
 rename Spigot-Server-Patches/{0093-Entity-AddTo-RemoveFrom-World-Events.patch => 0092-Entity-AddTo-RemoveFrom-World-Events.patch} (89%)
 rename Spigot-Server-Patches/{0094-Configurable-Chunk-Inhabited-Timer.patch => 0093-Configurable-Chunk-Inhabited-Timer.patch} (90%)
 rename Spigot-Server-Patches/{0095-EntityPathfindEvent.patch => 0094-EntityPathfindEvent.patch} (93%)
 rename Spigot-Server-Patches/{0096-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch => 0095-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch} (95%)
 rename Spigot-Server-Patches/{0097-Reduce-IO-ops-opening-a-new-region-file.patch => 0096-Reduce-IO-ops-opening-a-new-region-file.patch} (94%)
 rename Spigot-Server-Patches/{0098-Sanitise-RegionFileCache-and-make-configurable.patch => 0097-Sanitise-RegionFileCache-and-make-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0099-Use-Optimized-Collections.patch => 0098-Use-Optimized-Collections.patch} (94%)
 rename Spigot-Server-Patches/{0100-Do-not-load-chunks-for-light-checks.patch => 0099-Do-not-load-chunks-for-light-checks.patch} (88%)
 rename Spigot-Server-Patches/{0101-Add-PlayerUseUnknownEntityEvent.patch => 0100-Add-PlayerUseUnknownEntityEvent.patch} (92%)
 rename Spigot-Server-Patches/{0102-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0101-Fix-reducedDebugInfo-not-initialized-on-client.patch} (90%)
 rename Spigot-Server-Patches/{0103-Configurable-Grass-Spread-Tick-Rate.patch => 0102-Configurable-Grass-Spread-Tick-Rate.patch} (92%)
 rename Spigot-Server-Patches/{0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (93%)
 rename Spigot-Server-Patches/{0105-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (87%)
 rename Spigot-Server-Patches/{0106-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (84%)
 rename Spigot-Server-Patches/{0107-Remove-Debug-checks-from-DataBits.patch => 0106-Remove-Debug-checks-from-DataBits.patch} (93%)
 rename Spigot-Server-Patches/{0108-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (93%)
 rename Spigot-Server-Patches/{0109-Workaround-for-setting-passengers-on-players.patch => 0108-Workaround-for-setting-passengers-on-players.patch} (90%)
 rename Spigot-Server-Patches/{0110-Remove-unused-World-Tile-Entity-List.patch => 0109-Remove-unused-World-Tile-Entity-List.patch} (88%)
 rename Spigot-Server-Patches/{0111-Don-t-tick-Skulls-unused-code.patch => 0110-Don-t-tick-Skulls-unused-code.patch} (86%)
 rename Spigot-Server-Patches/{0112-Configurable-Player-Collision.patch => 0111-Configurable-Player-Collision.patch} (96%)
 rename Spigot-Server-Patches/{0113-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0112-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (96%)
 rename Spigot-Server-Patches/{0114-Water-mobs-should-only-spawn-in-the-water.patch => 0113-Water-mobs-should-only-spawn-in-the-water.patch} (90%)
 rename Spigot-Server-Patches/{0115-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch => 0114-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} (95%)
 rename Spigot-Server-Patches/{0116-Configurable-RCON-IP-address.patch => 0115-Configurable-RCON-IP-address.patch} (89%)
 rename Spigot-Server-Patches/{0117-Prevent-Fire-from-loading-chunks.patch => 0116-Prevent-Fire-from-loading-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0118-Implement-PlayerLocaleChangeEvent.patch => 0117-Implement-PlayerLocaleChangeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0119-EntityRegainHealthEvent-isFastRegen-API.patch => 0118-EntityRegainHealthEvent-isFastRegen-API.patch} (93%)
 rename Spigot-Server-Patches/{0120-Add-ability-to-configure-frosted_ice-properties.patch => 0119-Add-ability-to-configure-frosted_ice-properties.patch} (94%)
 rename Spigot-Server-Patches/{0121-Vehicle-Event-Cancellation-Changes.patch => 0120-Vehicle-Event-Cancellation-Changes.patch} (94%)
 rename Spigot-Server-Patches/{0122-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch => 0121-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch} (94%)
 rename Spigot-Server-Patches/{0123-Improve-Minecraft-Hopper-Performance.patch => 0122-Improve-Minecraft-Hopper-Performance.patch} (96%)
 rename Spigot-Server-Patches/{0124-remove-null-possibility-for-getServer-singleton.patch => 0123-remove-null-possibility-for-getServer-singleton.patch} (94%)
 rename Spigot-Server-Patches/{0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (95%)
 rename Spigot-Server-Patches/{0126-LootTable-API-Replenishable-Lootables-Feature.patch => 0125-LootTable-API-Replenishable-Lootables-Feature.patch} (98%)
 rename Spigot-Server-Patches/{0127-Do-not-load-chunks-for-pathfinding.patch => 0126-Do-not-load-chunks-for-pathfinding.patch} (86%)
 rename Spigot-Server-Patches/{0128-Entity-Tracking-Improvements.patch => 0127-Entity-Tracking-Improvements.patch} (96%)
 rename Spigot-Server-Patches/{0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0128-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (91%)
 rename Spigot-Server-Patches/{0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0129-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (96%)
 rename Spigot-Server-Patches/{0131-Fix-Chunk-Unload-Queue-Issues.patch => 0130-Fix-Chunk-Unload-Queue-Issues.patch} (92%)
 rename Spigot-Server-Patches/{0132-System-property-for-disabling-watchdoge.patch => 0131-System-property-for-disabling-watchdoge.patch} (88%)
 rename Spigot-Server-Patches/{0133-Optimize-EAR.patch => 0132-Optimize-EAR.patch} (95%)
 rename Spigot-Server-Patches/{0134-Optimize-UserCache-Thread-Safe.patch => 0133-Optimize-UserCache-Thread-Safe.patch} (96%)
 rename Spigot-Server-Patches/{0135-Avoid-blocking-on-Network-Manager-creation.patch => 0134-Avoid-blocking-on-Network-Manager-creation.patch} (95%)
 rename Spigot-Server-Patches/{0136-Optional-TNT-doesn-t-move-in-water.patch => 0135-Optional-TNT-doesn-t-move-in-water.patch} (96%)
 rename Spigot-Server-Patches/{0137-Faster-redstone-torch-rapid-clock-removal.patch => 0136-Faster-redstone-torch-rapid-clock-removal.patch} (93%)
 rename Spigot-Server-Patches/{0138-Ensure-Chunks-never-ever-load-async.patch => 0137-Ensure-Chunks-never-ever-load-async.patch} (94%)
 rename Spigot-Server-Patches/{0139-Add-server-name-parameter.patch => 0138-Add-server-name-parameter.patch} (88%)
 rename Spigot-Server-Patches/{0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0139-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (95%)
 rename Spigot-Server-Patches/{0141-Fix-FallingBlocks-being-stuck-on-fences.patch => 0140-Fix-FallingBlocks-being-stuck-on-fences.patch} (96%)
 rename Spigot-Server-Patches/{0142-Make-entities-look-for-hoppers.patch => 0141-Make-entities-look-for-hoppers.patch} (97%)
 rename Spigot-Server-Patches/{0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (95%)
 rename Spigot-Server-Patches/{0144-Toggleable-Elytra-Wall-Damage.patch => 0143-Toggleable-Elytra-Wall-Damage.patch} (92%)
 rename Spigot-Server-Patches/{0145-Fix-Double-World-Add-issues.patch => 0144-Fix-Double-World-Add-issues.patch} (92%)
 rename Spigot-Server-Patches/{0146-Fix-Old-Sign-Conversion.patch => 0145-Fix-Old-Sign-Conversion.patch} (95%)
 rename Spigot-Server-Patches/{0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0146-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (88%)
 rename Spigot-Server-Patches/{0148-More-informative-vehicle-moved-wrongly-message.patch => 0147-More-informative-vehicle-moved-wrongly-message.patch} (89%)
 rename Spigot-Server-Patches/{0149-Re-track-players-that-dismount-from-other-players.patch => 0148-Re-track-players-that-dismount-from-other-players.patch} (90%)
 rename Spigot-Server-Patches/{0150-Add-setting-for-proxy-online-mode-status.patch => 0149-Add-setting-for-proxy-online-mode-status.patch} (93%)
 rename Spigot-Server-Patches/{0151-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0150-Optimise-BlockStateEnum-hashCode-and-equals.patch} (95%)
 rename Spigot-Server-Patches/{0152-Disable-ticking-of-snow-blocks.patch => 0151-Disable-ticking-of-snow-blocks.patch} (90%)
 rename Spigot-Server-Patches/{0153-Fix-AIOOBE-in-inventory-handling.patch => 0152-Fix-AIOOBE-in-inventory-handling.patch} (89%)
 rename Spigot-Server-Patches/{0154-Configurable-packet-in-spam-threshold.patch => 0153-Configurable-packet-in-spam-threshold.patch} (93%)
 rename Spigot-Server-Patches/{0155-Configurable-flying-kick-messages.patch => 0154-Configurable-flying-kick-messages.patch} (94%)
 rename Spigot-Server-Patches/{0156-Auto-Save-Improvements.patch => 0155-Auto-Save-Improvements.patch} (96%)
 rename Spigot-Server-Patches/{0157-Chunk-registration-fixes.patch => 0156-Chunk-registration-fixes.patch} (82%)
 rename Spigot-Server-Patches/{0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0157-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (88%)
 rename Spigot-Server-Patches/{0159-Auto-fix-bad-Y-levels-on-player-login.patch => 0158-Auto-fix-bad-Y-levels-on-player-login.patch} (89%)
 rename Spigot-Server-Patches/{0160-Raise-string-limit-for-packet-serialization.patch => 0159-Raise-string-limit-for-packet-serialization.patch} (91%)
 rename Spigot-Server-Patches/{0161-Disable-Vanilla-Chunk-GC.patch => 0160-Disable-Vanilla-Chunk-GC.patch} (91%)
 rename Spigot-Server-Patches/{0162-Option-to-remove-corrupt-tile-entities.patch => 0161-Option-to-remove-corrupt-tile-entities.patch} (92%)
 rename Spigot-Server-Patches/{0163-Add-EntityZapEvent.patch => 0162-Add-EntityZapEvent.patch} (95%)
 rename Spigot-Server-Patches/{0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0163-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (93%)
 rename Spigot-Server-Patches/{0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0164-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (94%)
 rename Spigot-Server-Patches/{0166-Chunk-Save-Stats-Debug-Option.patch => 0165-Chunk-Save-Stats-Debug-Option.patch} (96%)
 rename Spigot-Server-Patches/{0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0166-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (94%)
 rename Spigot-Server-Patches/{0168-Cache-user-authenticator-threads.patch => 0167-Cache-user-authenticator-threads.patch} (96%)
 rename Spigot-Server-Patches/{0169-Optimize-Network-Queue.patch => 0168-Optimize-Network-Queue.patch} (89%)
 rename Spigot-Server-Patches/{0170-Optimise-NetworkManager.patch => 0169-Optimise-NetworkManager.patch} (96%)
 rename Spigot-Server-Patches/{0171-Optimise-removeQueue.patch => 0170-Optimise-removeQueue.patch} (95%)
 rename Spigot-Server-Patches/{0172-Allow-Reloading-of-Command-Aliases.patch => 0171-Allow-Reloading-of-Command-Aliases.patch} (92%)
 rename Spigot-Server-Patches/{0173-Add-source-to-PlayerExpChangeEvent.patch => 0172-Add-source-to-PlayerExpChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0174-Optimize-World.isLoaded-BlockPosition-Z.patch => 0173-Optimize-World.isLoaded-BlockPosition-Z.patch} (87%)
 rename Spigot-Server-Patches/{0175-Speedup-BlockPos-by-fixing-inlining.patch => 0174-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0176-Don-t-let-fishinghooks-use-portals.patch => 0175-Don-t-let-fishinghooks-use-portals.patch} (90%)
 rename Spigot-Server-Patches/{0177-Add-ProjectileCollideEvent.patch => 0176-Add-ProjectileCollideEvent.patch} (95%)
 rename Spigot-Server-Patches/{0178-Vanished-players-don-t-have-rights.patch => 0177-Vanished-players-don-t-have-rights.patch} (93%)
 rename Spigot-Server-Patches/{0179-Prevent-Pathfinding-out-of-World-Border.patch => 0178-Prevent-Pathfinding-out-of-World-Border.patch} (93%)
 rename Spigot-Server-Patches/{0180-Bound-Treasure-Maps-to-World-Border.patch => 0179-Bound-Treasure-Maps-to-World-Border.patch} (94%)
 rename Spigot-Server-Patches/{0181-Configurable-Cartographer-Treasure-Maps.patch => 0180-Configurable-Cartographer-Treasure-Maps.patch} (94%)
 rename Spigot-Server-Patches/{0182-Optimize-ItemStack.isEmpty.patch => 0181-Optimize-ItemStack.isEmpty.patch} (91%)
 rename Spigot-Server-Patches/{0183-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0182-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%)
 rename Spigot-Server-Patches/{0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (86%)
 rename Spigot-Server-Patches/{0185-Add-option-to-remove-invalid-statistics.patch => 0184-Add-option-to-remove-invalid-statistics.patch} (94%)
 rename Spigot-Server-Patches/{0186-IllegalPacketEvent.patch => 0185-IllegalPacketEvent.patch} (97%)
 rename Spigot-Server-Patches/{0187-Properly-fix-item-duplication-bug.patch => 0186-Properly-fix-item-duplication-bug.patch} (90%)
 rename Spigot-Server-Patches/{0188-String-based-Action-Bar-API.patch => 0187-String-based-Action-Bar-API.patch} (95%)
 rename Spigot-Server-Patches/{0189-Activation-Range-Improvements.patch => 0188-Activation-Range-Improvements.patch} (95%)
 rename Spigot-Server-Patches/{0190-Firework-API-s.patch => 0189-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0191-PlayerTeleportEndGatewayEvent.patch => 0190-PlayerTeleportEndGatewayEvent.patch} (91%)
 rename Spigot-Server-Patches/{0192-ShulkerBox-Dupe-Prevention.patch => 0191-ShulkerBox-Dupe-Prevention.patch} (89%)
 rename Spigot-Server-Patches/{0193-Provide-E-TE-Chunk-count-stat-methods.patch => 0192-Provide-E-TE-Chunk-count-stat-methods.patch} (93%)
 rename Spigot-Server-Patches/{0194-Enforce-Sync-Player-Saves.patch => 0193-Enforce-Sync-Player-Saves.patch} (90%)
 rename Spigot-Server-Patches/{0195-Enforce-Sync-Chunk-Unloads.patch => 0194-Enforce-Sync-Chunk-Unloads.patch} (91%)
 rename Spigot-Server-Patches/{0196-Don-t-allow-entities-to-ride-themselves-572.patch => 0195-Don-t-allow-entities-to-ride-themselves-572.patch} (87%)
 rename Spigot-Server-Patches/{0197-Fix-block-break-desync.patch => 0196-Fix-block-break-desync.patch} (88%)
 rename Spigot-Server-Patches/{0198-Assign-the-World-in-WorldGenStronghold.patch => 0197-Assign-the-World-in-WorldGenStronghold.patch} (86%)
 rename Spigot-Server-Patches/{0199-Add-fromBottle-flag-to-Experience-Orbs.patch => 0198-Add-fromBottle-flag-to-Experience-Orbs.patch} (93%)
 rename Spigot-Server-Patches/{0200-Remove-the-Vanilla-Method-Profiler.patch => 0199-Remove-the-Vanilla-Method-Profiler.patch} (95%)
 rename Spigot-Server-Patches/{0201-Cap-Entity-Collisions.patch => 0200-Cap-Entity-Collisions.patch} (93%)
 rename Spigot-Server-Patches/{0202-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch => 0201-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch} (92%)
 rename Spigot-Server-Patches/{0203-Remove-CraftScheduler-Async-Task-Debugger.patch => 0202-Remove-CraftScheduler-Async-Task-Debugger.patch} (96%)
 rename Spigot-Server-Patches/{0204-Shame-on-you-Mojang.patch => 0203-Shame-on-you-Mojang.patch} (95%)
 rename Spigot-Server-Patches/{0205-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0204-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (90%)
 rename Spigot-Server-Patches/{0206-Do-not-let-armorstands-drown.patch => 0205-Do-not-let-armorstands-drown.patch} (92%)
 rename Spigot-Server-Patches/{0207-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch => 0206-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch} (89%)
 rename Spigot-Server-Patches/{0208-Properly-handle-async-calls-to-restart-the-server.patch => 0207-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename Spigot-Server-Patches/{0209-Add-system-property-to-disable-book-size-limits.patch => 0208-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0210-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0209-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (93%)
 rename Spigot-Server-Patches/{0211-Add-configuration-option-to-prevent-player-names-fro.patch => 0210-Add-configuration-option-to-prevent-player-names-fro.patch} (94%)
 rename Spigot-Server-Patches/{0212-Use-TerminalConsoleAppender-for-console-improvements.patch => 0211-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename Spigot-Server-Patches/{0213-provide-a-configurable-option-to-disable-creeper-lin.patch => 0212-provide-a-configurable-option-to-disable-creeper-lin.patch} (92%)
 rename Spigot-Server-Patches/{0214-Item-canEntityPickup.patch => 0213-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0215-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0214-PlayerPickupItemEvent-setFlyAtPlayer.patch} (94%)
 rename Spigot-Server-Patches/{0216-PlayerAttemptPickupItemEvent.patch => 0215-PlayerAttemptPickupItemEvent.patch} (92%)
 rename Spigot-Server-Patches/{0217-EntityPickupItemEvent.patch => 0216-EntityPickupItemEvent.patch} (92%)
 rename Spigot-Server-Patches/{0218-Add-UnknownCommandEvent.patch => 0217-Add-UnknownCommandEvent.patch} (92%)
 rename Spigot-Server-Patches/{0219-Shoulder-Entities-Release-API.patch => 0218-Shoulder-Entities-Release-API.patch} (96%)
 rename Spigot-Server-Patches/{0220-Profile-Lookup-Events.patch => 0219-Profile-Lookup-Events.patch} (93%)

diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 8f9db316c8..0013a39a40 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From a5da8516e3b9ef3ceb08cb5d373593a8775f42c8 Mon Sep 17 00:00:00 2001
+From 968f0917c3bd89062f9209a09fb95f4e1d3b1d8f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index d677e79df..b2aa10ff7 100644
+index 9bdc62ab..cf00ee13 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -46,7 +46,7 @@ index d677e79df..b2aa10ff7 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -94,34 +94,22 @@
+@@ -102,34 +102,22 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -92,7 +92,7 @@ index d677e79df..b2aa10ff7 100644
                          </goals>
                      </execution>
                  </executions>
-@@ -131,11 +119,12 @@
+@@ -139,11 +127,12 @@
                  <artifactId>maven-jar-plugin</artifactId>
                  <version>3.0.2</version>
                  <configuration>
@@ -106,7 +106,7 @@ index d677e79df..b2aa10ff7 100644
                              <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
-@@ -195,19 +184,22 @@
+@@ -203,19 +192,22 @@
                              <goal>shade</goal>
                          </goals>
                          <configuration>
@@ -137,7 +137,7 @@ index d677e79df..b2aa10ff7 100644
                                  <relocation>
                                      <pattern>org.bukkit.craftbukkit</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
-@@ -234,20 +226,6 @@
+@@ -242,20 +234,6 @@
                  <artifactId>maven-compiler-plugin</artifactId>
                  <!-- versions after this appear to be broken -->
                  <version>3.1</version>
@@ -159,7 +159,7 @@ index d677e79df..b2aa10ff7 100644
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 93046379d..674096cab 100644
+index 93046379..674096ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
@@ -172,5 +172,5 @@ index 93046379d..674096cab 100644
  
          if (stream != null) {
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index 11344b962f..054191671f 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 541121315fe521e9038c40a2d8d015cbb81371d3 Mon Sep 17 00:00:00 2001
+From 5979879916b84a6f957e27e246095631dd0c686e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..1b33390de
+index 00000000..1b33390d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,125 @@
@@ -137,7 +137,7 @@ index 000000000..1b33390de
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 000000000..089154f62
+index 00000000..089154f6
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,131 @@
@@ -274,7 +274,7 @@ index 000000000..089154f62
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 000000000..e7789117b
+index 00000000..e7789117
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,101 @@
@@ -380,7 +380,7 @@ index 000000000..e7789117b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5ab2cf6ee..b5795b6d3 100644
+index 5ab2cf6e..b5795b6d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -424,7 +424,7 @@ index 5ab2cf6ee..b5795b6d3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 7501a1a28..1701804b1 100644
+index 7501a1a2..1701804b 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -35,6 +35,15 @@ public class Block {
@@ -444,7 +444,7 @@ index 7501a1a28..1701804b1 100644
      public static int getId(Block block) {
          return Block.REGISTRY.a(block); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d268fec39..52f6242d7 100644
+index d268fec3..52f6242d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -900,7 +900,7 @@ public class Chunk {
@@ -492,7 +492,7 @@ index d268fec39..52f6242d7 100644
  
      private void z() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9dcab42de..c1b0d6cea 100644
+index 9dcab42d..c1b0d6ce 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -514,7 +514,7 @@ index 9dcab42de..c1b0d6cea 100644
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a4fca0ca9..161ea8172 100644
+index a4fca0ca..161ea817 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -388,7 +388,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -554,7 +554,7 @@ index a4fca0ca9..161ea8172 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7fe2796fe..2feeb855b 100644
+index 7fe2796f..2feeb855 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -24,7 +24,7 @@ import java.io.PrintStream;
@@ -607,7 +607,7 @@ index 7fe2796fe..2feeb855b 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e3e9a2136..000a0051f 100644
+index e3e9a213..000a0051 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@@ -646,7 +646,7 @@ index e3e9a2136..000a0051f 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bc2da3316..f446020af 100644
+index bc2da331..f446020a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -717,7 +717,7 @@ index bc2da3316..f446020af 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 284d1204d..3aab54206 100644
+index 284d1204..3aab5420 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -175,7 +175,7 @@ public class EntityTracker {
@@ -748,7 +748,7 @@ index 284d1204d..3aab54206 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e396b3822..43b4e552b 100644
+index e396b382..43b4e552 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -47,8 +47,8 @@ import org.bukkit.Bukkit;
@@ -895,7 +895,7 @@ index e396b3822..43b4e552b 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index eeac34998..e4ed2e991 100644
+index eeac3499..e4ed2e99 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -995,7 +995,7 @@ index eeac34998..e4ed2e991 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ddd36a3c6..42b05bee8 100644
+index ddd36a3c..42b05bee 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;
@@ -1043,7 +1043,7 @@ index ddd36a3c6..42b05bee8 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index f74b06794..1fc632e0c 100644
+index f74b0679..1fc632e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,15 +1,21 @@
@@ -1073,7 +1073,7 @@ index f74b06794..1fc632e0c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 788e0e1b5..b7ebbc9ff 100644
+index 788e0e1b..b7ebbc9f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1097,7 +1097,7 @@ index 788e0e1b5..b7ebbc9ff 100644
  
      public void addWhitelist(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 74e3f42cd..2580a4cf6 100644
+index 74e3f42c..2580a4cf 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -1,5 +1,7 @@
@@ -1139,7 +1139,7 @@ index 74e3f42cd..2580a4cf6 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 591f4ad7f..e02f0c442 100644
+index 591f4ad7..e02f0c44 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1159,7 +1159,7 @@ index 591f4ad7f..e02f0c442 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d16e499ae..aced20e3b 100644
+index fd204ad7..aaa524b3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -1193,7 +1193,7 @@ index d16e499ae..aced20e3b 100644
                  this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
-@@ -1383,6 +1383,7 @@ public abstract class World implements IBlockAccess {
+@@ -1384,6 +1384,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.c("remove");
@@ -1201,7 +1201,7 @@ index d16e499ae..aced20e3b 100644
          this.entityList.removeAll(this.f);
  
          int j;
-@@ -1403,6 +1404,7 @@ public abstract class World implements IBlockAccess {
+@@ -1404,6 +1405,7 @@ public abstract class World implements IBlockAccess {
  
          this.f.clear();
          this.l();
@@ -1209,7 +1209,7 @@ index d16e499ae..aced20e3b 100644
          this.methodProfiler.c("regular");
  
          CrashReportSystemDetails crashreportsystemdetails1;
-@@ -1412,6 +1414,7 @@ public abstract class World implements IBlockAccess {
+@@ -1413,6 +1415,7 @@ public abstract class World implements IBlockAccess {
          timings.entityTick.startTiming(); // Spigot
          guardEntityList = true; // Spigot
          // CraftBukkit start - Use field for loop variable
@@ -1217,7 +1217,7 @@ index d16e499ae..aced20e3b 100644
          int entitiesThisCycle = 0;
          if (tickPosition < 0) tickPosition = 0;
          for (entityLimiter.initTick();
-@@ -1433,10 +1436,11 @@ public abstract class World implements IBlockAccess {
+@@ -1434,10 +1437,11 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead && !(entity instanceof EntityPlayer)) {
                  try {
@@ -1231,7 +1231,7 @@ index d16e499ae..aced20e3b 100644
                      crashreport1 = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
                      entity.appendEntityCrashDetails(crashreportsystemdetails1);
-@@ -1569,6 +1573,7 @@ public abstract class World implements IBlockAccess {
+@@ -1570,6 +1574,7 @@ public abstract class World implements IBlockAccess {
          }
  
          timings.tileEntityPending.stopTiming(); // Spigot
@@ -1239,7 +1239,7 @@ index d16e499ae..aced20e3b 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1627,7 +1632,6 @@ public abstract class World implements IBlockAccess {
+@@ -1628,7 +1633,6 @@ public abstract class World implements IBlockAccess {
          }
          // CraftBukkit end
  
@@ -1247,7 +1247,7 @@ index d16e499ae..aced20e3b 100644
          entity.M = entity.locX;
          entity.N = entity.locY;
          entity.O = entity.locZ;
-@@ -1635,6 +1639,7 @@ public abstract class World implements IBlockAccess {
+@@ -1636,6 +1640,7 @@ public abstract class World implements IBlockAccess {
          entity.lastPitch = entity.pitch;
          if (flag && entity.aa) {
              ++entity.ticksLived;
@@ -1255,7 +1255,7 @@ index d16e499ae..aced20e3b 100644
              if (entity.isPassenger()) {
                  entity.aE();
              } else {
-@@ -1694,8 +1699,6 @@ public abstract class World implements IBlockAccess {
+@@ -1695,8 +1700,6 @@ public abstract class World implements IBlockAccess {
                  }
              }
          }
@@ -1265,7 +1265,7 @@ index d16e499ae..aced20e3b 100644
  
      public boolean b(AxisAlignedBB axisalignedbb) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7bed637ab..ce8fe791d 100644
+index 8afe1d3d..00b09397 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -304,13 +304,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1399,7 +1399,7 @@ index 7bed637ab..ce8fe791d 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 83a4692af..5c05ae407 100644
+index 83a4692a..5c05ae40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1743,6 +1743,7 @@ public final class CraftServer implements Server {
@@ -1437,7 +1437,7 @@ index 83a4692af..5c05ae407 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 311a2c3f6..000000000
+index 311a2c3f..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -1616,7 +1616,7 @@ index 311a2c3f6..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b4465..b5efb9c3f 100644
+index 3a95b446..b5efb9c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1660,7 +1660,7 @@ index 3a95b4465..b5efb9c3f 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 001b6040f..d4c8fafe7 100644
+index 001b6040..d4c8fafe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -38,7 +38,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1686,7 +1686,7 @@ index 001b6040f..d4c8fafe7 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 92d217bce..9952b64be 100644
+index 92d217bc..9952b64b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -1762,7 +1762,7 @@ index 92d217bce..9952b64be 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 220e39abe..afc6c17e6 100644
+index 220e39ab..afc6c17e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1844,7 +1844,7 @@ index 220e39abe..afc6c17e6 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b7..3d90b3426 100644
+index e52ef47b..3d90b342 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1856,7 +1856,7 @@ index e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 2bd690fdf..38be7ed71 100644
+index 2bd690fd..38be7ed7 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither;
@@ -1918,5 +1918,5 @@ index 2bd690fdf..38be7ed71 100644
      }
  }
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
index 54b02d940a..ed05c9a6ee 100644
--- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
@@ -1,11 +1,11 @@
-From c5a7c0ba9574716e0b6f153425fd55d873a4c8b5 Mon Sep 17 00:00:00 2001
+From 0e729e406610f5d057c235a68bb6ba79dd108b90 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 995a9ddb1..d7061ce01 100644
+index b8479d9c..e9509e61 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index 995a9ddb1..d7061ce01 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index bb27f5dd8..65b7b33be 100644
+index 0c2f7e1d..b594602a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -614,7 +614,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -30,7 +30,7 @@ index bb27f5dd8..65b7b33be 100644
                  double d1 = entityhuman.locY - this.locY;
                  double d2 = entityhuman.locZ - this.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 130aafc83..7d486f1ca 100644
+index 50bca48b..57552c52 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -44,7 +44,7 @@ index 130aafc83..7d486f1ca 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index a599a043d..1c7c187c7 100644
+index a599a043..1c7c187c 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -52,7 +52,7 @@ public final class SpawnerCreature {
@@ -57,10 +57,10 @@ index a599a043d..1c7c187c7 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2ba929100..4fc95c86b 100644
+index d6d8cd90..9e505cce 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2734,7 +2734,7 @@ public abstract class World implements IBlockAccess {
+@@ -2735,7 +2735,7 @@ public abstract class World implements IBlockAccess {
          for (int i = 0; i < this.players.size(); ++i) {
              EntityHuman entityhuman = (EntityHuman) this.players.get(i);
  
@@ -70,7 +70,7 @@ index 2ba929100..4fc95c86b 100644
  
                  if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d10177669..4f80d0443 100644
+index d4c8fafe..49f91a8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -91,5 +91,5 @@ index d10177669..4f80d0443 100644
  
      // Spigot start
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
index a0e1c203a9..a5691baa26 100644
--- a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,11 +1,11 @@
-From 7ba47ec34e529b95814c1ffe95d06319411647bc Mon Sep 17 00:00:00 2001
+From 42fd2bd1fed5b2bc5acf04ea956e6b474ca1b6f6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index e02f0c442..39be107fd 100644
+index e02f0c44..39be107f 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -175,7 +175,12 @@ public abstract class TileEntity {
@@ -23,10 +23,10 @@ index e02f0c442..39be107fd 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c6cf7754b..b1addedeb 100644
+index 7646e824..ebc05bd0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1448,10 +1448,12 @@ public abstract class World implements IBlockAccess {
+@@ -1449,10 +1449,12 @@ public abstract class World implements IBlockAccess {
                      entity.tickTimer.stopTiming(); // Paper
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
@@ -43,7 +43,7 @@ index c6cf7754b..b1addedeb 100644
                  }
              }
  
-@@ -1514,10 +1516,13 @@ public abstract class World implements IBlockAccess {
+@@ -1515,10 +1517,13 @@ public abstract class World implements IBlockAccess {
                          ((ITickable) tileentity).e();
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
@@ -62,5 +62,5 @@ index c6cf7754b..b1addedeb 100644
                      // Spigot start
                      finally {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
index d1bdbe8460..ce24408621 100644
--- a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
@@ -1,14 +1,14 @@
-From 6a671d7b63704d31fbe9e8516894678c7d38d63c Mon Sep 17 00:00:00 2001
+From d28719016c7ff39807739c19c979f752698fb830 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index dfd6c8a3d..4b49d1976 100644
+index 9bc1b7a4..c284a804 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1425,10 +1425,10 @@ public abstract class World implements IBlockAccess {
+@@ -1426,10 +1426,10 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - Use field for loop variable
          co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
          int entitiesThisCycle = 0;
@@ -23,7 +23,7 @@ index dfd6c8a3d..4b49d1976 100644
              tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
              entity = (Entity) this.entityList.get(this.tickPosition);
              // CraftBukkit end
-@@ -1494,9 +1494,7 @@ public abstract class World implements IBlockAccess {
+@@ -1495,9 +1495,7 @@ public abstract class World implements IBlockAccess {
          // Spigot start
          // Iterator iterator = this.tileEntityListTick.iterator();
          int tilesThisCycle = 0;
@@ -35,5 +35,5 @@ index dfd6c8a3d..4b49d1976 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
index 46f40c3a32..cd6c344207 100644
--- a/Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,11 +1,11 @@
-From c10d4e6ffdad85dffd1f525ce21df81dfb510ebc Mon Sep 17 00:00:00 2001
+From e7e5b63d3adfe0c2a9b034106962374272746b26 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ff62a44b5..3fdf091c8 100644
+index ff62a44b..3fdf091c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -122,10 +122,10 @@ public abstract class Entity implements ICommandListener {
@@ -24,7 +24,7 @@ index ff62a44b5..3fdf091c8 100644
      public boolean impulse;
      public int portalCooldown;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 10a07db76..b36891b96 100644
+index c284a804..8334f2a1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -53,7 +53,7 @@ index 10a07db76..b36891b96 100644
      public final List<EntityHuman> players = Lists.newArrayList();
      public final List<Entity> j = Lists.newArrayList();
      protected final IntHashMap<Entity> entitiesById = new IntHashMap();
-@@ -1396,20 +1401,20 @@ public abstract class World implements IBlockAccess {
+@@ -1397,20 +1402,20 @@ public abstract class World implements IBlockAccess {
          this.entityList.removeAll(this.f);
  
          int j;
@@ -84,5 +84,5 @@ index 10a07db76..b36891b96 100644
          this.f.clear();
          this.l();
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0061-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
index 5f3d024ca1..4b453aa3a3 100644
--- a/Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From f886b587c1e143d75dd7495dca68cde2e3175d1f Mon Sep 17 00:00:00 2001
+From 6782f2b68e7c40b5b6e9446545d9ee37a4c25ae9 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 new file mode 100644
-index 000000000..93397188b
+index 00000000..93397188
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 @@ -0,0 +1,38 @@
@@ -50,7 +50,7 @@ index 000000000..93397188b
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9c7b81a8b..491278646 100644
+index c8e52eab..33737af7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -89,7 +89,7 @@ index 9c7b81a8b..491278646 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index ba720204d..9449b645d 100644
+index ba720204..9449b645 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -12,6 +12,7 @@ import java.util.Iterator;
@@ -144,7 +144,7 @@ index ba720204d..9449b645d 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 83322b85b..b943a9b20 100644
+index 83322b85..b943a9b2 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -1,5 +1,7 @@
@@ -172,7 +172,7 @@ index 83322b85b..b943a9b20 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java
-index 936d6c640..50056f49a 100644
+index 936d6c64..50056f49 100644
 --- a/src/main/java/net/minecraft/server/PersistentCollection.java
 +++ b/src/main/java/net/minecraft/server/PersistentCollection.java
 @@ -1,5 +1,6 @@
@@ -199,7 +199,7 @@ index 936d6c640..50056f49a 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 1ba26de5c..6a92b5af8 100644
+index 1ba26de5..6a92b5af 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -1,5 +1,6 @@
@@ -226,7 +226,7 @@ index 1ba26de5c..6a92b5af8 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index c15a0d1f8..5f9e9ddef 100644
+index c15a0d1f..5f9e9dde 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -1,5 +1,6 @@
@@ -245,7 +245,7 @@ index c15a0d1f8..5f9e9ddef 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index c56a8e9c2..fdc439914 100644
+index 1c7c187c..68a04532 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -7,6 +7,7 @@ import java.util.Random;
@@ -273,7 +273,7 @@ index c56a8e9c2..fdc439914 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 9ff4f23ab..6fce3015f 100644
+index 9ff4f23a..6fce3015 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -1,5 +1,7 @@
@@ -293,7 +293,7 @@ index 9ff4f23ab..6fce3015f 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b7f502ecd..1fc7ec6f4 100644
+index 8334f2a1..86091eba 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -304,7 +304,7 @@ index b7f502ecd..1fc7ec6f4 100644
  import com.google.common.base.Function;
  import com.google.common.base.MoreObjects;
  import com.google.common.base.Predicate;
-@@ -1456,8 +1458,10 @@ public abstract class World implements IBlockAccess {
+@@ -1457,8 +1459,10 @@ public abstract class World implements IBlockAccess {
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
                      // Paper start - Prevent tile entity and entity crashes
@@ -316,7 +316,7 @@ index b7f502ecd..1fc7ec6f4 100644
                      entity.dead = true;
                      continue;
                      // Paper end
-@@ -1522,8 +1526,10 @@ public abstract class World implements IBlockAccess {
+@@ -1523,8 +1527,10 @@ public abstract class World implements IBlockAccess {
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
                          // Paper start - Prevent tile entity and entity crashes
@@ -329,7 +329,7 @@ index b7f502ecd..1fc7ec6f4 100644
                          this.tileEntityListTick.remove(tileTickPosition--);
                          continue;
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 9952b64be..e30cfb7b7 100644
+index 9952b64b..e30cfb7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -15,6 +15,9 @@ import java.util.concurrent.atomic.AtomicReference;
@@ -373,5 +373,5 @@ index 9952b64be..e30cfb7b7 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0082-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0082-Fix-SkullCache-case-bug.patch
deleted file mode 100644
index 95c2f551de..0000000000
--- a/Spigot-Server-Patches/0082-Fix-SkullCache-case-bug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a2147b31bd1fb9437f7c1798dfbe54094c5e63b6 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 5 Jan 2016 21:48:24 -0500
-Subject: [PATCH] Fix SkullCache case bug
-
-
-diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 91ca4a279..edd6fb69e 100644
---- a/src/main/java/net/minecraft/server/TileEntitySkull.java
-+++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
-@@ -191,7 +191,7 @@ public class TileEntitySkull extends TileEntity implements ITickable {
-             } else if (MinecraftServer.getServer() == null) {
-                 callback.apply(gameprofile);
-             } else {
--                GameProfile profile = skinCache.getIfPresent(gameprofile.getName());
-+                GameProfile profile = skinCache.getIfPresent(gameprofile.getName().toLowerCase()); // Paper
-                 if (profile != null && Iterables.getFirst(profile.getProperties().get("textures"), (Object) null) != null) {
-                     callback.apply(profile);
-                 } else {
--- 
-2.12.2
-
diff --git a/Spigot-Server-Patches/0083-Waving-banner-workaround.patch b/Spigot-Server-Patches/0082-Waving-banner-workaround.patch
similarity index 91%
rename from Spigot-Server-Patches/0083-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0082-Waving-banner-workaround.patch
index 8ec9022ebe..e71851c1b4 100644
--- a/Spigot-Server-Patches/0083-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0082-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 96170e1bb8ded97c9342424fde70df1f8d058787 Mon Sep 17 00:00:00 2001
+From f232c0220c8e33143f2c82cb67e8645356e4ab20 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround
 This patch is a workaround for MC-63720
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
-index c5c3f40ce..6413f76e7 100644
+index c5c3f40c..6413f76e 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 @@ -4,7 +4,13 @@ import java.io.IOException;
@@ -34,5 +34,5 @@ index c5c3f40ce..6413f76e7 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0084-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch
similarity index 91%
rename from Spigot-Server-Patches/0084-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch
index 35fe53692c..8e1d89cfa9 100644
--- a/Spigot-Server-Patches/0084-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 973464436acb53d2f606b3007faf0bf176912a26 Mon Sep 17 00:00:00 2001
+From a5dc590c23d883f4eda7cd93a563cdf3646b04da Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dbaf2863b..aabf25cf2 100644
+index f26a438a..8aba80c0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,5 +27,5 @@ index dbaf2863b..aabf25cf2 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0085-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch
similarity index 88%
rename from Spigot-Server-Patches/0085-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch
index df28a8a560..ef5e84640c 100644
--- a/Spigot-Server-Patches/0085-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From d21c30d407d2f865c3bed78c6a195302b44fadd4 Mon Sep 17 00:00:00 2001
+From 2dfb489e7082a288341115f352fa8f1ceaac2390 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -7,7 +7,7 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index aabf25cf2..b3911fa9f 100644
+index 8aba80c0..9bd55e6a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2344,7 +2344,7 @@ public abstract class Entity implements ICommandListener {
@@ -20,5 +20,5 @@ index aabf25cf2..b3911fa9f 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0086-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0085-Optimize-Chunk-Access.patch
similarity index 94%
rename from Spigot-Server-Patches/0086-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0085-Optimize-Chunk-Access.patch
index 75dc5c1e98..0ded9ae1c0 100644
--- a/Spigot-Server-Patches/0086-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0085-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 8938542fec81aff213567b6bb3c3ffe88958597c Mon Sep 17 00:00:00 2001
+From 970bfaa3a4f890a498b229a790fef7cb6780de63 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 0ad57afba..b49f4e292 100644
+index 9449b645..c81b404b 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 0ad57afba..b49f4e292 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0087-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0086-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 92%
rename from Spigot-Server-Patches/0087-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0086-Configurable-spawn-chances-for-skeleton-horses.patch
index 1485d01005..111183306b 100644
--- a/Spigot-Server-Patches/0087-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0086-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,11 +1,11 @@
-From 9aa7a384e7927d118c17e7dad6688f72d91a0361 Mon Sep 17 00:00:00 2001
+From 6e18fbc081ded96ffa9b24ea6dfbcb1a49bfe924 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b37b5901b..adc810720 100644
+index b37b5901..adc81072 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -263,4 +263,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index b37b5901b..adc810720 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index bb07b1d66..2e5e8a99f 100644
+index a00837f9..8e4697a0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -493,7 +493,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -32,5 +32,5 @@ index bb07b1d66..2e5e8a99f 100644
  
                              entityhorseskeleton.p(true);
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0088-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 96%
rename from Spigot-Server-Patches/0088-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index e6c7273467..771aede356 100644
--- a/Spigot-Server-Patches/0088-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 0417cbd32cabe9da9575c5a0e01ba1f49bda5d91 Mon Sep 17 00:00:00 2001
+From ca23836db78750c49d8181f831f91eb1507ad0b1 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
@@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index d55e180d7..679d5504e 100644
+index d55e180d..679d5504 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -31,7 +31,7 @@ index d55e180d7..679d5504e 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 67b476b22..008ed206d 100644
+index 67b476b2..008ed206 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition {
@@ -52,7 +52,7 @@ index 67b476b22..008ed206d 100644
          public MutableBlockPosition() {
              this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c0d6e056d..88f5ce9e2 100644
+index 1a77dfe4..7eb8deb2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -406,11 +406,27 @@ public class Chunk {
@@ -86,7 +86,7 @@ index c0d6e056d..88f5ce9e2 100644
              IBlockData iblockdata = null;
  
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 3d784d0dc..afdc4a779 100644
+index 3d784d0d..afdc4a77 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -5,7 +5,7 @@ public class ChunkSection {
@@ -99,7 +99,7 @@ index 3d784d0dc..afdc4a779 100644
      private NibbleArray skyLight;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b34af0ffc..c3fbbab09 100644
+index 90229072..e19066ae 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -275,12 +275,12 @@ public abstract class World implements IBlockAccess {
@@ -228,7 +228,7 @@ index b34af0ffc..c3fbbab09 100644
  
      public boolean D() {
          return this.L < 4;
-@@ -2024,7 +2033,7 @@ public abstract class World implements IBlockAccess {
+@@ -2025,7 +2034,7 @@ public abstract class World implements IBlockAccess {
      public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
      @Nullable
      public TileEntity getTileEntity(BlockPosition blockposition) {
@@ -237,7 +237,7 @@ index b34af0ffc..c3fbbab09 100644
              return null;
          } else {
              // CraftBukkit start
-@@ -2065,7 +2074,7 @@ public abstract class World implements IBlockAccess {
+@@ -2066,7 +2075,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@@ -246,7 +246,7 @@ index b34af0ffc..c3fbbab09 100644
              if (tileentity != null && !tileentity.y()) {
              // CraftBukkit start
              if (captureBlockStates) {
-@@ -2128,7 +2137,7 @@ public abstract class World implements IBlockAccess {
+@@ -2129,7 +2138,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean d(BlockPosition blockposition, boolean flag) {
@@ -256,5 +256,5 @@ index b34af0ffc..c3fbbab09 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0089-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0088-Fix-cooked-fish-legacy-import.patch
similarity index 90%
rename from Spigot-Server-Patches/0089-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0088-Fix-cooked-fish-legacy-import.patch
index e3a8e27d83..c347e5f45f 100644
--- a/Spigot-Server-Patches/0089-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0088-Fix-cooked-fish-legacy-import.patch
@@ -1,11 +1,11 @@
-From 2625d905b5bca32ef5791458afd8467897344162 Mon Sep 17 00:00:00 2001
+From 62ffa640940adcb317f89eea7f5a29462ab9c909 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
 
 
 diff --git a/src/main/java/net/minecraft/server/DataConverterMaterialId.java b/src/main/java/net/minecraft/server/DataConverterMaterialId.java
-index 87b82eb35..a7c71f406 100644
+index 87b82eb3..a7c71f40 100644
 --- a/src/main/java/net/minecraft/server/DataConverterMaterialId.java
 +++ b/src/main/java/net/minecraft/server/DataConverterMaterialId.java
 @@ -261,7 +261,7 @@ public class DataConverterMaterialId implements IDataConverter {
@@ -18,5 +18,5 @@ index 87b82eb35..a7c71f406 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0090-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0089-Access-items-by-EquipmentSlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0090-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0089-Access-items-by-EquipmentSlot.patch
index 1bf5300d17..ead38926f0 100644
--- a/Spigot-Server-Patches/0090-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0089-Access-items-by-EquipmentSlot.patch
@@ -1,11 +1,11 @@
-From 17984e7eda68b702b546526305d27a2629e5a940 Mon Sep 17 00:00:00 2001
+From 285fe26f0a72087b51c40caee4383d985340d523 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 67c54899d..3f58c34e0 100644
+index 67c54899..3f58c34e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -267,4 +267,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
@@ -64,5 +64,5 @@ index 67c54899d..3f58c34e0 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0091-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0090-Check-async-remove-unused-vars-GH-159.patch
similarity index 93%
rename from Spigot-Server-Patches/0091-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0090-Check-async-remove-unused-vars-GH-159.patch
index bacda7af37..605cfc6eb0 100644
--- a/Spigot-Server-Patches/0091-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0090-Check-async-remove-unused-vars-GH-159.patch
@@ -1,11 +1,11 @@
-From a3ebbcc8a6227f77b06ad81db03bb9a514dfaa3d Mon Sep 17 00:00:00 2001
+From 95c8f83b6d05e0a205c94a3f9c0509617ee71061 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159
 
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index c79fb7d57..8749a1879 100644
+index 68a04532..45a83ae9 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -40,6 +40,7 @@ public final class SpawnerCreature {
@@ -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.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0092-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 95%
rename from Spigot-Server-Patches/0092-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 0b84cc2a1a..a1e45e2c18 100644
--- a/Spigot-Server-Patches/0092-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 8e6bc310090192bf599d955b96585a85e998f356 Mon Sep 17 00:00:00 2001
+From 262a1d182955a140f994362012b6901334abab19 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -11,7 +11,7 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index adc810720..e706efff5 100644
+index adc81072..e706efff 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -268,4 +268,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index adc810720..e706efff5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3a61c67a1..2ca46b05b 100644
+index e19066ae..aeaf7495 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -580,7 +580,7 @@ public abstract class World implements IBlockAccess {
@@ -38,7 +38,7 @@ index 3a61c67a1..2ca46b05b 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2e5e8a99f..e37847e6c 100644
+index 8e4697a0..3865b31c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -67,5 +67,5 @@ index 2e5e8a99f..e37847e6c 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0093-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0092-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 89%
rename from Spigot-Server-Patches/0093-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0092-Entity-AddTo-RemoveFrom-World-Events.patch
index 291bf46511..78e85b9e8f 100644
--- a/Spigot-Server-Patches/0093-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0092-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,11 +1,11 @@
-From e58bd8dd6ef47687c17109b69e0fcabec2e9a25d Mon Sep 17 00:00:00 2001
+From 19eb951f6074ee625dd7df5ffee8e39afdc8f3e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b8719ba91..ae470656b 100644
+index aeaf7495..815ca3b5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1185,6 +1185,7 @@ public abstract class World implements IBlockAccess {
@@ -25,5 +25,5 @@ index b8719ba91..ae470656b 100644
      }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0094-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0093-Configurable-Chunk-Inhabited-Timer.patch
similarity index 90%
rename from Spigot-Server-Patches/0094-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0093-Configurable-Chunk-Inhabited-Timer.patch
index 71be152e32..11741e4512 100644
--- a/Spigot-Server-Patches/0094-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0093-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 4547f644988475da576ddf500a86a4334f875115 Mon Sep 17 00:00:00 2001
+From 1875459e0b11e6b9611b7e55e64b4c2508a60072 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -9,7 +9,7 @@ aspects of vanilla gameplay to this factor.
 For people who want all chunks to be treated equally, you can disable the timer.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e706efff5..2c682ccf7 100644
+index e706efff..2c682ccf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -273,4 +273,9 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index e706efff5..2c682ccf7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 88f5ce9e2..15494d0b1 100644
+index 7eb8deb2..32166ee8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1407,7 +1407,7 @@ public class Chunk {
@@ -36,5 +36,5 @@ index 88f5ce9e2..15494d0b1 100644
  
      public void c(long i) {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0095-EntityPathfindEvent.patch b/Spigot-Server-Patches/0094-EntityPathfindEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0095-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0094-EntityPathfindEvent.patch
index ffde63b36b..1b229a5342 100644
--- a/Spigot-Server-Patches/0095-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0094-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 41b32f64e3ff49cf3317f8b5e0309ad4a2597dc7 Mon Sep 17 00:00:00 2001
+From ad43c73e95af0079283990272e0583063d7dd4ca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent
 Fires when an Entity decides to start moving to a location.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 3e598afd4..3871ad017 100644
+index cc44d30b..3ac6f84d 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -4,7 +4,7 @@ import javax.annotation.Nullable;
@@ -35,5 +35,5 @@ index 3e598afd4..3871ad017 100644
                  float f = this.i();
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0096-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0095-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 95%
rename from Spigot-Server-Patches/0096-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0095-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index 80399aaf0f..1545c8ddf3 100644
--- a/Spigot-Server-Patches/0096-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0095-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From 27d2f7402fbcc5a781235180d7e34cea0e58de11 Mon Sep 17 00:00:00 2001
+From fd37edca846d81afb65cd70f00f7b94d3b61bf39 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
@@ -12,7 +12,7 @@ of unloaded chunks anyways.
 This keeps behavior consistent, vs inconsistent flowing based on plugin triggered loads.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 0a2823686..8eba70b01 100644
+index 739b9aac..ff90e08e 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -96,6 +96,7 @@ public class BlockFlowing extends BlockFluids {
@@ -48,5 +48,5 @@ index 0a2823686..8eba70b01 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0097-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0096-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 94%
rename from Spigot-Server-Patches/0097-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0096-Reduce-IO-ops-opening-a-new-region-file.patch
index 25cce3f154..590ca32c2c 100644
--- a/Spigot-Server-Patches/0097-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0096-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,11 +1,11 @@
-From 74b4e2221ce77426cb87a083743e479e615b134d Mon Sep 17 00:00:00 2001
+From 3619fe0c11a4a4d44e4c69b4777030fa69aa52c5 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 ed840dbc9..4008a2143 100644
+index 5bcbd718..2bd85e2d 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 ed840dbc9..4008a2143 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0098-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0097-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0098-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0097-Sanitise-RegionFileCache-and-make-configurable.patch
index 63b825bcf2..c1fec2c85d 100644
--- a/Spigot-Server-Patches/0098-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0097-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From 4ed79ffa63f9c4560e4b94d5380a5244b7bf7a53 Mon Sep 17 00:00:00 2001
+From a774cbcdff02938f6689937656fd836f34fa848e Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b5ff26c71..62cbe0cf3 100644
+index 2f6e169f..ec464338 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -215,4 +215,9 @@ public class PaperConfig {
@@ -25,7 +25,7 @@ index b5ff26c71..62cbe0cf3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 02b9bc8df..91b55074e 100644
+index 5f9e9dde..7e756580 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;
@@ -77,5 +77,5 @@ index 02b9bc8df..91b55074e 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0099-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0098-Use-Optimized-Collections.patch
similarity index 94%
rename from Spigot-Server-Patches/0099-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0098-Use-Optimized-Collections.patch
index b33349086c..75d7f6eaf5 100644
--- a/Spigot-Server-Patches/0099-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0098-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 496ccba6660d6bbb0f5f685ddde99994b5dc8049 Mon Sep 17 00:00:00 2001
+From 147fdac9554b71e235db05a344cd6d5dbda149a4 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 b49f4e292..dd37bec73 100644
+index c81b404b..4d0cb971 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;
@@ -26,7 +26,7 @@ index b49f4e292..dd37bec73 100644
      private final IChunkLoader chunkLoader;
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 419add5db..820c15278 100644
+index 1507f97f..fe848445 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
 @@ -12,6 +12,7 @@ import java.util.Map;
@@ -47,5 +47,5 @@ index 419add5db..820c15278 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0100-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0099-Do-not-load-chunks-for-light-checks.patch
similarity index 88%
rename from Spigot-Server-Patches/0100-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0099-Do-not-load-chunks-for-light-checks.patch
index b758b7f55c..dfca2195ca 100644
--- a/Spigot-Server-Patches/0100-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0099-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 9c522bb9ad65ef25793a4b39034ba45e9d7fe8a4 Mon Sep 17 00:00:00 2001
+From 6d3f482a0e531d256ae01e19f155152fcf559782 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ae470656b..036d96fa7 100644
+index 815ca3b5..553d9724 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -762,6 +762,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index ae470656b..036d96fa7 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0101-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0101-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
index b96f2f1356..4bf0adedf0 100644
--- a/Spigot-Server-Patches/0101-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,11 +1,11 @@
-From a107799aea60397b9784f188af71bf2c2f4399d1 Mon Sep 17 00:00:00 2001
+From 6e3b2cd9714a42a94043d35b6f4805e97ce1d975 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index c67cb54a3..521f46262 100644
+index c67cb54a..521f4626 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ index c67cb54a3..521f46262 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cef07eb1b..e20a166b7 100644
+index 643c8e12..4c90d1d4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1645,6 +1645,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -39,5 +39,5 @@ index cef07eb1b..e20a166b7 100644
      }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0102-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 90%
rename from Spigot-Server-Patches/0102-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 8604935de7..6b9a87eb89 100644
--- a/Spigot-Server-Patches/0102-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From f7d4407c751b874ca036f5621c2b9610b6c1bd9d Mon Sep 17 00:00:00 2001
+From 2f8a388386c6602545ebd65522362757432f2de2 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 7c73e08c3..45ad22c8f 100644
+index 3a5f2108..d54d7270 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -156,6 +156,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index 7c73e08c3..45ad22c8f 100644
          entityplayer.getStatisticManager().c();
          entityplayer.F().a(entityplayer);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0103-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0102-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 92%
rename from Spigot-Server-Patches/0103-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0102-Configurable-Grass-Spread-Tick-Rate.patch
index 58e4131f95..ad91d0bcc7 100644
--- a/Spigot-Server-Patches/0103-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0102-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,11 +1,11 @@
-From 1fe88d4e46aaa004cfaa8f6497721136ec46baf3 Mon Sep 17 00:00:00 2001
+From cbb44b27b60dca8248b7097389a2d1c6c2875dcd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2c682ccf7..74a49a5fb 100644
+index 2c682ccf..74a49a5f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -278,4 +278,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 2c682ccf7..74a49a5fb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
-index 8b43e6070..5cbc95f7c 100644
+index 8fc736d6..b656994b 100644
 --- a/src/main/java/net/minecraft/server/BlockGrass.java
 +++ b/src/main/java/net/minecraft/server/BlockGrass.java
 @@ -28,6 +28,7 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement {
@@ -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.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 93%
rename from Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index b83a51e039..5dc3b2dba6 100644
--- a/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 39eeed32ece9580f2212ed6f460ddcfa186985ca Mon Sep 17 00:00:00 2001
+From b23a445e2c33927e5ea376614dc0054e231d158c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 74a49a5fb..3a942c763 100644
+index 74a49a5f..3a942c76 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -284,4 +284,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 74a49a5fb..3a942c763 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6e11ba5b6..71b66bbdf 100644
+index 6e11ba5b..71b66bbd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -356,8 +356,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -39,10 +39,10 @@ index 6e11ba5b6..71b66bbdf 100644
  
                      if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1276d2b8a..3e5202c41 100644
+index 553d9724..e9446b9c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3207,8 +3207,9 @@ public abstract class World implements IBlockAccess {
+@@ -3208,8 +3208,9 @@ public abstract class World implements IBlockAccess {
          int k = i * 16 + 8 - blockposition.getX();
          int l = j * 16 + 8 - blockposition.getZ();
          boolean flag = true;
@@ -54,7 +54,7 @@ index 1276d2b8a..3e5202c41 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 522936568..a7dd7988e 100644
+index 52293656..a7dd7988 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -955,7 +955,7 @@ public final class CraftServer implements Server {
@@ -67,7 +67,7 @@ index 522936568..a7dd7988e 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 843a3415f..24b4a7ea7 100644
+index 843a3415..24b4a7ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1275,8 +1275,9 @@ public class CraftWorld implements World {
@@ -83,5 +83,5 @@ index 843a3415f..24b4a7ea7 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0105-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 87%
rename from Spigot-Server-Patches/0105-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 75cc599f5c..9476b03ce1 100644
--- a/Spigot-Server-Patches/0105-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,11 +1,11 @@
-From 907e7c092e0da791c9f24d9c649391fa30158081 Mon Sep 17 00:00:00 2001
+From 7581275bb1126e27d8fef11e75bae21ee10f42d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b3c580836..fb24b5407 100644
+index e9446b9c..777419d8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -534,6 +534,7 @@ public abstract class World implements IBlockAccess {
@@ -17,5 +17,5 @@ index b3c580836..fb24b5407 100644
          this.a(blockposition.east(), block, blockposition);
          this.a(blockposition.down(), block, blockposition);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0106-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 84%
rename from Spigot-Server-Patches/0106-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index bab92d7d08..fa2f713bbc 100644
--- a/Spigot-Server-Patches/0106-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,14 +1,14 @@
-From e06cfd125b1f04920cc48fa9d18f84be882bb1d1 Mon Sep 17 00:00:00 2001
+From 6e04dc8bb1d269539abead607ba0030bcc6a3ee2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 65f84b419..958af4121 100644
+index 777419d8..5d84c11c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3203,6 +3203,7 @@ public abstract class World implements IBlockAccess {
+@@ -3204,6 +3204,7 @@ public abstract class World implements IBlockAccess {
          return this.P;
      }
  
@@ -17,7 +17,7 @@ index 65f84b419..958af4121 100644
          BlockPosition blockposition = this.getSpawn();
          int k = i * 16 + 8 - blockposition.getX();
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index d0265f960..35d8d1a6e 100644
+index d0265f96..35d8d1a6 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -138,6 +138,6 @@ public abstract class WorldProvider {
@@ -29,5 +29,5 @@ index d0265f960..35d8d1a6e 100644
      }
  }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0107-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0106-Remove-Debug-checks-from-DataBits.patch
similarity index 93%
rename from Spigot-Server-Patches/0107-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0106-Remove-Debug-checks-from-DataBits.patch
index 64b12bf2bb..c1e15f35d4 100644
--- a/Spigot-Server-Patches/0107-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0106-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From 42daee8ec642e2c2ce5c8c9372e1d39e16443bd8 Mon Sep 17 00:00:00 2001
+From d0114b304c138b711dea367a58c06e2b41065b87 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
@@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png
 After: http://i.imgur.com/nJ46crB.png
 
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index f3a6799a8..fa0fd8a9c 100644
+index f3a6799a..fa0fd8a9 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -10,7 +10,7 @@ public class 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.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0108-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 93%
rename from Spigot-Server-Patches/0108-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 1708aa209b..5d56501fb6 100644
--- a/Spigot-Server-Patches/0108-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,11 +1,11 @@
-From a82b7c5ccebec5ba3024bb82d07253ed95c6041a Mon Sep 17 00:00:00 2001
+From 15e97b9f1f1f18bd04fe19e3658909671796f98a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3a942c763..3bd29650c 100644
+index 3a942c76..3bd29650 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -290,4 +290,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 3a942c763..3bd29650c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ed8c72300..468d64316 100644
+index 9bd55e6a..0d92e604 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2073,6 +2073,7 @@ public abstract class Entity implements ICommandListener {
@@ -31,7 +31,7 @@ index ed8c72300..468d64316 100644
      public ScoreboardTeamBase aY() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4c90d1d40..75f43f420 100644
+index 4c90d1d4..75f43f42 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1378,7 +1378,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -51,5 +51,5 @@ index 4c90d1d40..75f43f420 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch
index 2101d9a345..f64ee126e6 100644
--- a/Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From a58421c225b9c822b0477e77ec5220400ada6a3c Mon Sep 17 00:00:00 2001
+From 285964ae5235a341b20a8de6830cf72c958f4806 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 cf210d43b..71034f945 100644
+index 74944159..747de51d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -596,6 +596,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index cf210d43b..71034f945 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0110-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch
similarity index 88%
rename from Spigot-Server-Patches/0110-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch
index 1beac53810..1e32ab3e1b 100644
--- a/Spigot-Server-Patches/0110-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 82c7dc3bfbfca450a60aae93d60424c42f48d038 Mon Sep 17 00:00:00 2001
+From 8f6f830dfa1cca909838bb66f3a13f41bb85881d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 958af4121..755e7a0d8 100644
+index 5d84c11c..5e0eb668 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@@ -18,7 +18,7 @@ index 958af4121..755e7a0d8 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> b = Lists.newArrayList();
      private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
-@@ -1571,7 +1571,7 @@ public abstract class World implements IBlockAccess {
+@@ -1572,7 +1572,7 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - From below, clean up tile entities before ticking them
          if (!this.tileEntityListUnload.isEmpty()) {
              this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@@ -27,7 +27,7 @@ index 958af4121..755e7a0d8 100644
              this.tileEntityListUnload.clear();
          }
          // CraftBukkit end
-@@ -1622,7 +1622,7 @@ public abstract class World implements IBlockAccess {
+@@ -1623,7 +1623,7 @@ public abstract class World implements IBlockAccess {
              if (tileentity.y()) {
                  tilesThisCycle--;
                  this.tileEntityListTick.remove(tileTickPosition--);
@@ -36,7 +36,7 @@ index 958af4121..755e7a0d8 100644
                  if (this.isLoaded(tileentity.getPosition())) {
                      this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
                  }
-@@ -1660,7 +1660,7 @@ public abstract class World implements IBlockAccess {
+@@ -1661,7 +1661,7 @@ public abstract class World implements IBlockAccess {
                          this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
                          // CraftBukkit start
                          // From above, don't screw this up - SPIGOT-1746
@@ -45,7 +45,7 @@ index 958af4121..755e7a0d8 100644
                              this.a(tileentity1);
                          }
                          // CraftBukkit end
-@@ -1680,9 +1680,9 @@ public abstract class World implements IBlockAccess {
+@@ -1681,9 +1681,9 @@ public abstract class World implements IBlockAccess {
      protected void l() {}
  
      public boolean a(TileEntity tileentity) {
@@ -57,7 +57,7 @@ index 958af4121..755e7a0d8 100644
              this.tileEntityListTick.add(tileentity);
          }
  
-@@ -2121,7 +2121,7 @@ public abstract class World implements IBlockAccess {
+@@ -2122,7 +2122,7 @@ public abstract class World implements IBlockAccess {
          } else {
              if (tileentity != null) {
                  this.b.remove(tileentity);
@@ -67,5 +67,5 @@ index 958af4121..755e7a0d8 100644
              }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0111-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0110-Don-t-tick-Skulls-unused-code.patch
similarity index 86%
rename from Spigot-Server-Patches/0111-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0110-Don-t-tick-Skulls-unused-code.patch
index 12c1eddf20..374ac38b81 100644
--- a/Spigot-Server-Patches/0111-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0110-Don-t-tick-Skulls-unused-code.patch
@@ -1,11 +1,11 @@
-From 1223e6dd7d783c673abeef49cec9f7ef676fddd7 Mon Sep 17 00:00:00 2001
+From 4f00524bf0bf8b0a02362aa9d10acab6d82816b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index edd6fb69e..380373c0e 100644
+index 8d2ab289..ccdea51c 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -21,7 +21,7 @@ import com.mojang.authlib.Agent;
@@ -18,5 +18,5 @@ index edd6fb69e..380373c0e 100644
      private int a;
      public int rotation;
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0112-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0111-Configurable-Player-Collision.patch
similarity index 96%
rename from Spigot-Server-Patches/0112-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0111-Configurable-Player-Collision.patch
index 4671c927c1..cff98fad01 100644
--- a/Spigot-Server-Patches/0112-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0111-Configurable-Player-Collision.patch
@@ -1,11 +1,11 @@
-From 591afbb70543d86d73dad41a3615fb93cb7dff33 Mon Sep 17 00:00:00 2001
+From f60dc6267a873745b86a6b980e692da81f5eda76 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/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 62cbe0cf3..dae321d01 100644
+index ec464338..430b5d0c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -220,4 +220,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 62cbe0cf3..dae321d01 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index 00a34e85a..3e1ee96d1 100644
+index b08274d9..0607e55d 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
 @@ -183,6 +183,13 @@ public class CommandScoreboard extends CommandAbstract {
@@ -37,7 +37,7 @@ index 00a34e85a..3e1ee96d1 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b55ce6b1a..9099eb64f 100644
+index 71b66bbd..5db42bef 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -331,6 +331,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -62,7 +62,7 @@ index b55ce6b1a..9099eb64f 100644
  
      protected void l() {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index d8ec50455..eb45d3cf2 100644
+index 549d4e89..df11764e 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -96,7 +96,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -75,7 +75,7 @@ index d8ec50455..eb45d3cf2 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 45ad22c8f..e7017883f 100644
+index d54d7270..8fcf4d9c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -72,6 +72,7 @@ public abstract class PlayerList {
@@ -132,5 +132,5 @@ index 45ad22c8f..e7017883f 100644
  
      // CraftBukkit start
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0113-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0112-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 96%
rename from Spigot-Server-Patches/0113-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0112-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index c8f120c1bb..fbf2ea8dda 100644
--- a/Spigot-Server-Patches/0113-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0112-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From b8c7bcb5f11570adba7ff9fd94cf116edfdd0a6a Mon Sep 17 00:00:00 2001
+From a4c7d99e23f13c25691da6be73059ac6cf1fc4f6 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 8bac1e161..9640df356 100644
+index 99a63422..1cf64c5b 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -45,5 +45,5 @@ index 8bac1e161..9640df356 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0114-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0113-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 90%
rename from Spigot-Server-Patches/0114-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0113-Water-mobs-should-only-spawn-in-the-water.patch
index 967f4a0641..eb6fd95788 100644
--- a/Spigot-Server-Patches/0114-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0113-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,11 +1,11 @@
-From 5ca04945098d575cbb62e424747d07ab701eeee0 Mon Sep 17 00:00:00 2001
+From 3cf07185c3f1562535db0a99a767853e69f62b0f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWaterAnimal.java b/src/main/java/net/minecraft/server/EntityWaterAnimal.java
-index 203e387fb..6ddb1aa8a 100644
+index f430bdee..0597edad 100644
 --- a/src/main/java/net/minecraft/server/EntityWaterAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityWaterAnimal.java
 @@ -11,7 +11,15 @@ public abstract class EntityWaterAnimal extends EntityInsentient implements IAni
@@ -26,5 +26,5 @@ index 203e387fb..6ddb1aa8a 100644
  
      public boolean canSpawn() {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0115-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0114-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 95%
rename from Spigot-Server-Patches/0115-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0114-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index e94ac79657..d5a9e95d5f 100644
--- a/Spigot-Server-Patches/0115-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0114-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From 9a94f770eac122c917dab083c8ba65d68a73381a Mon Sep 17 00:00:00 2001
+From 6451b52e836abb928f24aad8dda1a7fa68f7107e 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
@@ -14,7 +14,7 @@ Specially with servers using smaller mob spawn ranges than view distance, as wel
 This patch returns mob counting to use all loaded chunks, and 17x17 division.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 15494d0b1..f743efca4 100644
+index 32166ee8..02aeef54 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -682,7 +682,7 @@ public class Chunk {
@@ -27,7 +27,7 @@ index 15494d0b1..f743efca4 100644
          if (entity instanceof EntityItem) {
              itemCounts[i]--;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 79a93a862..1d0c9cc4e 100644
+index 45a83ae9..2cd06382 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -23,6 +23,15 @@ public final class SpawnerCreature {
@@ -56,5 +56,5 @@ index 79a93a862..1d0c9cc4e 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0116-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0115-Configurable-RCON-IP-address.patch
similarity index 89%
rename from Spigot-Server-Patches/0116-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0115-Configurable-RCON-IP-address.patch
index b77245f76f..4d7b53692a 100644
--- a/Spigot-Server-Patches/0116-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0115-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 176df0177590c48e6f57abcee6c554576fcec0a3 Mon Sep 17 00:00:00 2001
+From 1bc0e22984a355265408ca75f98e9cf825b83713 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address
 For servers with multiple IP's, ability to bind to a specific interface.
 
 diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
-index a6a0d5a29..efcafe77f 100644
+index a6a0d5a2..efcafe77 100644
 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
 @@ -24,7 +24,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
@@ -19,5 +19,5 @@ index a6a0d5a29..efcafe77f 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0117-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0116-Prevent-Fire-from-loading-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0117-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0116-Prevent-Fire-from-loading-chunks.patch
index 86b1706402..0ccdc2d1d6 100644
--- a/Spigot-Server-Patches/0117-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0116-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 7959c2a0963e4ee323b9d1f4a6fd4100f86b6f94 Mon Sep 17 00:00:00 2001
+From cdeef2924460c8256fdbeaddad748cbc2561a3bf 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
@@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall
 bad behavior.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 74c76fd6b..36df22215 100644
+index a3a5c853..6832a19a 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -164,6 +164,7 @@ public class BlockFire extends Block {
@@ -43,5 +43,5 @@ index 74c76fd6b..36df22215 100644
              }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
index 823ee10e12..f162e0de27 100644
--- a/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From fd9cb0e38298f243165576d84d776b9cfa7ad869 Mon Sep 17 00:00:00 2001
+From afa6cc4ed26e421d7f4f9d10487359ab0a182602 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 95336d6cc..1bc2ed0ec 100644
+index 95336d6c..1bc2ed0e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
@@ -45,7 +45,7 @@ index 95336d6cc..1bc2ed0ec 100644
          this.cm = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 747de51d3..2569f0b7f 100644
+index 747de51d..2569f0b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1693,7 +1693,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -60,5 +60,5 @@ index 747de51d3..2569f0b7f 100644
  
          @Override
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0119-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0119-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch
index 6e7222d51a..2268068151 100644
--- a/Spigot-Server-Patches/0119-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From bb2896c078064b96b79ef2c93111c5de084f0663 Mon Sep 17 00:00:00 2001
+From 0a5272c5551934c1eebec91ceabf8407dae0ab0d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 98cb3c7c2..95700bf68 100644
+index 6f2d1a18..3d1897d6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -767,10 +767,16 @@ public abstract class EntityLiving extends Entity {
@@ -28,7 +28,7 @@ index 98cb3c7c2..95700bf68 100644
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index 401002b61..0f63055b5 100644
+index d42db9b4..c715138e 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
 @@ -65,7 +65,7 @@ public class FoodMetaData {
@@ -41,5 +41,5 @@ index 401002b61..0f63055b5 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0120-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0119-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 94%
rename from Spigot-Server-Patches/0120-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0119-Add-ability-to-configure-frosted_ice-properties.patch
index 97e2307616..98ea8babb9 100644
--- a/Spigot-Server-Patches/0120-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0119-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,11 +1,11 @@
-From 9643be0fd3b1e25e36f7daf141052a94a429bf62 Mon Sep 17 00:00:00 2001
+From 81c280034cb4c822a30e4f4e95882524e509847c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3bd29650c..5cc55b794 100644
+index 3bd29650..5cc55b79 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -295,4 +295,14 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index 3bd29650c..5cc55b794 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 73855826e..f079c3389 100644
+index 950863fb..a8dbbf20 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -19,10 +19,14 @@ public class BlockIceFrost extends BlockIce {
@@ -44,5 +44,5 @@ index 73855826e..f079c3389 100644
  
      }
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0121-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch
similarity index 94%
rename from Spigot-Server-Patches/0121-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch
index 60ed7eafdc..666eeba210 100644
--- a/Spigot-Server-Patches/0121-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch
@@ -1,11 +1,11 @@
-From 5d6a70e63f2dbf871c2c7ed62ee6e6c4245bee15 Mon Sep 17 00:00:00 2001
+From ae45b53b34e464b6ea2954ba36e6f460480c90e1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fa940ad31..0ec78ec2f 100644
+index 0d92e604..b10f670a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener {
@@ -41,5 +41,5 @@ index fa940ad31..0ec78ec2f 100644
              entity.j = 60;
          }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0122-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0121-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 94%
rename from Spigot-Server-Patches/0122-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to Spigot-Server-Patches/0121-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index 5760428336..ba7ba42e55 100644
--- a/Spigot-Server-Patches/0122-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0121-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,11 +1,11 @@
-From 5b807a76010dd4c8c21bc1108e17a5902329afc0 Mon Sep 17 00:00:00 2001
+From 4f885c379793b042358c95ffb93714f92750e137 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockDispenser.java b/src/main/java/net/minecraft/server/BlockDispenser.java
-index f8eaf2ac3..8e7884490 100644
+index 8e794976..539b2b3c 100644
 --- a/src/main/java/net/minecraft/server/BlockDispenser.java
 +++ b/src/main/java/net/minecraft/server/BlockDispenser.java
 @@ -20,6 +20,9 @@ public class BlockDispenser extends BlockTileEntity {
@@ -28,7 +28,7 @@ index f8eaf2ac3..8e7884490 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/BlockFurnace.java b/src/main/java/net/minecraft/server/BlockFurnace.java
-index 528005446..b0d03e408 100644
+index b6834d2d..dae71170 100644
 --- a/src/main/java/net/minecraft/server/BlockFurnace.java
 +++ b/src/main/java/net/minecraft/server/BlockFurnace.java
 @@ -18,6 +18,9 @@ public class BlockFurnace extends BlockTileEntity {
@@ -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.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0123-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0122-Improve-Minecraft-Hopper-Performance.patch
similarity index 96%
rename from Spigot-Server-Patches/0123-Improve-Minecraft-Hopper-Performance.patch
rename to Spigot-Server-Patches/0122-Improve-Minecraft-Hopper-Performance.patch
index 103356c8a4..6ad23be05f 100644
--- a/Spigot-Server-Patches/0123-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0122-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From 0fd48f8ca0b302871c4bccf779578385e53f8c33 Mon Sep 17 00:00:00 2001
+From a6ec3f7537baf37975755f6cfa9668e12bf1d00a 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
@@ -8,7 +8,7 @@ Also reset cooldown each hopper tick that a hopper is full.
 Also don't constantly clone ItemStacks without merit
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 39be107fd..6e23d325f 100644
+index 39be107f..6e23d325 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -33,6 +33,7 @@ public abstract class TileEntity {
@@ -28,7 +28,7 @@ index 39be107fd..6e23d325f 100644
  
              this.g = iblockdata.getBlock().toLegacyData(iblockdata);
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index e38411f35..f99812989 100644
+index e38411f3..f9981298 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -220,11 +220,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -86,5 +86,5 @@ index e38411f35..f99812989 100644
          return this.f > 0;
      }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0124-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0123-remove-null-possibility-for-getServer-singleton.patch
similarity index 94%
rename from Spigot-Server-Patches/0124-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0123-remove-null-possibility-for-getServer-singleton.patch
index 5eac9fc64a..e50089592a 100644
--- a/Spigot-Server-Patches/0124-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0123-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 72456dedf5e3b0b1abd45465540107db5ac7175f Mon Sep 17 00:00:00 2001
+From 78749c44c2d63488063baba21bd95664ee59a2a8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9099eb64f..111c363c7 100644
+index 5db42bef..41ef9bc2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -52,6 +52,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -35,5 +35,5 @@ index 9099eb64f..111c363c7 100644
      // CraftBukkit end
  }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 95%
rename from Spigot-Server-Patches/0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 82cec1e570..0f526f9964 100644
--- a/Spigot-Server-Patches/0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From c7ef28c653eb46e86d9daff8fc58fae7a73b42fe Mon Sep 17 00:00:00 2001
+From 1fd06b2b51cf462fa46c6182d855cb45f213d493 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index dcd2ac6ab..7d79e4625 100644
+index e9509e61..1673d028 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -548,6 +548,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index dcd2ac6ab..7d79e4625 100644
              ItemStack itemstack1 = this.a(entityitem);
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 10cafe057..1d0d7453a 100644
+index 4c6eb6ed..759dacba 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -90,11 +90,11 @@ public class EntityTrackerEntry {
@@ -48,10 +48,10 @@ index 10cafe057..1d0d7453a 100644
                  Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8729a0056..ba554517f 100644
+index 5e0eb668..c74fdae4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1222,6 +1222,7 @@ public abstract class World implements IBlockAccess {
+@@ -1223,6 +1223,7 @@ public abstract class World implements IBlockAccess {
                      {
                          if ( iter.next().trackee == entity )
                          {
@@ -60,7 +60,7 @@ index 8729a0056..ba554517f 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index b4296a0fc..5394e37f8 100644
+index 1096b5c1..59173605 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -28,6 +28,7 @@ public class WorldMap extends PersistentBase {
@@ -132,7 +132,7 @@ index b4296a0fc..5394e37f8 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a13178..5768cd512 100644
+index 256a1317..5768cd51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
@@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644
  
      public RenderData() {
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0126-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0125-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 98%
rename from Spigot-Server-Patches/0126-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0125-LootTable-API-Replenishable-Lootables-Feature.patch
index b9a9ad4b7f..8bf827f206 100644
--- a/Spigot-Server-Patches/0126-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0125-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 2004f4a874f0c86805f21348b443ea5f0a8222cb Mon Sep 17 00:00:00 2001
+From 331abd97a38a9c2112312930d850268811511722 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5cc55b794..fbe769eb3 100644
+index 5cc55b79..fbe769eb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -305,4 +305,26 @@ public class PaperWorldConfig {
@@ -43,7 +43,7 @@ index 5cc55b794..fbe769eb3 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 new file mode 100644
-index 000000000..36c36d158
+index 00000000..36c36d15
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 @@ -0,0 +1,12 @@
@@ -61,7 +61,7 @@ index 000000000..36c36d158
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 new file mode 100644
-index 000000000..20d236c45
+index 00000000..20d236c4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -100,7 +100,7 @@ index 000000000..20d236c45
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 new file mode 100644
-index 000000000..1150dee01
+index 00000000..1150dee0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 @@ -0,0 +1,31 @@
@@ -137,7 +137,7 @@ index 000000000..1150dee01
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 new file mode 100644
-index 000000000..668097620
+index 00000000..66809762
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 @@ -0,0 +1,88 @@
@@ -231,7 +231,7 @@ index 000000000..668097620
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 new file mode 100644
-index 000000000..01c2713d3
+index 00000000..01c2713d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 @@ -0,0 +1,182 @@
@@ -418,7 +418,7 @@ index 000000000..01c2713d3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 4a8eee119..0eece3933 100644
+index ce501098..b382f818 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -6,17 +6,21 @@ import javax.annotation.Nullable;
@@ -536,7 +536,7 @@ index 4a8eee119..0eece3933 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index 243ae3533..548b8f4f5 100644
+index a97ad203..61852130 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -1,44 +1,50 @@
@@ -653,7 +653,7 @@ index 243ae3533..548b8f4f5 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 3de7e14d8..6cab545e5 100644
+index 3de7e14d..6cab545e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -1,5 +1,6 @@
@@ -673,7 +673,7 @@ index 3de7e14d8..6cab545e5 100644
      private final TileEntityChest chest;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
-index cc0d28f21..1b28e8ba2 100644
+index cc0d28f2..1b28e8ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 @@ -1,5 +1,6 @@
@@ -693,7 +693,7 @@ index cc0d28f21..1b28e8ba2 100644
      private final TileEntityDispenser dispenser;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index b7a04bd84..5d4a5519d 100644
+index b7a04bd8..5d4a5519 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -1,5 +1,6 @@
@@ -713,7 +713,7 @@ index b7a04bd84..5d4a5519d 100644
  
      public CraftHopper(final Block block) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-index 788c60263..dc2648094 100644
+index 788c6026..dc264809 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -742,7 +742,7 @@ index 788c60263..dc2648094 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 69435c457..4291edf25 100644
+index 69435c45..4291edf2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -762,7 +762,7 @@ index 69435c457..4291edf25 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index e9963e21c..acb4dee04 100644
+index e9963e21..acb4dee0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@
@@ -782,5 +782,5 @@ index e9963e21c..acb4dee04 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0127-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0126-Do-not-load-chunks-for-pathfinding.patch
similarity index 86%
rename from Spigot-Server-Patches/0127-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0126-Do-not-load-chunks-for-pathfinding.patch
index bfd96e0491..541f9ca3eb 100644
--- a/Spigot-Server-Patches/0127-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0126-Do-not-load-chunks-for-pathfinding.patch
@@ -1,11 +1,11 @@
-From 85ff0fddf7a0b1dc19f41b228fe5caf3f42cb199 Mon Sep 17 00:00:00 2001
+From 23033ac2cbb0e46cc926b9a0c8ebd63034b98af3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
-index 08b986fd7..786d1dd22 100644
+index 08b986fd..786d1dd2 100644
 --- a/src/main/java/net/minecraft/server/ChunkCache.java
 +++ b/src/main/java/net/minecraft/server/ChunkCache.java
 @@ -25,7 +25,7 @@ public class ChunkCache implements IBlockAccess {
@@ -18,5 +18,5 @@ index 08b986fd7..786d1dd22 100644
          }
  
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0128-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0127-Entity-Tracking-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0128-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0127-Entity-Tracking-Improvements.patch
index 4e4b72a23a..9eea18300b 100644
--- a/Spigot-Server-Patches/0128-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0127-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 21de603dbdcebdcb7c1a62e03632449f0a451c9b Mon Sep 17 00:00:00 2001
+From 8d4e95d1cc023bd93936fbb7c63f4692528e8e95 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0f4a1b66b..96b1e9a78 100644
+index b10f670a..7fb23be6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener {
@@ -19,7 +19,7 @@ index 0f4a1b66b..96b1e9a78 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index fbda70a39..c28b4bd44 100644
+index 759dacba..efc4c79a 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -49,6 +49,7 @@ public class EntityTrackerEntry {
@@ -99,5 +99,5 @@ index fbda70a39..c28b4bd44 100644
  
      }
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0128-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 91%
rename from Spigot-Server-Patches/0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0128-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 4a67fa4e35..a3cc80a38d 100644
--- a/Spigot-Server-Patches/0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0128-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,11 +1,11 @@
-From 677b710a49c80a8c885f6334378f6963c327e1af Mon Sep 17 00:00:00 2001
+From 6ef4eca7291384f8ea1a0f41e308b1a0e5e94054 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dae321d01..0140d1981 100644
+index 430b5d0c..011cbf5e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -225,4 +225,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index dae321d01..0140d1981 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
-index 230004b4a..62752f816 100644
+index c9c01fad..89c8d045 100644
 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
 +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
 @@ -184,6 +184,7 @@ public class PersistentScoreboard extends PersistentBase {
@@ -31,5 +31,5 @@ index 230004b4a..62752f816 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0129-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 96%
rename from Spigot-Server-Patches/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0129-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 00a5442514..193f0bcb3f 100644
--- a/Spigot-Server-Patches/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0129-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From c1cda881a32b419fc1119bcba3189ec108f0af64 Mon Sep 17 00:00:00 2001
+From 5f7b9ff421c563a1006b28c791ad548fdad2f28d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
@@ -6,7 +6,7 @@ Subject: [PATCH] Do not mark chunks as active for neighbor updates
 Fixes chunk unload issues
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f743efca4..6a64053ca 100644
+index 02aeef54..d662a5a2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1006,25 +1006,25 @@ public class Chunk {
@@ -44,5 +44,5 @@ index f743efca4..6a64053ca 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0131-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0130-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 92%
rename from Spigot-Server-Patches/0131-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0130-Fix-Chunk-Unload-Queue-Issues.patch
index d0abdf1630..1c2e40557c 100644
--- a/Spigot-Server-Patches/0131-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0130-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 73628dd99518293a492cdf8c7bd31afb60658535 Mon Sep 17 00:00:00 2001
+From aa51466f2b3c2193b3965f62eadafb4e9a1a504b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues
@@ -9,7 +9,7 @@ has not resolved all the bugs with the changes.
 This patch fixes known issues and really should be applied by Spigot team.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3db29161d..98f2cff15 100644
+index d662a5a2..0845d1ff 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -46,7 +46,7 @@ public class Chunk {
@@ -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 dd37bec73..eb3225ef2 100644
+index 4d0cb971..a512a411 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 dd37bec73..eb3225ef2 100644
                              continue;
                          }
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0132-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0131-System-property-for-disabling-watchdoge.patch
similarity index 88%
rename from Spigot-Server-Patches/0132-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0131-System-property-for-disabling-watchdoge.patch
index 07128c6f85..2149ce3d46 100644
--- a/Spigot-Server-Patches/0132-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0131-System-property-for-disabling-watchdoge.patch
@@ -1,11 +1,11 @@
-From aa2f12ea92da0cbcf508cf4fa91f6f67a8d11247 Mon Sep 17 00:00:00 2001
+From a99fafc083b11398452959f1f93471ad1cb329b3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
 
 
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 6384d50e7..cb1fcf0f4 100644
+index 6384d50e..cb1fcf0f 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -52,7 +52,7 @@ public class WatchdogThread extends Thread
@@ -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.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0133-Optimize-EAR.patch b/Spigot-Server-Patches/0132-Optimize-EAR.patch
similarity index 95%
rename from Spigot-Server-Patches/0133-Optimize-EAR.patch
rename to Spigot-Server-Patches/0132-Optimize-EAR.patch
index 754cec0ee0..fc7d174cbd 100644
--- a/Spigot-Server-Patches/0133-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0132-Optimize-EAR.patch
@@ -1,11 +1,11 @@
-From f686f64ca7c2f211887dcae3e9ecba481ddd12fe Mon Sep 17 00:00:00 2001
+From 8771771022c2627d2756b4bd571a88f1b3d2781d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c411ce886..c8a6ff3d4 100644
+index 3265a6c2..47865c02 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -2,6 +2,8 @@ package org.spigotmc;
@@ -65,5 +65,5 @@ index c411ce886..c8a6ff3d4 100644
                  }
              }
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0134-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0133-Optimize-UserCache-Thread-Safe.patch
similarity index 96%
rename from Spigot-Server-Patches/0134-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0133-Optimize-UserCache-Thread-Safe.patch
index bfca31251a..917e86d9a5 100644
--- a/Spigot-Server-Patches/0134-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0133-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From dbe6ae53cbd3b831b7f0fc3f3e1705371d89b67f Mon Sep 17 00:00:00 2001
+From a75966b00e4dc23e52f4d2ad245c731f9f919312 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 111c363c7..19a66b64c 100644
+index 41ef9bc2..31ead884 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -527,7 +527,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -23,7 +23,7 @@ index 111c363c7..19a66b64c 100644
          // Spigot end
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 487fc11f1..924dc63a4 100644
+index 487fc11f..924dc63a 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -109,7 +109,7 @@ public class UserCache {
@@ -96,5 +96,5 @@ index 487fc11f1..924dc63a4 100644
      }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0135-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0134-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 95%
rename from Spigot-Server-Patches/0135-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0134-Avoid-blocking-on-Network-Manager-creation.patch
index 0003272572..dc75d6fd27 100644
--- a/Spigot-Server-Patches/0135-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0134-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From f06f7cc6fef5d2914a9bf5813503c35b7161fd04 Mon Sep 17 00:00:00 2001
+From e2a08b3a94447cee6d73854e8f38eb3a6c9e8c1d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 6a71ebbd2..faf7b60af 100644
+index 43421649..447d54d9 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -60,6 +60,15 @@ public class ServerConnection {
@@ -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.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch
similarity index 96%
rename from Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch
index 29093edf4a..582a98a393 100644
--- a/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From 0e76f067787f47458049e16499ba476dbac629e5 Mon Sep 17 00:00:00 2001
+From 83804921daabb244c27992872803e17551968483 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fbe769eb3..d2a542354 100644
+index fbe769eb..d2a54235 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,7 +32,7 @@ index fbe769eb3..d2a542354 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 14b6439c2..724e85aa3 100644
+index 7fb23be6..e78b1c26 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1108,6 +1108,11 @@ public abstract class Entity implements ICommandListener {
@@ -60,7 +60,7 @@ index 14b6439c2..724e85aa3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index bb0904f86..50811852a 100644
+index bb0904f8..50811852 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
@@ -114,5 +114,5 @@ index bb0904f86..50811852a 100644
 +    // Paper end
  }
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0137-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0136-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 93%
rename from Spigot-Server-Patches/0137-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0136-Faster-redstone-torch-rapid-clock-removal.patch
index 4846f758fd..0dd74f14a0 100644
--- a/Spigot-Server-Patches/0137-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0136-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From fee9819b52897421317394c759b8a6850fbab9a9 Mon Sep 17 00:00:00 2001
+From 3fff1239f8954425956686806b66ab1a516c151f Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
-index 5b0028a78..429f26ed5 100644
+index 5b0028a7..429f26ed 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 @@ -94,9 +94,17 @@ public class BlockRedstoneTorch extends BlockTorch {
@@ -39,5 +39,5 @@ index 5b0028a78..429f26ed5 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0138-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0137-Ensure-Chunks-never-ever-load-async.patch
similarity index 94%
rename from Spigot-Server-Patches/0138-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0137-Ensure-Chunks-never-ever-load-async.patch
index 6c39b1adfd..03c8c6587e 100644
--- a/Spigot-Server-Patches/0138-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0137-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 0b6e33b6561edbc1426fe841e946b158e730a33c Mon Sep 17 00:00:00 2001
+From 7b4cbe6b40ee2d8ac0d77cf139660f6c6a14c67c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Chunks never ever load async
 Safely pushes the operation to main thread, then back to the posting thread
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7b7a3d01b..9aaca21a7 100644
+index 7b7a3d01..9aaca21a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -4,6 +4,7 @@ import com.destroystokyo.paper.PaperConfig;
@@ -27,7 +27,7 @@ index 7b7a3d01b..9aaca21a7 100644
  
      public static void queueChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z, Runnable runnable) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index b5efb9c3f..ef9529add 100644
+index b5efb9c3..ef9529ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -35,8 +35,8 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
@@ -42,5 +42,5 @@ index b5efb9c3f..ef9529add 100644
              return;
          }
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0139-Add-server-name-parameter.patch b/Spigot-Server-Patches/0138-Add-server-name-parameter.patch
similarity index 88%
rename from Spigot-Server-Patches/0139-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0138-Add-server-name-parameter.patch
index 2b8a5ddc0a..a5abcd2b09 100644
--- a/Spigot-Server-Patches/0139-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0138-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From 0b2f9708eadcdc00cf1248ef7f25a6686d2f9383 Mon Sep 17 00:00:00 2001
+From cbe1668e2f6d06c0428bc08525ce396440c143c6 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4399faf69..59d4e2e6f 100644
+index 35123d58..634cde14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -134,6 +134,14 @@ public class Main {
@@ -24,5 +24,5 @@ index 4399faf69..59d4e2e6f 100644
          };
  
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0139-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 95%
rename from Spigot-Server-Patches/0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0139-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 23b661f78e..537f9a6a82 100644
--- a/Spigot-Server-Patches/0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0139-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 5b0e458f61ad7845469a3cc9cee4231ae01a896d Mon Sep 17 00:00:00 2001
+From ed6f009ff0326d223d19dc9f12714cad352ba17b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
 Also fix view distance lookup
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index f8e84f413..e88082485 100644
+index 0f94d2f0..a8cc6b61 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -573,8 +573,12 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -25,7 +25,7 @@ index f8e84f413..e88082485 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index b7954362d..202774a7c 100644
+index 97cf75b9..96785260 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -210,8 +210,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -44,5 +44,5 @@ index b7954362d..202774a7c 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0141-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0140-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 96%
rename from Spigot-Server-Patches/0141-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0140-Fix-FallingBlocks-being-stuck-on-fences.patch
index eeee6143cd..31c6a6f805 100644
--- a/Spigot-Server-Patches/0141-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0140-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From c3dd4a6a7983efc266830dec7e308ec425dee334 Mon Sep 17 00:00:00 2001
+From 1938ff2b5f43d68ca8fe67b1f69bb0ed77776b3b Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
@@ -11,7 +11,7 @@ We now first check, if if we are already on the ground.
 if not, we check if the falling block is inside of the hitbox of the block at y - 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d2a542354..c74071eb1 100644
+index d2a54235..c74071eb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -336,4 +336,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index d2a542354..c74071eb1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java
-index 674395756..1086e3117 100644
+index 67439575..1086e311 100644
 --- a/src/main/java/net/minecraft/server/BlockFalling.java
 +++ b/src/main/java/net/minecraft/server/BlockFalling.java
 @@ -71,6 +71,12 @@ public class BlockFalling extends Block {
@@ -42,7 +42,7 @@ index 674395756..1086e3117 100644
  
      public void a_(World world, BlockPosition blockposition) {}
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 70a196461..3c7bdccc4 100644
+index f4bb2e65..328ee251 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -101,5 +101,5 @@ index 70a196461..3c7bdccc4 100644
          Block block = this.block.getBlock();
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0142-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0141-Make-entities-look-for-hoppers.patch
similarity index 97%
rename from Spigot-Server-Patches/0142-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0141-Make-entities-look-for-hoppers.patch
index 6a13d0ebea..b413f398ce 100644
--- a/Spigot-Server-Patches/0142-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0141-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From da00e43894f069931ea9803a4c2d570ae9073e7e Mon Sep 17 00:00:00 2001
+From 8ce24b8a5642a47a532941057e9c1b46a7083443 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
@@ -14,7 +14,7 @@ This patch may causes a decrease in the performance of dropped items, which is w
 
 diff --git a/src/main/java/com/destroystokyo/paper/HopperPusher.java b/src/main/java/com/destroystokyo/paper/HopperPusher.java
 new file mode 100644
-index 000000000..aef7c2be9
+index 00000000..aef7c2be
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/HopperPusher.java
 @@ -0,0 +1,59 @@
@@ -78,7 +78,7 @@ index 000000000..aef7c2be9
 +    double getZ();
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c74071eb1..d5d6e7fcd 100644
+index c74071eb..d5d6e7fc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -341,4 +341,9 @@ public class PaperWorldConfig {
@@ -92,7 +92,7 @@ index c74071eb1..d5d6e7fcd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 1eb9c2da8..c88b76a79 100644
+index 1eb9c2da..c88b76a7 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -235,6 +235,7 @@ public class AxisAlignedBB {
@@ -104,7 +104,7 @@ index 1eb9c2da8..c88b76a79 100644
          return this.a(axisalignedbb.a, axisalignedbb.b, axisalignedbb.c, axisalignedbb.d, axisalignedbb.e, axisalignedbb.f);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 008ed206d..b3c1f550c 100644
+index 008ed206..b3c1f550 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -250,6 +250,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -132,7 +132,7 @@ index 008ed206d..b3c1f550c 100644
              this.b = i;
              this.c = j;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5cd82f1b2..c81f88bce 100644
+index e78b1c26..0a8d8a1a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener {
@@ -156,7 +156,7 @@ index 5cd82f1b2..c81f88bce 100644
      public double motY;
      public double motZ;
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 7b137d847..0a7f1476d 100644
+index 14caa86a..1927e8e2 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -5,8 +5,15 @@ import javax.annotation.Nullable;
@@ -193,7 +193,7 @@ index 7b137d847..0a7f1476d 100644
          int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
          if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 0eece3933..8415832d1 100644
+index b382f818..721c26f3 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -232,7 +232,7 @@ index 0eece3933..8415832d1 100644
      private NonNullList<ItemStack> items;
      private boolean b;
 diff --git a/src/main/java/net/minecraft/server/IHopper.java b/src/main/java/net/minecraft/server/IHopper.java
-index 804215a1c..e830d8390 100644
+index 804215a1..e830d839 100644
 --- a/src/main/java/net/minecraft/server/IHopper.java
 +++ b/src/main/java/net/minecraft/server/IHopper.java
 @@ -4,9 +4,9 @@ public interface IHopper extends IInventory {
@@ -249,7 +249,7 @@ index 804215a1c..e830d8390 100644
 +    double G(); default double getZ() { return G(); } // Paper - OBFHELPER
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index f99812989..d22261646 100644
+index f9981298..d2226164 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -126,6 +126,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -378,5 +378,5 @@ index f99812989..d22261646 100644
  
              if (!list.isEmpty()) {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 95%
rename from Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 168f60805e..9b91a3973a 100644
--- a/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 0a27cc32e4ce4ca5067a78cb8d56777f9b71deae Mon Sep 17 00:00:00 2001
+From 6f4bcbbb5d0c76dc99a2aa2cb5aee4d21f8814ba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d5d6e7fcd..ef60c15bd 100644
+index d5d6e7fc..ef60c15b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -346,4 +346,13 @@ public class PaperWorldConfig {
@@ -35,7 +35,7 @@ index d5d6e7fcd..ef60c15bd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 0845d1ffe..a0b5cd56b 100644
+index 0845d1ff..a0b5cd56 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -30,6 +30,7 @@ public class Chunk {
@@ -47,7 +47,7 @@ index 0845d1ffe..a0b5cd56b 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 a512a4113..9836c0c5a 100644
+index a512a411..9836c0c5 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 {
@@ -71,7 +71,7 @@ index a512a4113..9836c0c5a 100644
              this.chunkLoader.b();
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 3d30e1831..48a008e0a 100644
+index 3d30e183..48a008e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -32,8 +32,16 @@ public class PlayerChunk {
@@ -108,7 +108,7 @@ index 3d30e1831..48a008e0a 100644
              // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 0a0b5261b..14ea89c91 100644
+index 0a0b5261..14ea89c9 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -487,7 +487,13 @@ public class PlayerChunkMap {
@@ -127,7 +127,7 @@ index 0a0b5261b..14ea89c91 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 24b4a7ea7..416e86af3 100644
+index 24b4a7ea..416e86af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1568,7 +1568,7 @@ public class CraftWorld implements World {
@@ -140,5 +140,5 @@ index 24b4a7ea7..416e86af3 100644
              }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch
similarity index 92%
rename from Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch
index dda7d59adf..e544adca38 100644
--- a/Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From 0fbd99c5821b76cd1a7ec33967dd80f3caa8c9d4 Mon Sep 17 00:00:00 2001
+From a5e58644e7ecfb1d71ad0c9a2ca9744fe93ccd6b Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -7,7 +7,7 @@ Instead of calculating the damage taken from hitting a wall, you can
 disable it in the config.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ef60c15bd..cec9ea74c 100644
+index ef60c15b..cec9ea74 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -355,4 +355,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index ef60c15bd..cec9ea74c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3d1897d6f..e50f7a3ca 100644
+index 3d1897d6..e50f7a3c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1731,6 +1731,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 3d1897d6f..e50f7a3ca 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0144-Fix-Double-World-Add-issues.patch
similarity index 92%
rename from Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0144-Fix-Double-World-Add-issues.patch
index c9a4a11bd4..5ab51da3a4 100644
--- a/Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0144-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 4dac185846e96a86266a1a4bdca819c96d9511c5 Mon Sep 17 00:00:00 2001
+From e7eee06f9815db346b424a414627674d4750f037 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 44f0d8831..6b5b5e912 100644
+index 44f0d883..6b5b5e91 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -508,7 +508,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -21,7 +21,7 @@ index 44f0d8831..6b5b5e912 100644
              Iterator iterator = entity.bF().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a44bc499a..2cdac0ebc 100644
+index c74fdae4..2b613d5a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1101,6 +1101,7 @@ public abstract class World implements IBlockAccess {
@@ -33,5 +33,5 @@ index a44bc499a..2cdac0ebc 100644
          int i = MathHelper.floor(entity.locX / 16.0D);
          int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0146-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0145-Fix-Old-Sign-Conversion.patch
similarity index 95%
rename from Spigot-Server-Patches/0146-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0145-Fix-Old-Sign-Conversion.patch
index 98a33a524f..8c32cfaf0b 100644
--- a/Spigot-Server-Patches/0146-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0145-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 9630abafb8d98c636c2f0c5c20fa9cddb23d3da0 Mon Sep 17 00:00:00 2001
+From 339953875edbac09a67868577dd25fef80871623 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion
    This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
 
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index 32020e39d..f13752362 100644
+index d0f02f41..a8bc4b5f 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -203,9 +203,11 @@ public class DefinedStructure {
@@ -34,7 +34,7 @@ index 32020e39d..f13752362 100644
  
          public Iterator<IBlockData> iterator() {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6e23d325f..ddea15cfe 100644
+index 6e23d325..ddea15cf 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit
@@ -46,7 +46,7 @@ index 6e23d325f..ddea15cfe 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index f04b7aa99..50a8d7977 100644
+index 8bd12650..ba4f945a 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -77,13 +77,14 @@ public class TileEntitySign extends TileEntity {
@@ -67,5 +67,5 @@ index f04b7aa99..50a8d7977 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0146-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 88%
rename from Spigot-Server-Patches/0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0146-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index e391c5ebb7..1b6e26f525 100644
--- a/Spigot-Server-Patches/0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0146-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,11 +1,11 @@
-From 2790458a20fcda14067cb339e644baf678aef02b Mon Sep 17 00:00:00 2001
+From 40ce440f25b5c8908af901dbeb3215c0a2695e80 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 924dc63a4..07d39d46a 100644
+index 924dc63a..07d39d46 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -87,7 +87,7 @@ public class UserCache {
@@ -18,5 +18,5 @@ index 924dc63a4..07d39d46a 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0148-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0147-More-informative-vehicle-moved-wrongly-message.patch
similarity index 89%
rename from Spigot-Server-Patches/0148-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0147-More-informative-vehicle-moved-wrongly-message.patch
index 5abe3a5b3c..b6bd06e9a0 100644
--- a/Spigot-Server-Patches/0148-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0147-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 0a06a96e7ac7411e2c10b3f154219e9b3725fa43 Mon Sep 17 00:00:00 2001
+From 9d6de212c249e88c7e0dfc274e0c7c789cd5ae7b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 76784a3af..a99edb869 100644
+index 75f43f42..0233017e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -350,7 +350,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index 76784a3af..a99edb869 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0148-Re-track-players-that-dismount-from-other-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0148-Re-track-players-that-dismount-from-other-players.patch
index 52fe9db887..31b7286100 100644
--- a/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0148-Re-track-players-that-dismount-from-other-players.patch
@@ -1,11 +1,11 @@
-From ed8147558b5a5dffb0dac7b6b73071ec1473d9ea Mon Sep 17 00:00:00 2001
+From d6880664519de0333d1d1147343c0c795b642b89 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 49795c588..628597330 100644
+index 1bc2ed0e..8fe324cf 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -715,6 +715,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index 49795c588..628597330 100644
      }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
similarity index 93%
rename from Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
index 4b86917a85..bfc822f32b 100644
--- a/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
@@ -1,11 +1,11 @@
-From ffd34bc971fda7b78ffb3c1f136a1e7160633693 Mon Sep 17 00:00:00 2001
+From 6344f261b109116cea5afeed0a2d06cc1ae0b57f Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 011cbf5e3..cf06f8ac3 100644
+index 011cbf5e..cf06f8ac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -230,4 +230,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 011cbf5e3..cf06f8ac3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index b943a9b20..8f3b93dc1 100644
+index b943a9b2..8f3b93dc 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -66,7 +66,8 @@ public class NameReferencingFileConverter {
@@ -33,7 +33,7 @@ index b943a9b20..8f3b93dc1 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a7dd7988e..4d8414369 100644
+index a7dd7988..4d841436 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1320,7 +1320,8 @@ public final class CraftServer implements Server {
@@ -47,5 +47,5 @@ index a7dd7988e..4d8414369 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0151-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0150-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 95%
rename from Spigot-Server-Patches/0151-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0150-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 3a10a5d65f..b3d569a2e8 100644
--- a/Spigot-Server-Patches/0151-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0150-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,11 +1,11 @@
-From f42b3e088cb525e1c0fe54aca194267261a4d53e Mon Sep 17 00:00:00 2001
+From 674f409a72bc64e38d758cf2743f363c5d2d2eb8 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 288c52c55..66c459d83 100644
+index 288c52c5..66c459d8 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
 @@ -16,6 +16,11 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@@ -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.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0152-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0151-Disable-ticking-of-snow-blocks.patch
similarity index 90%
rename from Spigot-Server-Patches/0152-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0151-Disable-ticking-of-snow-blocks.patch
index e90bdb0360..5cac630ec7 100644
--- a/Spigot-Server-Patches/0152-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0151-Disable-ticking-of-snow-blocks.patch
@@ -1,11 +1,11 @@
-From 4696c453f870dd2315654441c612af5f24fa0277 Mon Sep 17 00:00:00 2001
+From c81ebe9bcf5a825cf06cda258bd88d1200f3cf6a Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockSnowBlock.java b/src/main/java/net/minecraft/server/BlockSnowBlock.java
-index 8123d7295..b6765e5bc 100644
+index 8123d729..b6765e5b 100644
 --- a/src/main/java/net/minecraft/server/BlockSnowBlock.java
 +++ b/src/main/java/net/minecraft/server/BlockSnowBlock.java
 @@ -6,7 +6,7 @@ public class BlockSnowBlock extends Block {
@@ -34,5 +34,5 @@ index 8123d7295..b6765e5bc 100644
 +    //Paper end
  }
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0153-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
similarity index 89%
rename from Spigot-Server-Patches/0153-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
index 89f0cde5b5..22f4ee7a46 100644
--- a/Spigot-Server-Patches/0153-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,11 +1,11 @@
-From 62cbfc0f2fb9d45c45ba9012c9748d513ed410c9 Mon Sep 17 00:00:00 2001
+From 3872dbb580dc8188d3def568a2f194305f35d4dc Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a99edb869..28a83ce3d 100644
+index 0233017e..5a7318e8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1837,7 +1837,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index a99edb869..28a83ce3d 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0154-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0153-Configurable-packet-in-spam-threshold.patch
similarity index 93%
rename from Spigot-Server-Patches/0154-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0153-Configurable-packet-in-spam-threshold.patch
index 3b18cbdd2a..06b6b43b7b 100644
--- a/Spigot-Server-Patches/0154-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0153-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From c8d2d3aba2f86067815fe8ed2cbe1a691c326b1f Mon Sep 17 00:00:00 2001
+From bbae8335f9953d51a7c60eca80ad2aa0e97d7ef4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cf06f8ac3..2001175bf 100644
+index cf06f8ac..2001175b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -235,4 +235,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index cf06f8ac3..2001175bf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 28a83ce3d..c5e89997e 100644
+index 5a7318e8..e2dce0ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -902,13 +902,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -44,5 +44,5 @@ index 28a83ce3d..c5e89997e 100644
              limitedPackets = 0;
              return true;
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0154-Configurable-flying-kick-messages.patch
similarity index 94%
rename from Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0154-Configurable-flying-kick-messages.patch
index e014d636ff..bbc0a4d96a 100644
--- a/Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0154-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From 903515972f2912d705c9c666fd047c7ebb9d9051 Mon Sep 17 00:00:00 2001
+From 8808f6be84c5a3c26e7575fa0c379da2202a854e Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2001175bf..621c585e7 100644
+index 2001175b..621c585e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -244,4 +244,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 2001175bf..621c585e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e2dce0ec2..2df4e5a4b 100644
+index e2dce0ec..2df4e5a4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -143,7 +143,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -43,5 +43,5 @@ index e2dce0ec2..2df4e5a4b 100644
                  }
              } else {
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0155-Auto-Save-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0156-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0155-Auto-Save-Improvements.patch
index cc0deb5b0e..40f1d33ad6 100644
--- a/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0155-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 3671ff69353181fc48828de00f6b2b95a5d2055a Mon Sep 17 00:00:00 2001
+From 1de2ca6ca76fc8df92e2c582ba2f90e152143109 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 621c585e7..da0984a35 100644
+index 621c585e..da0984a3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -251,4 +251,9 @@ public class PaperConfig {
@@ -26,7 +26,7 @@ index 621c585e7..da0984a35 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cec9ea74c..39f8a0a2c 100644
+index cec9ea74..39f8a0a2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -58,7 +58,7 @@ index cec9ea74c..39f8a0a2c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a0b5cd56b..f98d380f6 100644
+index a0b5cd56..f98d380f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -962,11 +962,9 @@ public class Chunk {
@@ -76,7 +76,7 @@ index a0b5cd56b..f98d380f6 100644
  
      public Random a(long i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9836c0c5a..39f0f5a17 100644
+index 9836c0c5..39f0f5a1 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1,5 +1,6 @@
@@ -96,7 +96,7 @@ index 9836c0c5a..39f0f5a17 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8fe324cf7..4cfd8961a 100644
+index 8fe324cf..4cfd8961 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -108,7 +108,7 @@ index 8fe324cf7..4cfd8961a 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 31ead8849..9fc484ce1 100644
+index 31ead884..9fc484ce 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -118,6 +118,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -155,7 +155,7 @@ index 31ead8849..9fc484ce1 100644
          this.methodProfiler.a("tallying");
          // Spigot start
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8fcf4d9c0..7882eabaa 100644
+index 8fcf4d9c..7882eaba 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -339,6 +339,7 @@ public abstract class PlayerList {
@@ -192,7 +192,7 @@ index 8fcf4d9c0..7882eabaa 100644
      public void addWhitelist(GameProfile gameprofile) {
          this.whitelist.add(new WhiteListEntry(gameprofile));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e37847e6c..6ef1a262c 100644
+index 3865b31c..87a95857 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1050,8 +1050,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -215,5 +215,5 @@ index e37847e6c..6ef1a262c 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0157-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0156-Chunk-registration-fixes.patch
similarity index 82%
rename from Spigot-Server-Patches/0157-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0156-Chunk-registration-fixes.patch
index 4e8a42dd33..dc42e1cbf8 100644
--- a/Spigot-Server-Patches/0157-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0156-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 4fb13f9812fdc172bd5561560c27d1bc17c52a97 Mon Sep 17 00:00:00 2001
+From a381b7162d665105f52768a2e33871b328e7056d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 45484a813..36c22911a 100644
+index 2b613d5a..cc3a3618 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1771,7 +1771,7 @@ public abstract class World implements IBlockAccess {
+@@ -1772,7 +1772,7 @@ public abstract class World implements IBlockAccess {
          }
  
          i = MathHelper.floor(entity.locX / 16.0D);
@@ -21,5 +21,5 @@ index 45484a813..36c22911a 100644
  
          if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0157-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 88%
rename from Spigot-Server-Patches/0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0157-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index b47f968f35..9c46893372 100644
--- a/Spigot-Server-Patches/0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0157-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,11 +1,11 @@
-From 72e2ee049939547f6a414dc2073623d0e92ac7ad Mon Sep 17 00:00:00 2001
+From 7ecd4df4d533f975f1ae131efd9bcba40d069160 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-index ecfc316bb..3f909c174 100644
+index ecfc316b..3f909c17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 @@ -64,6 +64,16 @@ public class CraftFish extends AbstractProjectile implements Fish {
@@ -26,5 +26,5 @@ index ecfc316bb..3f909c174 100644
      public LivingEntity _INVALID_getShooter() {
          return (LivingEntity) getShooter();
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0158-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 89%
rename from Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0158-Auto-fix-bad-Y-levels-on-player-login.patch
index 1d8b408421..c94be5cc44 100644
--- a/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0158-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 7e6c5f900c8a633d7d737f9b545db845c2d2cf22 Mon Sep 17 00:00:00 2001
+From def76da12cea24195155abec42a043d58e996df6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c4eabc0e4..dac698614 100644
+index 4cfd8961..8fb569be 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -131,6 +131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index c4eabc0e4..dac698614 100644
              if (this.C_().getForceGamemode()) {
                  this.playerInteractManager.setGameMode(this.C_().getGamemode());
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0160-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0159-Raise-string-limit-for-packet-serialization.patch
similarity index 91%
rename from Spigot-Server-Patches/0160-Raise-string-limit-for-packet-serialization.patch
rename to Spigot-Server-Patches/0159-Raise-string-limit-for-packet-serialization.patch
index aa30cb5b47..91510b4807 100644
--- a/Spigot-Server-Patches/0160-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0159-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From f1d70755ff2ee54f353515083dab77f31091bf09 Mon Sep 17 00:00:00 2001
+From 547a778aa20c6ec538350891551b174ff6c88973 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
@@ -8,7 +8,7 @@ The default limit is possible to hit with 50 page books with color codes, causin
 Bump the limit up a hair to above currently seen sizes.
 
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index a8fc7e431..c1273e988 100644
+index a8fc7e43..c1273e98 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -300,8 +300,8 @@ public class PacketDataSerializer extends ByteBuf {
@@ -23,5 +23,5 @@ index a8fc7e431..c1273e988 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0161-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0160-Disable-Vanilla-Chunk-GC.patch
similarity index 91%
rename from Spigot-Server-Patches/0161-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0160-Disable-Vanilla-Chunk-GC.patch
index 7defafc51f..e63d309079 100644
--- a/Spigot-Server-Patches/0161-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0160-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 7512b5b0bffbab6515fb9f5b940a4659ff788242 Mon Sep 17 00:00:00 2001
+From 78a415270295a2936f3e8bce626fed2e286fa8ab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6ef1a262c..9b7be0ae0 100644
+index 87a95857..bde48b69 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1067,7 +1067,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -29,5 +29,5 @@ index 6ef1a262c..9b7be0ae0 100644
          }
      }
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0162-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0161-Option-to-remove-corrupt-tile-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0162-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0161-Option-to-remove-corrupt-tile-entities.patch
index 380a32ca2f..9876fbf4fe 100644
--- a/Spigot-Server-Patches/0162-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0161-Option-to-remove-corrupt-tile-entities.patch
@@ -1,11 +1,11 @@
-From f5558d815be093515ab77190d076eb74b3f6a3c2 Mon Sep 17 00:00:00 2001
+From ab2977d788287170bd54ff9394882fef9816fab5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 39f8a0a2c..efae01b1d 100644
+index 39f8a0a2..efae01b1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -376,4 +376,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 39f8a0a2c..efae01b1d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 099ce0b2d..68ddf5f96 100644
+index f98d380f..ed595955 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -785,11 +785,17 @@ public class Chunk {
@@ -41,5 +41,5 @@ index 099ce0b2d..68ddf5f96 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0163-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0162-Add-EntityZapEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0163-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0162-Add-EntityZapEvent.patch
index 105abb6118..e709c5cada 100644
--- a/Spigot-Server-Patches/0163-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0162-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From 5b0f458a7e9c26380be2663e9ea2b7fd21b276b4 Mon Sep 17 00:00:00 2001
+From 316e2901916e39082402b537e59db4ae638022a2 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index cd97aa30f..835fd7461 100644
+index 94d01172..fcf99e66 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -158,6 +158,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index cd97aa30f..835fd7461 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index fa7ec707f..2562cc45e 100644
+index 70b12c5c..ae68f07a 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -622,6 +622,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,7 +48,7 @@ index fa7ec707f..2562cc45e 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a16694ecc..2ff9cee86 100644
+index 6992a874..1caf1463 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -673,6 +673,14 @@ public class CraftEventFactory {
@@ -67,5 +67,5 @@ index a16694ecc..2ff9cee86 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0163-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 93%
rename from Spigot-Server-Patches/0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0163-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index c39256061b..70848d0290 100644
--- a/Spigot-Server-Patches/0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0163-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 0b59bda9e5d84d262d223225d2f651a71c5509b5 Mon Sep 17 00:00:00 2001
+From cf363a68d18e65658c23d194ed1afde9d6003559 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 9c4d1c938..dd1c1a39b 100644
+index bc398ec5..90267a1f 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -339,7 +339,13 @@ public class BlockChest extends BlockTileEntity {
@@ -32,5 +32,5 @@ index 9c4d1c938..dd1c1a39b 100644
                      if (block == this) {
                          if (this.e(world, blockposition1)) {
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0164-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 94%
rename from Spigot-Server-Patches/0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0164-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 78a0439d44..84985f1c33 100644
--- a/Spigot-Server-Patches/0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0164-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 258b2a40f850ae17e9aca913180cd248e3d87dcd Mon Sep 17 00:00:00 2001
+From 20bd4471cb3ca3988e3ad85b31a516138b3f36a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -7,7 +7,7 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index efae01b1d..70b498c7b 100644
+index efae01b1..70b498c7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -377,6 +377,11 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index efae01b1d..70b498c7b 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 39f0f5a17..19f10feda 100644
+index 39f0f5a1..19f10fed 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -254,6 +254,14 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -51,7 +51,7 @@ index 39f0f5a17..19f10feda 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 0d73e41f2..e14f62d01 100644
+index 6b5b5e91..ceef6e45 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -32,6 +32,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -64,5 +64,5 @@ index 0d73e41f2..e14f62d01 100644
      @Nullable
      public Chunk a(World world, int i, int j) throws IOException {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0166-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0165-Chunk-Save-Stats-Debug-Option.patch
similarity index 96%
rename from Spigot-Server-Patches/0166-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0165-Chunk-Save-Stats-Debug-Option.patch
index 12eed5c3cd..53ef69e5db 100644
--- a/Spigot-Server-Patches/0166-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0165-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From be59543734bad0e37b427a97923e1f19e17981e5 Mon Sep 17 00:00:00 2001
+From a4983ae26e02ae36edd96e20963b3c145ce27ee4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 0fb1f8427..dabe4137f 100644
+index 19f10fed..9159ed02 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -28,6 +28,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -55,7 +55,7 @@ index 0fb1f8427..dabe4137f 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 895882b2e..a4c0b0c96 100644
+index ceef6e45..d275eb19 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -32,7 +32,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -90,5 +90,5 @@ index 895882b2e..a4c0b0c96 100644
              boolean flag;
  
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0166-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 94%
rename from Spigot-Server-Patches/0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0166-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index fbb5a99185..5999a1e5b5 100644
--- a/Spigot-Server-Patches/0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0166-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From 2efeeaec765a535034aa810219995b28d35d627c Mon Sep 17 00:00:00 2001
+From ffaa3a076e512e3337083f21a68de448e3241d49 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 70b498c7b..a80d8b2ac 100644
+index 70b498c7..a80d8b2a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -30,7 +30,7 @@ index 70b498c7b..a80d8b2ac 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 6a22dce51..30e6e69fa 100644
+index 328ee251..c8a692aa 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -271,6 +271,14 @@ public class EntityFallingBlock extends Entity {
@@ -49,7 +49,7 @@ index 6a22dce51..30e6e69fa 100644
          Block block = this.block.getBlock();
  
 diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-index 41a639a27..c88938dd3 100644
+index 20070ec9..643bc41c 100644
 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 @@ -102,7 +102,14 @@ public class ItemMonsterEgg extends Item {
@@ -69,5 +69,5 @@ index 41a639a27..c88938dd3 100644
                  entity.f(nbttagcompound1);
              }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0167-Cache-user-authenticator-threads.patch
similarity index 96%
rename from Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0167-Cache-user-authenticator-threads.patch
index 044fc75197..e023d9ee3b 100644
--- a/Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0167-Cache-user-authenticator-threads.patch
@@ -1,11 +1,11 @@
-From 8c94a93f297d56ce5c8524b59511bde525d661cd Mon Sep 17 00:00:00 2001
+From 377782f93665fbd92b356483583f20a3c95d5ebb Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 57f728567..2158fcd32 100644
+index 57f72856..2158fcd3 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -96,6 +96,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -63,5 +63,5 @@ index 57f728567..2158fcd32 100644
      }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0169-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0168-Optimize-Network-Queue.patch
similarity index 89%
rename from Spigot-Server-Patches/0169-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0168-Optimize-Network-Queue.patch
index aab15dd04e..171bc5bd10 100644
--- a/Spigot-Server-Patches/0169-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0168-Optimize-Network-Queue.patch
@@ -1,11 +1,11 @@
-From 0f8e81d8128805528f3da4b437cd981e49ef794c Mon Sep 17 00:00:00 2001
+From 123d1f9c1b5da03f8d7675f061d98ec968bbb326 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1f0e79387..40514d042 100644
+index 9fc484ce..eb585818 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -103,7 +103,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -18,5 +18,5 @@ index 1f0e79387..40514d042 100644
      private long ab = aw();
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0170-Optimise-NetworkManager.patch b/Spigot-Server-Patches/0169-Optimise-NetworkManager.patch
similarity index 96%
rename from Spigot-Server-Patches/0170-Optimise-NetworkManager.patch
rename to Spigot-Server-Patches/0169-Optimise-NetworkManager.patch
index 0c7f14fd43..0e6539e36d 100644
--- a/Spigot-Server-Patches/0170-Optimise-NetworkManager.patch
+++ b/Spigot-Server-Patches/0169-Optimise-NetworkManager.patch
@@ -1,11 +1,11 @@
-From bbd1294e53495ea5c25f53e8e5826da55d3b096a Mon Sep 17 00:00:00 2001
+From fa201a9b717a5ae06c7572fcaa0811eb210d8a00 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 20:35:05 +0000
 Subject: [PATCH] Optimise NetworkManager
 
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d583cced6..89743d2be 100644
+index d583cced..89743d2b 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,8 +62,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -84,5 +84,5 @@ index d583cced6..89743d2be 100644
  
          }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0171-Optimise-removeQueue.patch b/Spigot-Server-Patches/0170-Optimise-removeQueue.patch
similarity index 95%
rename from Spigot-Server-Patches/0171-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0170-Optimise-removeQueue.patch
index b7c116817b..439844c4c8 100644
--- a/Spigot-Server-Patches/0171-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0170-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From 111631601a01e9949db2fc7cb49b475c198571b5 Mon Sep 17 00:00:00 2001
+From 40a8cfaaa06855558e2bde433738ee629bcce1a6 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8fb569beb..df2e607da 100644
+index 8fb569be..df2e607d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -3,8 +3,10 @@ package net.minecraft.server;
@@ -61,5 +61,5 @@ index 8fb569beb..df2e607da 100644
          this.cv = entityplayer.cv;
          this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
similarity index 92%
rename from Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
index b9acbefc5d..d5f98106d8 100644
--- a/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From ea6cc3c43731c653d25075aedf5cc5a10b359f80 Mon Sep 17 00:00:00 2001
+From 86e5bfc086d6d012f44007295e07199cd741384e Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4d8414369..d515ef0f4 100644
+index 4d841436..d515ef0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1854,5 +1854,24 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 4d8414369..d515ef0f4 100644
      // Paper end
  }
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0173-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0172-Add-source-to-PlayerExpChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0173-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0172-Add-source-to-PlayerExpChangeEvent.patch
index 8e747eea47..b17fe29a67 100644
--- a/Spigot-Server-Patches/0173-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0172-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From 8ecc6cb3b0e33dce1b8f86944ac73c3360f9dea0 Mon Sep 17 00:00:00 2001
+From f0aac77f067340ebedeb2af0f2b288552fbd28b1 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 4b3816465..14431b8ad 100644
+index b200bbf6..ec23eb98 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 4b3816465..14431b8ad 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d77eefd6f..999e38878 100644
+index 1caf1463..c0794a5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -45,6 +45,7 @@ import org.bukkit.entity.Player;
@@ -48,5 +48,5 @@ index d77eefd6f..999e38878 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0174-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0173-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 87%
rename from Spigot-Server-Patches/0174-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0173-Optimize-World.isLoaded-BlockPosition-Z.patch
index 52ab652ca5..521d952642 100644
--- a/Spigot-Server-Patches/0174-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0173-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 8ecee9a6e7e72cdb59078d9d9fa46ef93ea1ac8e Mon Sep 17 00:00:00 2001
+From 8da283c9a3ba008e2d3f4a0a500e51db495f19a0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 888ecce77..cfdd04d8b 100644
+index cc3a3618..58b42882 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -288,7 +288,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index 888ecce77..cfdd04d8b 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0175-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0174-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0175-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0174-Speedup-BlockPos-by-fixing-inlining.patch
index a73447a2e0..8651536329 100644
--- a/Spigot-Server-Patches/0175-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0174-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 89a39560a29c994a9dd297380e5f0c9159f9a51a Mon Sep 17 00:00:00 2001
+From 9532738f11a4563b57e61ebf94c2109b3c2ef211 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index f772c7cdf..f5dc14493 100644
+index 679d5504..8e737718 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,11 +7,12 @@ import javax.annotation.concurrent.Immutable;
@@ -66,7 +66,7 @@ index f772c7cdf..f5dc14493 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index b3c1f550c..6a0b3a62d 100644
+index b3c1f550..6a0b3a62 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -211,19 +211,21 @@ public class BlockPosition extends BaseBlockPosition {
@@ -177,5 +177,5 @@ index b3c1f550c..6a0b3a62d 100644
  
          public BlockPosition h() {
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0176-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0175-Don-t-let-fishinghooks-use-portals.patch
similarity index 90%
rename from Spigot-Server-Patches/0176-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0175-Don-t-let-fishinghooks-use-portals.patch
index 275fa48e96..dadf88011e 100644
--- a/Spigot-Server-Patches/0176-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0175-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From 7aa50cb568a461892cc0bd4d91209604afecb328 Mon Sep 17 00:00:00 2001
+From 77dc690ea1c5f9cc188ef8cab6a4c0c4c5105369 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0a8d8a1a2..e6b469a00 100644
+index 0a8d8a1a..e6b469a0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -144,7 +144,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index 0a8d8a1a2..e6b469a00 100644
      public int dimension;
      protected BlockPosition an;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 339d1f1b1..7f011aef8 100644
+index 339d1f1b..7f011aef 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -185,6 +185,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 339d1f1b1..7f011aef8 100644
      }
  
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0177-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0176-Add-ProjectileCollideEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0177-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0176-Add-ProjectileCollideEvent.patch
index 141d90c03b..5791a60588 100644
--- a/Spigot-Server-Patches/0177-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0176-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 7aee300956e5692856336b83dbb238c2ffa47d97 Mon Sep 17 00:00:00 2001
+From 4106fa942490f3f314a981b8ec7c63c59d35336e Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 8cda47518..79ca071bc 100644
+index f55eb654..1338f37f 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -25,7 +25,7 @@ index 8cda47518..79ca071bc 100644
                  this.a(movingobjectposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 789de85d1..d5c9d24cf 100644
+index 365e070f..657b3b5a 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -70,6 +70,15 @@ public abstract class EntityFireball extends Entity {
@@ -45,7 +45,7 @@ index 789de85d1..d5c9d24cf 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 606160a17..b78e0e49e 100644
+index 7f011aef..6ac89d1e 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -240,6 +240,16 @@ public class EntityFishingHook extends Entity {
@@ -66,7 +66,7 @@ index 606160a17..b78e0e49e 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 6fbc84559..a8b9d9263 100644
+index 3d3c1f5f..0415c521 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -86,7 +86,7 @@ index 6fbc84559..a8b9d9263 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 999e38878..e669f0878 100644
+index c0794a5b..9e586fa8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -794,6 +794,16 @@ public class CraftEventFactory {
@@ -107,5 +107,5 @@ index 999e38878..e669f0878 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.12.2
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0178-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch
similarity index 93%
rename from Spigot-Server-Patches/0178-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch
index 623c8425d9..5b7cae7e8d 100644
--- a/Spigot-Server-Patches/0178-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 940c75c0c08c0e3c92926e372f40d310fb0a6e52 Mon Sep 17 00:00:00 2001
+From b7cacfd3918ba0245fce9ff90227e1d9dcd8f386 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9be8c6ff5..09b2042e1 100644
+index e6b469a0..314d1df4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index 9be8c6ff5..09b2042e1 100644
      protected int j;
      private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index c0d97f154..363209170 100644
+index c0d97f15..36320917 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -20,7 +20,7 @@ public class ItemBlock extends Item {
@@ -31,10 +31,10 @@ index c0d97f154..363209170 100644
              IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 391282afc..b4ef1d6af 100644
+index 58b42882..4e316d28 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1806,6 +1806,33 @@ public abstract class World implements IBlockAccess {
+@@ -1807,6 +1807,33 @@ public abstract class World implements IBlockAccess {
          return this.a(axisalignedbb, (Entity) null);
      }
  
@@ -68,7 +68,7 @@ index 391282afc..b4ef1d6af 100644
      public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
          List list = this.getEntities((Entity) null, axisalignedbb);
  
-@@ -2696,7 +2723,7 @@ public abstract class World implements IBlockAccess {
+@@ -2697,7 +2724,7 @@ public abstract class World implements IBlockAccess {
          AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition);
  
          // CraftBukkit start - store default return
@@ -78,7 +78,7 @@ index 391282afc..b4ef1d6af 100644
          this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 09f009522..2596c2fa0 100644
+index 9e586fa8..16855803 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -799,6 +799,13 @@ public class CraftEventFactory {
@@ -96,5 +96,5 @@ index 09f009522..2596c2fa0 100644
          return event;
      }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0179-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0178-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 93%
rename from Spigot-Server-Patches/0179-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0178-Prevent-Pathfinding-out-of-World-Border.patch
index f46292deb9..bad8840d86 100644
--- a/Spigot-Server-Patches/0179-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0178-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From cef4b63524aa2de88749196ee51b6127a72ef518 Mon Sep 17 00:00:00 2001
+From 9a65260de4bb5ebafdd7f927be87a0766f11bfab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 3871ad017..a67cc3b75 100644
+index 3ac6f84d..935b2e81 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
@@ -26,7 +26,7 @@ index 3871ad017..a67cc3b75 100644
              if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
                  return this.c;
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 9038d52eb..632eb1c9d 100644
+index 9038d52e..632eb1c9 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -29,7 +29,7 @@ public class WorldBorder {
@@ -39,5 +39,5 @@ index 9038d52eb..632eb1c9d 100644
      }
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0180-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0179-Bound-Treasure-Maps-to-World-Border.patch
similarity index 94%
rename from Spigot-Server-Patches/0180-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0179-Bound-Treasure-Maps-to-World-Border.patch
index 7850f4af75..f6032273d2 100644
--- a/Spigot-Server-Patches/0180-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0179-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From acd69117c42f88022a08e265e5e8c9a3364163a7 Mon Sep 17 00:00:00 2001
+From 62903803744076053bb0aa8bcba062aac2a83342 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 078957aac..7b635d3fa 100644
+index 078957aa..7b635d3f 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -236,6 +236,9 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -25,7 +25,7 @@ index 078957aac..7b635d3fa 100644
                              if (!flag1 || !world.b(l2, i3)) {
                                  return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 632eb1c9d..1bb172bbf 100644
+index 632eb1c9..1bb172bb 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -33,6 +33,18 @@ public class WorldBorder {
@@ -48,5 +48,5 @@ index 632eb1c9d..1bb172bbf 100644
          return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
      }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0181-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0180-Configurable-Cartographer-Treasure-Maps.patch
similarity index 94%
rename from Spigot-Server-Patches/0181-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0180-Configurable-Cartographer-Treasure-Maps.patch
index 40e2056b56..db9f5aa688 100644
--- a/Spigot-Server-Patches/0181-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0180-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From ae96f169ae42891ad59a56c4b21a4718a7778ce7 Mon Sep 17 00:00:00 2001
+From f4a1622b086019d10c6fe4694ebec9cd9c4b5e91 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 a80d8b2ac..32ca0a40e 100644
+index a80d8b2a..32ca0a40 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -395,4 +395,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index a80d8b2ac..32ca0a40e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 34945598c..faa82f764 100644
+index ae68f07a..35221dec 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -767,7 +767,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -41,5 +41,5 @@ index 34945598c..faa82f764 100644
              if (blockposition != null) {
                  ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0181-Optimize-ItemStack.isEmpty.patch
similarity index 91%
rename from Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0181-Optimize-ItemStack.isEmpty.patch
index 8a06093fb1..e21602ed19 100644
--- a/Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0181-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 196a410aab74a69d80257cc6b113de21783a148d Mon Sep 17 00:00:00 2001
+From e5dde989e3b6bf034318d920ed8ed37da169b2d9 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 75b55fb18..4de2e2b25 100644
+index 0dcea61d..3aefb023 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -126,9 +126,15 @@ public final class ItemStack {
@@ -27,5 +27,5 @@ index 75b55fb18..4de2e2b25 100644
      public static void a(DataConverterManager dataconvertermanager) {
          dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0182-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 92%
rename from Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0182-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 777e9eaaab..fc98371304 100644
--- a/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0182-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 520895780196de7a0bebecc9c7d09f4148e834b6 Mon Sep 17 00:00:00 2001
+From 1deed3fc3cac67faa2ae6a5e5eff15e322ad50fd 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 b03245095..036498c09 100644
+index b0324509..036498c0 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 b03245095..036498c09 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..8a06cb165 100644
+index 2b66a08a..8a06cb16 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 2b66a08ad..8a06cb165 100644
 +    }
  }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 86%
rename from Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 727489c9a7..df05fe6fb2 100644
--- a/Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From 28d2088321eeca0098213c900e2619bfdcba975f Mon Sep 17 00:00:00 2001
+From a157c98697f829127ecfd992aeb3a1798e1a2bf4 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 32ca0a40e..70af657f5 100644
+index 32ca0a40..70af657f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -405,4 +405,9 @@ public class PaperWorldConfig {
@@ -19,10 +19,10 @@ index 32ca0a40e..70af657f5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 42cfbe096..2fe4433e7 100644
+index 4e316d28..29461585 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1334,6 +1334,7 @@ public abstract class World implements IBlockAccess {
+@@ -1335,6 +1335,7 @@ public abstract class World implements IBlockAccess {
  
          this.a(entity, axisalignedbb, false, arraylist);
          if (entity != null) {
@@ -31,5 +31,5 @@ index 42cfbe096..2fe4433e7 100644
  
              for (int i = 0; i < list.size(); ++i) {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0185-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0184-Add-option-to-remove-invalid-statistics.patch
similarity index 94%
rename from Spigot-Server-Patches/0185-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0184-Add-option-to-remove-invalid-statistics.patch
index 57fa96780a..2cc825f6a3 100644
--- a/Spigot-Server-Patches/0185-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0184-Add-option-to-remove-invalid-statistics.patch
@@ -1,11 +1,11 @@
-From 37adfdc80fd23c11c9626a9225729c691b208258 Mon Sep 17 00:00:00 2001
+From 0669deb7227d69ad367ebeb8909d38276c5f26a3 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 db2a4c2c7..e936264c5 100644
+index da0984a3..28917f63 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -256,4 +256,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index db2a4c2c7..e936264c5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 14af226f3..e3d2c0ff7 100644
+index 14af226f..e3d2c0ff 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -86,6 +86,7 @@ public class ServerStatisticManager extends StatisticManager {
@@ -53,5 +53,5 @@ index 14af226f3..e3d2c0ff7 100644
          }
      }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0186-IllegalPacketEvent.patch b/Spigot-Server-Patches/0185-IllegalPacketEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0186-IllegalPacketEvent.patch
rename to Spigot-Server-Patches/0185-IllegalPacketEvent.patch
index 7142d8b96b..aa627c0874 100644
--- a/Spigot-Server-Patches/0186-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0185-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 5eaab7e0b29e7ba7fd97cf88a328333d9047477a Mon Sep 17 00:00:00 2001
+From 6be5a80eabb55c812e5141ad910ccef1b477eff7 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 94953307b..98880f980 100644
+index 2df4e5a4..9e1870f3 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;
@@ -68,5 +68,5 @@ index 94953307b..98880f980 100644
                      }
                      // CraftBukkit start
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
similarity index 90%
rename from Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
index ea27192441..ad0fd466c3 100644
--- a/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 01960d2dc1b6839c77797649fcf53ac058c9c1a0 Mon Sep 17 00:00:00 2001
+From 346cec2986ddbffbb85c4f22327dd5008ccd7e97 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index df2e607da..13dd3dea9 100644
+index df2e607d..13dd3dea 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1491,7 +1491,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index df2e607da..13dd3dea9 100644
  
      public void reset() {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9e1870f35..54c607176 100644
+index 9e1870f3..54c60717 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2680,6 +2680,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -31,5 +31,5 @@ index 9e1870f35..54c607176 100644
      }
  }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0187-String-based-Action-Bar-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0187-String-based-Action-Bar-API.patch
index 742dfc2053..0b865c2c4f 100644
--- a/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0187-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From f0dd346a0e407d5fba4a93ad5b2e38ddea5cfc79 Mon Sep 17 00:00:00 2001
+From a11dd5b2bf084b3497007431eb7359db479f5d0b 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 1159eea1a..38359517c 100644
+index 1159eea1..38359517 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 1159eea1a..38359517c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 171e0f7bb..8bc8e2077 100644
+index 2569f0b7..28e00da3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -172,6 +172,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -85,5 +85,5 @@ index 171e0f7bb..8bc8e2077 100644
          PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
          packet.header = header;
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0189-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0188-Activation-Range-Improvements.patch
similarity index 95%
rename from Spigot-Server-Patches/0189-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0188-Activation-Range-Improvements.patch
index c7f4812194..f5c7b2957e 100644
--- a/Spigot-Server-Patches/0189-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0188-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From d8c5a6c314c708f8018f59df2ba4ad4d34a94626 Mon Sep 17 00:00:00 2001
+From 4f17df129d8d0f4f28ad092c8ca18517424aed37 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 0c82c6f5b..9659a45ef 100644
+index 0c82c6f5..9659a45e 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 0c82c6f5b..9659a45ef 100644
      private float b;
      private final float c;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e50f7a3ca..194d55c30 100644
+index e50f7a3c..194d55c3 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 e50f7a3ca..194d55c30 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 dbda68dd0..af49b7273 100644
+index dbda68dd..af49b727 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -43,7 +43,7 @@ index dbda68dd0..af49b7273 100644
          return this.bL != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 83d9c43f3..1cb6652c2 100644
+index 83d9c43f..1cb6652c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@@ -59,7 +59,7 @@ index 83d9c43f3..1cb6652c2 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 e5b5e9887..e3781f3a8 100644
+index e5b5e988..e3781f3a 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;
@@ -96,7 +96,7 @@ index e5b5e9887..e3781f3a8 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 47865c027..b08564618 100644
+index 47865c02..b0856461 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;
@@ -141,5 +141,5 @@ index 47865c027..b08564618 100644
              {
                  EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0190-Firework-API-s.patch b/Spigot-Server-Patches/0189-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0190-Firework-API-s.patch
rename to Spigot-Server-Patches/0189-Firework-API-s.patch
index a5c1bbb8e0..ddd7fe42c5 100644
--- a/Spigot-Server-Patches/0190-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0189-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From 3e0a09d98f51fee6fdebe6bd45aa59fbf57bc54d Mon Sep 17 00:00:00 2001
+From eec9365973ae5e3fde4b9a61cd2ea3b188ab20f9 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 48cdef5db..bd0ec95f2 100644
+index 48cdef5d..bd0ec95f 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 48cdef5db..bd0ec95f2 100644
  
      public boolean bd() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index b0bb4aa23..44a997215 100644
+index b0bb4aa2..44a99721 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 b0bb4aa23..44a997215 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 e15c23367..82c2537b3 100644
+index e15c2336..82c2537b 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -106,7 +106,7 @@ public class NBTTagCompound extends NBTBase {
@@ -86,7 +86,7 @@ index e15c23367..82c2537b3 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 99746b3c2..d4fbe31d6 100644
+index 99746b3c..d4fbe31d 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 99746b3c2..d4fbe31d6 100644
 +    // Paper end
  }
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0191-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0190-PlayerTeleportEndGatewayEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0191-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0190-PlayerTeleportEndGatewayEvent.patch
index f3d2375300..00ea1450fe 100644
--- a/Spigot-Server-Patches/0191-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0190-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 21227676ed7dd02cb790a080a4ba8a245496bfde Mon Sep 17 00:00:00 2001
+From 611173542ccfe256db8c7c694f65756b3ce582e0 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 9bde14d93..ab2cd1760 100644
+index 9bde14d9..ab2cd176 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 9bde14d93..ab2cd1760 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0192-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0191-ShulkerBox-Dupe-Prevention.patch
similarity index 89%
rename from Spigot-Server-Patches/0192-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0191-ShulkerBox-Dupe-Prevention.patch
index 11f8c578da..2a609be8fe 100644
--- a/Spigot-Server-Patches/0192-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0191-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From 172e9388f63868c2cc9a784b473694b52f1767a7 Mon Sep 17 00:00:00 2001
+From b5c690860be38f0bd135c1ee4d81b4cfee5470bd 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 717dc3245..96a279cb1 100644
+index 8811eb3e..74e2e448 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -112,6 +112,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@@ -19,5 +19,5 @@ index 717dc3245..96a279cb1 100644
  
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0193-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0192-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0193-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0192-Provide-E-TE-Chunk-count-stat-methods.patch
index 5606361d9d..2d52ea4b8c 100644
--- a/Spigot-Server-Patches/0193-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0192-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 6aea44509f9b2fe7b1e4523b532c6dfee332ce96 Mon Sep 17 00:00:00 2001
+From 93739b3a2f79eea51937daf6631bb5b0760e7ea0 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 0466a4f00..7e8913794 100644
+index 416e86af..7ea64362 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 0466a4f00..7e8913794 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0194-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch
similarity index 90%
rename from Spigot-Server-Patches/0194-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch
index 8205a06ede..ebd48a738d 100644
--- a/Spigot-Server-Patches/0194-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 0f8bf6009a0dd243482ac7a590f3541232fb44db Mon Sep 17 00:00:00 2001
+From f995493ed9d0b38b87b04a5ddbc99a8651aa53b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f40bd1f46..772670a03 100644
+index 7882eaba..a988fc8b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1237,6 +1237,7 @@ public abstract class PlayerList {
@@ -27,5 +27,5 @@ index f40bd1f46..772670a03 100644
      // Paper end
  
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0195-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0194-Enforce-Sync-Chunk-Unloads.patch
similarity index 91%
rename from Spigot-Server-Patches/0195-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0194-Enforce-Sync-Chunk-Unloads.patch
index 6c8ec6f466..37d5e69d32 100644
--- a/Spigot-Server-Patches/0195-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0194-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From a1e45d91d780d108a915f6d28133f7d230fd9b69 Mon Sep 17 00:00:00 2001
+From 6e0cd666f07889663c8580bb0a8e3e3a2276937e 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 7e8913794..90565227e 100644
+index 7ea64362..a606f6ce 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 7e8913794..90565227e 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0196-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0195-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 87%
rename from Spigot-Server-Patches/0196-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0195-Don-t-allow-entities-to-ride-themselves-572.patch
index 426497178a..80951773f7 100644
--- a/Spigot-Server-Patches/0196-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0195-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From 4c51ffc698c873bac8524df80f92e891660e09ba Mon Sep 17 00:00:00 2001
+From b2d462645494ca42d890cbf4d60a89e8112a33c7 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 cd2220b63..ba0bf2ee2 100644
+index 314d1df4..147f00fe 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1932,6 +1932,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,5 +17,5 @@ index cd2220b63..ba0bf2ee2 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0197-Fix-block-break-desync.patch b/Spigot-Server-Patches/0196-Fix-block-break-desync.patch
similarity index 88%
rename from Spigot-Server-Patches/0197-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0196-Fix-block-break-desync.patch
index 7d76f583c2..6899a8fd1b 100644
--- a/Spigot-Server-Patches/0197-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0196-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From 8497b1b84e4930f0b5a7280fee3d2af8e047a533 Mon Sep 17 00:00:00 2001
+From c75ee4f24eede8cd5cb57a3a8167322524564c7f 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 387cfa753..624d4be8f 100644
+index 54c60717..831094c9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -861,6 +861,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -17,5 +17,5 @@ index 387cfa753..624d4be8f 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0198-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0197-Assign-the-World-in-WorldGenStronghold.patch
similarity index 86%
rename from Spigot-Server-Patches/0198-Assign-the-World-in-WorldGenStronghold.patch
rename to Spigot-Server-Patches/0197-Assign-the-World-in-WorldGenStronghold.patch
index b4db2dc628..aa69c1a697 100644
--- a/Spigot-Server-Patches/0198-Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/0197-Assign-the-World-in-WorldGenStronghold.patch
@@ -1,11 +1,11 @@
-From 0e4da6acee7d0008d196ac64e1b03b95de26e4c2 Mon Sep 17 00:00:00 2001
+From a1fd6bc296e1ae98223d0883f63e7eec6b96f1a1 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 c93754704..a3b958e01 100644
+index c9375470..a3b958e0 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 c93754704..a3b958e01 100644
              this.c();
              this.b = true;
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0199-Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/0198-Add-fromBottle-flag-to-Experience-Orbs.patch
similarity index 93%
rename from Spigot-Server-Patches/0199-Add-fromBottle-flag-to-Experience-Orbs.patch
rename to Spigot-Server-Patches/0198-Add-fromBottle-flag-to-Experience-Orbs.patch
index 1db189457a..f35f68e55e 100644
--- a/Spigot-Server-Patches/0199-Add-fromBottle-flag-to-Experience-Orbs.patch
+++ b/Spigot-Server-Patches/0198-Add-fromBottle-flag-to-Experience-Orbs.patch
@@ -1,11 +1,11 @@
-From b807b19893a541dd43ac27daf2db8a1dd3b6f983 Mon Sep 17 00:00:00 2001
+From 6bf0e558c5ce085401ad4b9fcfc09bcfb56ccd8f 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 64ac6e6a3..19a37bfec 100644
+index ec23eb98..dab33b25 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 64ac6e6a3..19a37bfec 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0255986fd..289312950 100644
+index 0255986f..28931295 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 0255986fd..289312950 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 3a09cab3d..61e3c6c3e 100644
+index 3a09cab3..61e3c6c3 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 3a09cab3d..61e3c6c3e 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0200-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0199-Remove-the-Vanilla-Method-Profiler.patch
similarity index 95%
rename from Spigot-Server-Patches/0200-Remove-the-Vanilla-Method-Profiler.patch
rename to Spigot-Server-Patches/0199-Remove-the-Vanilla-Method-Profiler.patch
index 0a9194465f..d5feb040b1 100644
--- a/Spigot-Server-Patches/0200-Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/0199-Remove-the-Vanilla-Method-Profiler.patch
@@ -1,4 +1,4 @@
-From cfd981e4a928dedef35db11dc229652d70412cda Mon Sep 17 00:00:00 2001
+From 9d0f3de87d60210283c2810fab7fa104b0610071 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 89708da96..7586168db 100644
+index 89708da9..7586168d 100644
 --- a/src/main/java/net/minecraft/server/CommandDebug.java
 +++ b/src/main/java/net/minecraft/server/CommandDebug.java
 @@ -35,12 +35,11 @@ public class CommandDebug extends CommandAbstract {
@@ -40,7 +40,7 @@ index 89708da96..7586168db 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 20aa10c14..ebc324ed1 100644
+index 20aa10c1..ebc324ed 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 20aa10c14..ebc324ed1 100644
 +    }
 +}
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0201-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0200-Cap-Entity-Collisions.patch
similarity index 93%
rename from Spigot-Server-Patches/0201-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0200-Cap-Entity-Collisions.patch
index 5136cf2d6f..fc30cd7be0 100644
--- a/Spigot-Server-Patches/0201-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0200-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 26a1e69e6b0a7f8ab454751fa9e48d06b6b491eb Mon Sep 17 00:00:00 2001
+From 8ed42f41c0181423f8b14ff1c4272a910e57ecfb 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 70af657f5..af953dda4 100644
+index 70af657f..af953dda 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -410,4 +410,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 70af657f5..af953dda4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 147f00fe8..d34ec4ff1 100644
+index 147f00fe..d34ec4ff 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -169,6 +169,7 @@ public abstract class Entity implements ICommandListener {
@@ -39,7 +39,7 @@ index 147f00fe8..d34ec4ff1 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 194d55c30..b18fc969a 100644
+index 194d55c3..b18fc969 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2182,8 +2182,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index 194d55c30..b18fc969a 100644
                  this.C(entity);
              }
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0202-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0201-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
similarity index 92%
rename from Spigot-Server-Patches/0202-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
rename to Spigot-Server-Patches/0201-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
index c435f72a89..e04bd896d6 100644
--- a/Spigot-Server-Patches/0202-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/0201-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@@ -1,11 +1,11 @@
-From 53b33dabf7c456a0ee1f75cc4d9fe969aea5924a Mon Sep 17 00:00:00 2001
+From 06e123778923dc16e27dd8d42f8a61f785f0dd7d 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 8f67cb36c..8dc0b6238 100644
+index 8f67cb36..8dc0b623 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -40,7 +40,11 @@ public class BiomeJungle extends BiomeBase {
@@ -22,7 +22,7 @@ index 8f67cb36c..8dc0b6238 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 6a0b3a62d..38a7af58c 100644
+index 6a0b3a62..38a7af58 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 6a0b3a62d..38a7af58c 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.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0203-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0202-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 96%
rename from Spigot-Server-Patches/0203-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0202-Remove-CraftScheduler-Async-Task-Debugger.patch
index e7a53bab85..acc1af7baf 100644
--- a/Spigot-Server-Patches/0203-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0202-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 4e9998b19a31e7b48e641f3db9d437d96b4d5790 Mon Sep 17 00:00:00 2001
+From cf5f4d4909b05dd56c4e280828fd7990663998b3 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 e30cfb7b7..448c27cc7 100644
+index e30cfb7b..448c27cc 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 e30cfb7b7..448c27cc7 100644
  
      @Deprecated
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0204-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0203-Shame-on-you-Mojang.patch
similarity index 95%
rename from Spigot-Server-Patches/0204-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0203-Shame-on-you-Mojang.patch
index bb4f2f018b..712f464312 100644
--- a/Spigot-Server-Patches/0204-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0203-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 12d933a78e41845689f6b174868b277f58ec1deb Mon Sep 17 00:00:00 2001
+From e6a0df56837d0047e48cdafe151bca094d389977 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 f07ac0186..21075974d 100644
+index f07ac018..21075974 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 f07ac0186..21075974d 100644
      }
  }
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0205-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0204-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 90%
rename from Spigot-Server-Patches/0205-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0204-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index b5c48418ed..ea0e2d2053 100644
--- a/Spigot-Server-Patches/0205-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0204-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From fd4e63f204d092cb7a0aa33a2581e5043616840e Mon Sep 17 00:00:00 2001
+From 1605c8bc9c100986681de86c616968c0e689420e 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 9159ed023..e54f4f47f 100644
+index 9159ed02..e54f4f47 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 9159ed023..e54f4f47f 100644
  
                  Iterator iterator = this.unloadQueue.iterator();
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0205-Do-not-let-armorstands-drown.patch
similarity index 92%
rename from Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0205-Do-not-let-armorstands-drown.patch
index 5a2dbe058a..5940f0ba42 100644
--- a/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0205-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 3c98ffa1f850acf0a181484861093621acc04b09 Mon Sep 17 00:00:00 2001
+From be2b2064c8a9c7b00529977852106d4d19537ce8 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 036498c09..f25ee9061 100644
+index 036498c0..f25ee906 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 036498c09..f25ee9061 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b18fc969a..3c7c43902 100644
+index b18fc969..3c7c4390 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -189,6 +189,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index b18fc969a..3c7c43902 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0207-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0206-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
similarity index 89%
rename from Spigot-Server-Patches/0207-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
rename to Spigot-Server-Patches/0206-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
index bfebba3363..17152eef29 100644
--- a/Spigot-Server-Patches/0207-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
+++ b/Spigot-Server-Patches/0206-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
@@ -1,4 +1,4 @@
-From e5fe65473512356abeff12a7b80fd82a3aaa2f58 Mon Sep 17 00:00:00 2001
+From 8098d5fd980f97cb31ea4f8e4d30c0524a7b73cb 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 3aefb023e..8c7f57bc7 100644
+index 3aefb023..8c7f57bc 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -103,7 +103,7 @@ public final class ItemStack {
@@ -19,5 +19,5 @@ index 3aefb023e..8c7f57bc7 100644
          // CraftBukkit start - Route through setData for filtering
          // this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0208-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0207-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from Spigot-Server-Patches/0208-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0207-Properly-handle-async-calls-to-restart-the-server.patch
index 25f6c09ac4..7d74def6fd 100644
--- a/Spigot-Server-Patches/0208-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0207-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From c4d55d1a8975ff584d14bf11ab108105ff349566 Mon Sep 17 00:00:00 2001
+From edb20e1ceec744ff0fa18400ae98722d87e5ed3c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eb5858189..d84f59da1 100644
+index eb585818..d84f59da 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -70,6 +70,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -78,7 +78,7 @@ index eb5858189..d84f59da1 100644
          return this.serverThread;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a988fc8b9..0c3287823 100644
+index a988fc8b..0c328782 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1361,10 +1361,15 @@ public abstract class PlayerList {
@@ -107,7 +107,7 @@ index a988fc8b9..0c3287823 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 49768734d..d51636c8e 100644
+index 49768734..d51636c8 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -45,88 +45,123 @@ public class RestartCommand extends Command
@@ -306,5 +306,5 @@ index 49768734d..d51636c8e 100644
      }
  }
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0209-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0208-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0209-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0208-Add-system-property-to-disable-book-size-limits.patch
index 1339e6102b..8248cb3435 100644
--- a/Spigot-Server-Patches/0209-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0208-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From fdbecbb8c146704e666c20c2bc295377d0991e09 Mon Sep 17 00:00:00 2001
+From 73e0094ad1cd41089d16ffa3976d5aa1c71acc4e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 5d971f07b..6a7d10344 100644
+index 5d971f07..6a7d1034 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -37,6 +37,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -57,5 +57,5 @@ index 5d971f07b..6a7d10344 100644
              }
  
 -- 
-2.13.0.windows.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0210-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0209-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 93%
rename from Spigot-Server-Patches/0210-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0209-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index fea3571fe2..e1b249d78d 100644
--- a/Spigot-Server-Patches/0210-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0209-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From bc82dac0ad93868c9966291d0574540ad5f0ae81 Mon Sep 17 00:00:00 2001
+From 591059a3aeae4b5dcadaa646d84e9f3e4ec0ca88 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index af953dda4..1ce3aaa8c 100644
+index af953dda..1ce3aaa8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -416,4 +416,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index af953dda4..1ce3aaa8c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2bfbfcb9e..f5e55eaf0 100644
+index 1673d028..f5e25e63 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -399,7 +399,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 2bfbfcb9e..f5e55eaf0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 624d4be8f..7551ebf55 100644
+index 831094c9..bcb09b8f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1502,6 +1502,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -57,5 +57,5 @@ index 624d4be8f..7551ebf55 100644
  
          case STOP_SNEAKING:
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0211-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 94%
rename from Spigot-Server-Patches/0211-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
index 09d8cb77eb..b995a92fa1 100644
--- a/Spigot-Server-Patches/0211-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From bccb89f85524a48eb9b6f4bb12f3369b7e151fe2 Mon Sep 17 00:00:00 2001
+From 7f65b687a6ab597daaf4fbc9a2f3c12c109bd7d4 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -35,5 +35,5 @@ index d515ef0f..463f5890 100644
      // Paper end
  }
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0212-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0212-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
index 2ec123fec8..bfb4e70be0 100644
--- a/Spigot-Server-Patches/0212-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From fcc7f8f2c0855af3b719cc6eae27e308dbb2f69e Mon Sep 17 00:00:00 2001
+From 9b8fcb9caa1f2b98bb581d44410c08dfb7d31d9c Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -20,7 +20,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index b2aa10ff..0ae2c9c6 100644
+index cf00ee13..96f87cb6 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -47,12 +47,6 @@
@@ -36,9 +36,9 @@ index b2aa10ff..0ae2c9c6 100644
              <groupId>org.xerial</groupId>
              <artifactId>sqlite-jdbc</artifactId>
              <version>3.18.0</version>
-@@ -69,6 +63,38 @@
-             <artifactId>trove4j</artifactId>
+@@ -77,6 +71,38 @@
              <version>3.0.3</version>
+             <scope>compile</scope>
          </dependency>
 +
 +        <dependency>
@@ -75,7 +75,7 @@ index b2aa10ff..0ae2c9c6 100644
          <!-- testing -->
          <dependency>
              <groupId>junit</groupId>
-@@ -216,10 +242,18 @@
+@@ -224,10 +250,18 @@
                                  <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                      <resource>META-INF/services/java.sql.Driver</resource>
                                  </transformer>
@@ -332,7 +332,7 @@ index 463f5890..df6a75b0 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 66e72006..84872520 100644
+index 634cde14..ff805c9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -14,7 +14,7 @@ import java.util.logging.Logger;
@@ -635,5 +635,5 @@ index 5cee8f00..08b6bb7f 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0213-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0212-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 92%
rename from Spigot-Server-Patches/0213-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0212-provide-a-configurable-option-to-disable-creeper-lin.patch
index 26c7957be7..2a9c0645b6 100644
--- a/Spigot-Server-Patches/0213-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0212-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 41485db87dc97472c2155e45146a5118ae61be07 Mon Sep 17 00:00:00 2001
+From 34b1a9cae5899eb3eeec50ae9f1a408b67d643ac Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1ce3aaa8c..54d081fd2 100644
+index 1ce3aaa8..54d081fd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -422,4 +422,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 1ce3aaa8c..54d081fd2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 4a5e87b5f..6a653f8b5 100644
+index 4a5e87b5..6a653f8b 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -222,7 +222,7 @@ public class EntityCreeper extends EntityMonster {
@@ -34,5 +34,5 @@ index 4a5e87b5f..6a653f8b5 100644
  
              entityareaeffectcloud.setRadius(2.5F);
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0214-Item-canEntityPickup.patch b/Spigot-Server-Patches/0213-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0214-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0213-Item-canEntityPickup.patch
index 2ba9579423..9fb2cbc89b 100644
--- a/Spigot-Server-Patches/0214-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0213-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From c45dc0443356a24ad649ca27d03854f287b916c2 Mon Sep 17 00:00:00 2001
+From 2e4a8765544b8d74e9b212bfdf180ef923cf8359 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index b594602ab..a7bee79b8 100644
+index b594602a..a7bee79b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -512,6 +512,12 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -22,7 +22,7 @@ index b594602ab..a7bee79b8 100644
                      this.a(entityitem);
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 1927e8e25..083155998 100644
+index 1927e8e2..08315599 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -19,6 +19,7 @@ public class EntityItem extends Entity implements HopperPusher {
@@ -34,7 +34,7 @@ index 1927e8e25..083155998 100644
      private String g;
      private String h;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index a17a537d6..1df17f09b 100644
+index a17a537d..1df17f09 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -55,5 +55,5 @@ index a17a537d6..1df17f09b 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0215-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0214-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 94%
rename from Spigot-Server-Patches/0215-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0214-PlayerPickupItemEvent-setFlyAtPlayer.patch
index acfd196b66..44cc6f76ad 100644
--- a/Spigot-Server-Patches/0215-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0214-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From f1170c4c07786c7874951f21ad991cb404d9ccbc Mon Sep 17 00:00:00 2001
+From 55935073e08bcccfc096d7a35b1ab26571c0fa53 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 083155998..6ed3d7906 100644
+index 08315599..6ed3d790 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -329,6 +329,7 @@ public class EntityItem extends Entity implements HopperPusher {
@@ -45,5 +45,5 @@ index 083155998..6ed3d7906 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0216-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0215-PlayerAttemptPickupItemEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0216-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0215-PlayerAttemptPickupItemEvent.patch
index 0f72ee91c2..222e9b0de9 100644
--- a/Spigot-Server-Patches/0216-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0215-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From 60df54b7313c848e4144b3023ee60ce26b980b25 Mon Sep 17 00:00:00 2001
+From b4910c9b67d00ff02eb6cdd8261ba0c7b804201e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6ed3d7906..21a7a3a12 100644
+index 6ed3d790..21a7a3a1 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -4,6 +4,7 @@ import java.util.Iterator;
@@ -30,5 +30,5 @@ index 6ed3d7906..21a7a3a12 100644
              int canHold = entityhuman.inventory.canHold(itemstack);
              int remaining = i - canHold;
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0217-EntityPickupItemEvent.patch b/Spigot-Server-Patches/0216-EntityPickupItemEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0217-EntityPickupItemEvent.patch
rename to Spigot-Server-Patches/0216-EntityPickupItemEvent.patch
index 83cff0ec34..723d8dcb9d 100644
--- a/Spigot-Server-Patches/0217-EntityPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0216-EntityPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From db4dea8fc1d501d4fb9b876675a56788fe29f05e Mon Sep 17 00:00:00 2001
+From 2bd8b2b7e764e6e93fe7ac9d037d65f240bf915a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 01:16:22 -0500
 Subject: [PATCH] EntityPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index a7bee79b8..a93c00014 100644
+index a7bee79b..a93c0001 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -10,8 +10,11 @@ import java.util.UUID;
@@ -38,5 +38,5 @@ index a7bee79b8..a93c00014 100644
  
              switch (enumitemslot.a()) {
 -- 
-2.13.1
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0218-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0217-Add-UnknownCommandEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0218-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0217-Add-UnknownCommandEvent.patch
index 6afa438e57..4a36fd5583 100644
--- a/Spigot-Server-Patches/0218-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0217-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From b49e6ad34f34bbf18fb376323760bfa955275aa5 Mon Sep 17 00:00:00 2001
+From 65bc93a0ebe12135a0888fabbccb08bdb38f5d50 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index df6a75b05..2a5107f66 100644
+index df6a75b0..2a5107f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -32,5 +32,5 @@ index df6a75b05..2a5107f66 100644
          // Spigot end
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0219-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0218-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0219-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0218-Shoulder-Entities-Release-API.patch
index 7f2f0f3470..44cdb437a8 100644
--- a/Spigot-Server-Patches/0219-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0218-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From e30f915fc361a40fa46b2eee407144439076699d Mon Sep 17 00:00:00 2001
+From 413ee80e6b51a9c2966837ee1bc7a6b034f4704b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f5e25e63d..c74095554 100644
+index f5e25e63..c7409555 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1717,21 +1717,48 @@ public abstract class EntityHuman extends EntityLiving {
@@ -62,7 +62,7 @@ index f5e25e63d..c74095554 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 25e1e5a3f..463dddc98 100644
+index 25e1e5a3..463dddc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -441,6 +441,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -99,5 +99,5 @@ index 25e1e5a3f..463dddc98 100644
      public org.bukkit.entity.Entity getShoulderEntityLeft() {
          if (!getHandle().getShoulderEntityLeft().isEmpty()) {
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/Spigot-Server-Patches/0220-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0219-Profile-Lookup-Events.patch
similarity index 93%
rename from Spigot-Server-Patches/0220-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0219-Profile-Lookup-Events.patch
index f105ed94b7..f8b713482b 100644
--- a/Spigot-Server-Patches/0220-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0219-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 6bfc9bd9aa12221cd1fdfda4403d792d69373195 Mon Sep 17 00:00:00 2001
+From 0ef4633089e4d58beedfef2f7f141b6115288788 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8ca8fdceb..ab8703106 100644
+index 8ca8fdce..ab870310 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1018,6 +1018,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -19,5 +19,5 @@ index 8ca8fdceb..ab8703106 100644
              final DedicatedServer dedicatedserver = new DedicatedServer(options, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache);
  
 -- 
-2.13.0
+2.13.1.windows.2
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6aa0fa3206..03f1e37ae2 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6aa0fa32069330765546643a199dfd3a3c77284c
+Subproject commit 03f1e37ae2f81b4a34006266e4a01f98aeaf5aff
diff --git a/work/Spigot b/work/Spigot
index cd6ba67988..0869666b3a 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit cd6ba6798868b56caf949efe0d92fce1560b102e
+Subproject commit 0869666b3a7730fbecb02fbbf8d7fefec3b1173a