From 1bce5c2438483c79387f25bac424d298819b3841 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 18 Apr 2016 09:43:19 -0500
Subject: [PATCH] Here have a rebuild while we're at it

---
 ...-handshake-event-to-allow-plugins-to-handle-clien.patch} | 4 ++--
 ...vent-possible-infinite-loop-in-BlockPosition-iter.patch} | 2 +-
 ...tSlot.patch => 0109-Access-items-by-EquipmentSlot.patch} | 2 +-
 ...tch => 0110-Check-async-remove-unused-vars-GH-159.patch} | 2 +-
 ...-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} | 4 ++--
 ...atch => 0112-Entity-AddTo-RemoveFrom-World-Events.patch} | 2 +-
 ....patch => 0113-Configurable-Chunk-Inhabited-Timer.patch} | 2 +-
 ...tyPathfindEvent.patch => 0114-EntityPathfindEvent.patch} | 2 +-
 ...vent-Waterflow-BlockFromToEvent-from-loading-chun.patch} | 2 +-
 ...round.patch => 0116-Minecart-drop-name-workaround.patch} | 2 +-
 ...h => 0117-Reduce-IO-ops-opening-a-new-region-file.patch} | 2 +-
 ...18-Sanitise-RegionFileCache-and-make-configurable.patch} | 2 +-
 ...-UUID-API.patch => 0119-Add-getEntity-by-UUID-API.patch} | 2 +-
 ...llections.patch => 0120-Use-Optimized-Collections.patch} | 2 +-
 ...patch => 0121-Do-not-load-chunks-for-light-checks.patch} | 2 +-
 ...ent.patch => 0122-Add-PlayerUseUnknownEntityEvent.patch} | 4 ++--
 ...23-Fix-reducedDebugInfo-not-initialized-on-client.patch} | 2 +-
 ...patch => 0124-Configurable-Grass-Spread-Tick-Rate.patch} | 2 +-
 ...25-Configurable-Keep-Spawn-Loaded-range-per-world.patch} | 4 ++--
 ...Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} | 2 +-
 ...0127-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} | 2 +-
 ...s.patch => 0128-Remove-Debug-checks-from-DataBits.patch} | 2 +-
 ...ion-to-use-vanilla-per-world-scoreboard-coloring-.patch} | 2 +-
 ...emory-cleanup.patch => 0130-16w14a-memory-cleanup.patch} | 2 +-
 ...0131-Workaround-for-setting-passengers-on-players.patch} | 6 +++---
 ...GOT-1903-Update-PlayerConnection-on-teleporting-p.patch} | 4 ++--
 ...atch => 0133-Remove-unused-World-Tile-Entity-List.patch} | 2 +-
 ...-code.patch => 0134-Don-t-tick-Skulls-unused-code.patch} | 4 ++--
 ...135-Fix-some-players-not-being-kicked-on-shutdown.patch} | 2 +-
 ...ision.patch => 0136-Configurable-Player-Collision.patch} | 2 +-
 ...-handshake-event-to-allow-plugins-to-handle-clien.patch} | 4 ++--
 ...=> 0138-Water-mobs-should-only-spawn-in-the-water.patch} | 2 +-
 ...atch => 0139-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} | 4 ++--
 ...Allow-capping-number-of-attempts-at-spawning-mobs.patch} | 4 ++--
 ...ddress.patch => 0141-Configurable-RCON-IP-address.patch} | 4 ++--
 ...ks.patch => 0142-Prevent-Fire-from-loading-chunks.patch} | 4 ++--
 36 files changed, 49 insertions(+), 49 deletions(-)
 rename Spigot-API-Patches/{0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (98%)
 rename Spigot-Server-Patches/{0109-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch => 0108-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch} (98%)
 rename Spigot-Server-Patches/{0110-Access-items-by-EquipmentSlot.patch => 0109-Access-items-by-EquipmentSlot.patch} (97%)
 rename Spigot-Server-Patches/{0111-Check-async-remove-unused-vars-GH-159.patch => 0110-Check-async-remove-unused-vars-GH-159.patch} (96%)
 rename Spigot-Server-Patches/{0112-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0111-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (97%)
 rename Spigot-Server-Patches/{0113-Entity-AddTo-RemoveFrom-World-Events.patch => 0112-Entity-AddTo-RemoveFrom-World-Events.patch} (94%)
 rename Spigot-Server-Patches/{0114-Configurable-Chunk-Inhabited-Timer.patch => 0113-Configurable-Chunk-Inhabited-Timer.patch} (95%)
 rename Spigot-Server-Patches/{0115-EntityPathfindEvent.patch => 0114-EntityPathfindEvent.patch} (96%)
 rename Spigot-Server-Patches/{0116-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch => 0115-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch} (97%)
 rename Spigot-Server-Patches/{0117-Minecart-drop-name-workaround.patch => 0116-Minecart-drop-name-workaround.patch} (94%)
 rename Spigot-Server-Patches/{0118-Reduce-IO-ops-opening-a-new-region-file.patch => 0117-Reduce-IO-ops-opening-a-new-region-file.patch} (96%)
 rename Spigot-Server-Patches/{0119-Sanitise-RegionFileCache-and-make-configurable.patch => 0118-Sanitise-RegionFileCache-and-make-configurable.patch} (98%)
 rename Spigot-Server-Patches/{0120-Add-getEntity-by-UUID-API.patch => 0119-Add-getEntity-by-UUID-API.patch} (97%)
 rename Spigot-Server-Patches/{0121-Use-Optimized-Collections.patch => 0120-Use-Optimized-Collections.patch} (97%)
 rename Spigot-Server-Patches/{0122-Do-not-load-chunks-for-light-checks.patch => 0121-Do-not-load-chunks-for-light-checks.patch} (93%)
 rename Spigot-Server-Patches/{0123-Add-PlayerUseUnknownEntityEvent.patch => 0122-Add-PlayerUseUnknownEntityEvent.patch} (94%)
 rename Spigot-Server-Patches/{0124-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0123-Fix-reducedDebugInfo-not-initialized-on-client.patch} (94%)
 rename Spigot-Server-Patches/{0125-Configurable-Grass-Spread-Tick-Rate.patch => 0124-Configurable-Grass-Spread-Tick-Rate.patch} (96%)
 rename Spigot-Server-Patches/{0126-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0125-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (97%)
 rename Spigot-Server-Patches/{0127-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0126-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (92%)
 rename Spigot-Server-Patches/{0128-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0127-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (95%)
 rename Spigot-Server-Patches/{0129-Remove-Debug-checks-from-DataBits.patch => 0128-Remove-Debug-checks-from-DataBits.patch} (96%)
 rename Spigot-Server-Patches/{0130-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0129-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (97%)
 rename Spigot-Server-Patches/{0131-16w14a-memory-cleanup.patch => 0130-16w14a-memory-cleanup.patch} (96%)
 rename Spigot-Server-Patches/{0132-Workaround-for-setting-passengers-on-players.patch => 0131-Workaround-for-setting-passengers-on-players.patch} (86%)
 rename Spigot-Server-Patches/{0133-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch => 0132-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch} (95%)
 rename Spigot-Server-Patches/{0134-Remove-unused-World-Tile-Entity-List.patch => 0133-Remove-unused-World-Tile-Entity-List.patch} (98%)
 rename Spigot-Server-Patches/{0135-Don-t-tick-Skulls-unused-code.patch => 0134-Don-t-tick-Skulls-unused-code.patch} (91%)
 rename Spigot-Server-Patches/{0136-Fix-some-players-not-being-kicked-on-shutdown.patch => 0135-Fix-some-players-not-being-kicked-on-shutdown.patch} (94%)
 rename Spigot-Server-Patches/{0137-Configurable-Player-Collision.patch => 0136-Configurable-Player-Collision.patch} (96%)
 rename Spigot-Server-Patches/{0138-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0137-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (97%)
 rename Spigot-Server-Patches/{0139-Water-mobs-should-only-spawn-in-the-water.patch => 0138-Water-mobs-should-only-spawn-in-the-water.patch} (94%)
 rename Spigot-Server-Patches/{0140-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch => 0139-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} (97%)
 rename Spigot-Server-Patches/{0141-Allow-capping-number-of-attempts-at-spawning-mobs.patch => 0140-Allow-capping-number-of-attempts-at-spawning-mobs.patch} (97%)
 rename Spigot-Server-Patches/{0142-Configurable-RCON-IP-address.patch => 0141-Configurable-RCON-IP-address.patch} (93%)
 rename Spigot-Server-Patches/{0143-Prevent-Fire-from-loading-chunks.patch => 0142-Prevent-Fire-from-loading-chunks.patch} (96%)

diff --git a/Spigot-API-Patches/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 98%
rename from Spigot-API-Patches/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-API-Patches/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 26576cb4f..374338719 100644
--- a/Spigot-API-Patches/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-API-Patches/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From b83384a668c8df232f4c3a7174ea16dfa704617f Mon Sep 17 00:00:00 2001
+From 82d3cb13bbd3fa88aabf928183e268849d789297 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:20:18 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -223,5 +223,5 @@ index 0000000..e44d03a
 +    }
 +}
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0109-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch b/Spigot-Server-Patches/0108-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
similarity index 98%
rename from Spigot-Server-Patches/0109-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
rename to Spigot-Server-Patches/0108-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
index 9db44bddf..b8f412aaf 100644
--- a/Spigot-Server-Patches/0109-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
+++ b/Spigot-Server-Patches/0108-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
@@ -1,4 +1,4 @@
-From 60476465177fdb77f6b8e66afed0caaf2a7946ba Mon Sep 17 00:00:00 2001
+From b1d3a534902a697200c83cdfd1d51722538c4e0a Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sat, 26 Mar 2016 21:36:05 -0500
 Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
diff --git a/Spigot-Server-Patches/0110-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0109-Access-items-by-EquipmentSlot.patch
similarity index 97%
rename from Spigot-Server-Patches/0110-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0109-Access-items-by-EquipmentSlot.patch
index 854814b2c..abc19d225 100644
--- a/Spigot-Server-Patches/0110-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0109-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From e7d974662e255f3f8dc6312901ac7f01cf2a1d1c Mon Sep 17 00:00:00 2001
+From 3175e1d498f0b2797c51412423cff8b439ae4ec8 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
diff --git a/Spigot-Server-Patches/0111-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0110-Check-async-remove-unused-vars-GH-159.patch
similarity index 96%
rename from Spigot-Server-Patches/0111-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0110-Check-async-remove-unused-vars-GH-159.patch
index 5b6f7a745..717a08e3d 100644
--- a/Spigot-Server-Patches/0111-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0110-Check-async-remove-unused-vars-GH-159.patch
@@ -1,4 +1,4 @@
-From 7616ed0a0949bef668e0284f5f0f49218d293be7 Mon Sep 17 00:00:00 2001
+From 8cea438f7c32fcc261b8fefc5fd055cfb75d6700 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/Spigot-Server-Patches/0112-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0111-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 97%
rename from Spigot-Server-Patches/0112-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0111-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 8cecef1fe..7e792bf76 100644
--- a/Spigot-Server-Patches/0112-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0111-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 619347f84ad66e6e4fc8b55532fdf4077374df7d Mon Sep 17 00:00:00 2001
+From ec3841938504ccc00a8eae4f4c833b4ef14cb4f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -38,7 +38,7 @@ index 6c4a0aa..4bfeb01 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 0acce3e..1f0db4c 100644
+index 3d25fd4..e31bb65 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -32,6 +32,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
diff --git a/Spigot-Server-Patches/0113-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0112-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 94%
rename from Spigot-Server-Patches/0113-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0112-Entity-AddTo-RemoveFrom-World-Events.patch
index 1e6460960..0c660ca08 100644
--- a/Spigot-Server-Patches/0113-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0112-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From b5c79135ca8139c5f1f8ccd31712f2d0bc1d4cde Mon Sep 17 00:00:00 2001
+From a2fa5524eef6d94c5796dc1860729b9e0433aabf 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/Spigot-Server-Patches/0114-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0113-Configurable-Chunk-Inhabited-Timer.patch
similarity index 95%
rename from Spigot-Server-Patches/0114-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0113-Configurable-Chunk-Inhabited-Timer.patch
index 75fbb4f43..dedd3cfbc 100644
--- a/Spigot-Server-Patches/0114-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0113-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From d2962cd2970cd1aaf6ab931189512cd626f77581 Mon Sep 17 00:00:00 2001
+From 189ab6d189fc1da09850d78eedf8ed705738c54d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
diff --git a/Spigot-Server-Patches/0115-EntityPathfindEvent.patch b/Spigot-Server-Patches/0114-EntityPathfindEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0115-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0114-EntityPathfindEvent.patch
index a7dbc12a9..dbc0cc18e 100644
--- a/Spigot-Server-Patches/0115-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0114-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 06aaa486af57482d6a528208bbaabd477b11ddd3 Mon Sep 17 00:00:00 2001
+From e223839dc07c768f1f76ed0fa5aa0b27c0fd0173 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
diff --git a/Spigot-Server-Patches/0116-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0115-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0116-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0115-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index 6aecb61ad..0c485795e 100644
--- a/Spigot-Server-Patches/0116-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0115-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From 7f4484487e0a74dc63b2846472038f335132d687 Mon Sep 17 00:00:00 2001
+From f2035042805b5f7b9844412adfa13512b2a9ed53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
diff --git a/Spigot-Server-Patches/0117-Minecart-drop-name-workaround.patch b/Spigot-Server-Patches/0116-Minecart-drop-name-workaround.patch
similarity index 94%
rename from Spigot-Server-Patches/0117-Minecart-drop-name-workaround.patch
rename to Spigot-Server-Patches/0116-Minecart-drop-name-workaround.patch
index 741f5f240..15ca711d3 100644
--- a/Spigot-Server-Patches/0117-Minecart-drop-name-workaround.patch
+++ b/Spigot-Server-Patches/0116-Minecart-drop-name-workaround.patch
@@ -1,4 +1,4 @@
-From a6f76a4f31883fa1b948bd7a9bdb101a599b173d Mon Sep 17 00:00:00 2001
+From ac8b080a84cd7f454022a8c74abe1b64739b0d8b Mon Sep 17 00:00:00 2001
 From: Fabse <fabse@uwmc.info>
 Date: Mon, 28 Mar 2016 00:46:46 +0200
 Subject: [PATCH] Minecart drop name workaround
diff --git a/Spigot-Server-Patches/0118-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0117-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 96%
rename from Spigot-Server-Patches/0118-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0117-Reduce-IO-ops-opening-a-new-region-file.patch
index c5bd17c81..1b405ff78 100644
--- a/Spigot-Server-Patches/0118-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0117-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 655d164991eca55b9c4ca8d0e3f070562f76b936 Mon Sep 17 00:00:00 2001
+From a3c0ee4df66110789ff60cd8c1a0a528a1f5ace2 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
diff --git a/Spigot-Server-Patches/0119-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0118-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 98%
rename from Spigot-Server-Patches/0119-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0118-Sanitise-RegionFileCache-and-make-configurable.patch
index 1b25ac1f1..7c121327f 100644
--- a/Spigot-Server-Patches/0119-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0118-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From d0dba984a2e9a3fecae37744ba0a15c0d96aeb9f Mon Sep 17 00:00:00 2001
+From 76f0b39c7bd7cf8c582240eca4083361aa72f8cd Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
diff --git a/Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0119-Add-getEntity-by-UUID-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch
rename to Spigot-Server-Patches/0119-Add-getEntity-by-UUID-API.patch
index 37b3b73e1..9e5bb332a 100644
--- a/Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0119-Add-getEntity-by-UUID-API.patch
@@ -1,4 +1,4 @@
-From cc2124afa0ca280e364f20d786d5451f1a928568 Mon Sep 17 00:00:00 2001
+From 1225a5c9172f97e3dd4edb31ce1357ab905ea957 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
diff --git a/Spigot-Server-Patches/0121-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0120-Use-Optimized-Collections.patch
similarity index 97%
rename from Spigot-Server-Patches/0121-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0120-Use-Optimized-Collections.patch
index ec1694788..a72e162a4 100644
--- a/Spigot-Server-Patches/0121-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0120-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From f5f8b5a575cc3c930265d776afb026c1612ac2af Mon Sep 17 00:00:00 2001
+From 7243594901602fc375b0f27944699f503bd5f846 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
diff --git a/Spigot-Server-Patches/0122-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0121-Do-not-load-chunks-for-light-checks.patch
similarity index 93%
rename from Spigot-Server-Patches/0122-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0121-Do-not-load-chunks-for-light-checks.patch
index d7faa8c5a..933102bc4 100644
--- a/Spigot-Server-Patches/0122-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0121-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 65245988b7681107893c71f8c59cdcaf5d02c666 Mon Sep 17 00:00:00 2001
+From 7e257605f53866ea3b9d47526c9bcd7161a8318d 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
diff --git a/Spigot-Server-Patches/0123-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0122-Add-PlayerUseUnknownEntityEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0123-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0122-Add-PlayerUseUnknownEntityEvent.patch
index 47ef45556..1741a6a4b 100644
--- a/Spigot-Server-Patches/0123-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0122-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From fc164410c3896a0f0cbd3383781c11ef6b98f498 Mon Sep 17 00:00:00 2001
+From 754b518fd840f787991e4bf3dca11725a1d99bf5 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,7 +18,7 @@ index 2b23a5d..6464a84 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 ff64891..b60b134 100644
+index 3837f64..ffbe81d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1615,6 +1615,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0124-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0123-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0124-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0123-Fix-reducedDebugInfo-not-initialized-on-client.patch
index c108d000c..90dc4eeaf 100644
--- a/Spigot-Server-Patches/0124-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0123-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,4 +1,4 @@
-From 3e68479b520d9f10cbec3428d6994d223157fdd9 Mon Sep 17 00:00:00 2001
+From ec1e988581d5041440b25cca3d6057c343f53cb6 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
diff --git a/Spigot-Server-Patches/0125-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0124-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 96%
rename from Spigot-Server-Patches/0125-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0124-Configurable-Grass-Spread-Tick-Rate.patch
index be61c0d47..5803a02a1 100644
--- a/Spigot-Server-Patches/0125-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0124-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From 2a92f48361cd9f48917a02edd1f63ae860685c03 Mon Sep 17 00:00:00 2001
+From 7fcd845ac3ae361b824b2267cf7eebf7e4c104df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
diff --git a/Spigot-Server-Patches/0126-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0125-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0126-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0125-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 90a16a042..43626029f 100644
--- a/Spigot-Server-Patches/0126-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0125-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From a28f9107123ed0732dde748e4c8e13b7e0952e2b Mon Sep 17 00:00:00 2001
+From d862e8c16b123d217c87c59939300051e7f826dc 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
@@ -50,7 +50,7 @@ index 5be36f5..0e1bcdd 100644
          return k >= -short0 && k <= short0 && l >= -short0 && l <= short0 && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory'
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5b70d7a..831ef84 100644
+index 128b597..54c27c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -945,7 +945,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0127-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0126-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 92%
rename from Spigot-Server-Patches/0127-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0126-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index f1e5e4a5d..20e85cc7b 100644
--- a/Spigot-Server-Patches/0127-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0126-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,4 +1,4 @@
-From 8aa5f679036c0c31e43fa5d03c48d3ae2a7a4b4e Mon Sep 17 00:00:00 2001
+From 68622172bbafb6574ee324a6617e13a652a8666a 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/Spigot-Server-Patches/0128-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0127-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 95%
rename from Spigot-Server-Patches/0128-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0127-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 84a6ab2e1..b3a734fb3 100644
--- a/Spigot-Server-Patches/0128-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0127-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From 0a64b8341f3ffb2613ccfa498f0751b8aac5cdea Mon Sep 17 00:00:00 2001
+From 5f96c6145fc3147316a5c12e75cb650570f6717e 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/Spigot-Server-Patches/0129-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0128-Remove-Debug-checks-from-DataBits.patch
similarity index 96%
rename from Spigot-Server-Patches/0129-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0128-Remove-Debug-checks-from-DataBits.patch
index 95316d2b0..315dc9e1f 100644
--- a/Spigot-Server-Patches/0129-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0128-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From c6bc76ac60f1cfae931ab39397e133033488b43c Mon Sep 17 00:00:00 2001
+From 5f1c0eadc3f384578b9c37a86b4596c944ea90d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
diff --git a/Spigot-Server-Patches/0130-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0129-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 97%
rename from Spigot-Server-Patches/0130-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0129-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 8f42d7f15..4aa8b89f9 100644
--- a/Spigot-Server-Patches/0130-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0129-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 0c8ed02fba9f533947d868633af78e862a7b7ffb Mon Sep 17 00:00:00 2001
+From e77264503edd535bdf196392f3275ba91c529b2c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
diff --git a/Spigot-Server-Patches/0131-16w14a-memory-cleanup.patch b/Spigot-Server-Patches/0130-16w14a-memory-cleanup.patch
similarity index 96%
rename from Spigot-Server-Patches/0131-16w14a-memory-cleanup.patch
rename to Spigot-Server-Patches/0130-16w14a-memory-cleanup.patch
index 4bd07faf0..558548440 100644
--- a/Spigot-Server-Patches/0131-16w14a-memory-cleanup.patch
+++ b/Spigot-Server-Patches/0130-16w14a-memory-cleanup.patch
@@ -1,4 +1,4 @@
-From 92192f36f2eed7394532ea5778417ea4668afebe Mon Sep 17 00:00:00 2001
+From de9a17eabef87c1b26c85832a89254bd03c69a7a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 7 Apr 2016 18:28:06 -0500
 Subject: [PATCH] 16w14a memory cleanup
diff --git a/Spigot-Server-Patches/0132-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0131-Workaround-for-setting-passengers-on-players.patch
similarity index 86%
rename from Spigot-Server-Patches/0132-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0131-Workaround-for-setting-passengers-on-players.patch
index be6d570fd..cbf96d9d5 100644
--- a/Spigot-Server-Patches/0132-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0131-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 3e584691c9aefa576fbb5d6a8241c80f65297145 Mon Sep 17 00:00:00 2001
+From 0c3bf99161ca9f8a9e43839b04a3ae6f089ddf79 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0a3dc16..4378795 100644
+index eb88228..b0e4800 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -571,6 +571,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -564,6 +564,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
diff --git a/Spigot-Server-Patches/0133-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch b/Spigot-Server-Patches/0132-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
similarity index 95%
rename from Spigot-Server-Patches/0133-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
rename to Spigot-Server-Patches/0132-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
index a48689443..d290518da 100644
--- a/Spigot-Server-Patches/0133-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
+++ b/Spigot-Server-Patches/0132-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
@@ -1,4 +1,4 @@
-From 307c4b55c0176a16ae15583641da73bfccbc5e4e Mon Sep 17 00:00:00 2001
+From e822d179360823fec952115f5c9ce2216aca5376 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Apr 2016 22:36:10 -0400
 Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players
@@ -32,5 +32,5 @@ index f0c04e5..d267a44 100644
          this.m = this.player.locY;
          this.n = this.player.locZ;
 -- 
-2.8.1
+2.8.0
 
diff --git a/Spigot-Server-Patches/0134-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0133-Remove-unused-World-Tile-Entity-List.patch
similarity index 98%
rename from Spigot-Server-Patches/0134-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0133-Remove-unused-World-Tile-Entity-List.patch
index 9d19e5ff9..6cb1f2998 100644
--- a/Spigot-Server-Patches/0134-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0133-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 46bc214fe10b3015ac04381f15972f70e5c045ba Mon Sep 17 00:00:00 2001
+From d43727ba66b537ad7175bdc656164c1be2c888fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
diff --git a/Spigot-Server-Patches/0135-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0134-Don-t-tick-Skulls-unused-code.patch
similarity index 91%
rename from Spigot-Server-Patches/0135-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0134-Don-t-tick-Skulls-unused-code.patch
index 1e1bd1f10..de5e6a0cd 100644
--- a/Spigot-Server-Patches/0135-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0134-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From 2e15509cae111abe7ba242e05f0d9d3807ca4043 Mon Sep 17 00:00:00 2001
+From 0752295a90cddb505faf9bbe3c5a94b07085bb25 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
@@ -18,5 +18,5 @@ index 3c20ef3..e652983 100644
      private int a;
      private int rotation;
 -- 
-2.8.1
+2.8.0
 
diff --git a/Spigot-Server-Patches/0136-Fix-some-players-not-being-kicked-on-shutdown.patch b/Spigot-Server-Patches/0135-Fix-some-players-not-being-kicked-on-shutdown.patch
similarity index 94%
rename from Spigot-Server-Patches/0136-Fix-some-players-not-being-kicked-on-shutdown.patch
rename to Spigot-Server-Patches/0135-Fix-some-players-not-being-kicked-on-shutdown.patch
index 8df0ae3c7..082c5e9a4 100644
--- a/Spigot-Server-Patches/0136-Fix-some-players-not-being-kicked-on-shutdown.patch
+++ b/Spigot-Server-Patches/0135-Fix-some-players-not-being-kicked-on-shutdown.patch
@@ -1,4 +1,4 @@
-From 56ac5514f341eb1a9b4ca36bce41ba88181b214c Mon Sep 17 00:00:00 2001
+From a57078fbc2ac6ef2c8ec3094929d0ce9360907a4 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 29 Mar 2016 20:19:20 -0400
 Subject: [PATCH] Fix some players not being kicked on shutdown
diff --git a/Spigot-Server-Patches/0137-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0136-Configurable-Player-Collision.patch
similarity index 96%
rename from Spigot-Server-Patches/0137-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0136-Configurable-Player-Collision.patch
index f6c53c825..b61e653b3 100644
--- a/Spigot-Server-Patches/0137-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0136-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From c5a82d76a6bd15edc09baaf57f8d4df6d8cd5d76 Mon Sep 17 00:00:00 2001
+From 807929a1da57a5a009a5b7e547d3abef04b64b22 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
diff --git a/Spigot-Server-Patches/0138-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0137-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 97%
rename from Spigot-Server-Patches/0138-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0137-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index c150ab764..39ee02d47 100644
--- a/Spigot-Server-Patches/0138-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0137-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 838f52d11032d2a8ae0d3d6a7032fff0b7d58a0b Mon Sep 17 00:00:00 2001
+From 462b0dc22770c0eb4da0d593a5f378d76502a1ed Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -45,5 +45,5 @@ index 5f8d853..4d496fd 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0139-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0138-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 94%
rename from Spigot-Server-Patches/0139-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0138-Water-mobs-should-only-spawn-in-the-water.patch
index bd233804d..b57bb4094 100644
--- a/Spigot-Server-Patches/0139-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0138-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From 3144b183fd16deaacce4e8dd932ba58849b03aa9 Mon Sep 17 00:00:00 2001
+From b0ec44dc721d48e6cdc71bf250921fa016e3ed14 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
diff --git a/Spigot-Server-Patches/0140-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0139-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 97%
rename from Spigot-Server-Patches/0140-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0139-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index 5ca4d6ed8..15660bac0 100644
--- a/Spigot-Server-Patches/0140-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0139-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From e4e4bb6ea35b2bf711d57c1f9f694c366a6fa105 Mon Sep 17 00:00:00 2001
+From fc56e12ac524ba22e8f7d90e3b1b2b292e7d48f6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -56,5 +56,5 @@ index 15a0ce9..b47feb2 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.8.1
+2.8.0
 
diff --git a/Spigot-Server-Patches/0141-Allow-capping-number-of-attempts-at-spawning-mobs.patch b/Spigot-Server-Patches/0140-Allow-capping-number-of-attempts-at-spawning-mobs.patch
similarity index 97%
rename from Spigot-Server-Patches/0141-Allow-capping-number-of-attempts-at-spawning-mobs.patch
rename to Spigot-Server-Patches/0140-Allow-capping-number-of-attempts-at-spawning-mobs.patch
index 81383b715..34d364547 100644
--- a/Spigot-Server-Patches/0141-Allow-capping-number-of-attempts-at-spawning-mobs.patch
+++ b/Spigot-Server-Patches/0140-Allow-capping-number-of-attempts-at-spawning-mobs.patch
@@ -1,4 +1,4 @@
-From a585cb853ffab60740470920f0b493d1f8192ea4 Mon Sep 17 00:00:00 2001
+From 71a95a04fbb60facd4c7a4144ecdf0fae2c67150 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Apr 2016 21:27:14 -0400
 Subject: [PATCH] Allow capping number of attempts at spawning mobs
@@ -40,5 +40,5 @@ index b47feb2..d97b7a2 100644
                              long key = ((Long) iterator1.next()).longValue();
                              BlockPosition blockposition1 = getRandomPosition(worldserver, LongHash.msw(key), LongHash.lsw(key));
 -- 
-2.8.1
+2.8.0
 
diff --git a/Spigot-Server-Patches/0142-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0141-Configurable-RCON-IP-address.patch
similarity index 93%
rename from Spigot-Server-Patches/0142-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0141-Configurable-RCON-IP-address.patch
index 6b10f275d..d2beca76f 100644
--- a/Spigot-Server-Patches/0142-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0141-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 6007acc66396534cc4f85e510e96a4abee2a7920 Mon Sep 17 00:00:00 2001
+From daf6c65a0f54689793a1ecfc3084421dd7c5c871 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -19,5 +19,5 @@ index 8309a99..3a6561a 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.8.1
+2.8.0
 
diff --git a/Spigot-Server-Patches/0143-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0142-Prevent-Fire-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0143-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0142-Prevent-Fire-from-loading-chunks.patch
index 181944c4e..c113ada7e 100644
--- a/Spigot-Server-Patches/0143-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0142-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 49b2f0e7e05f5b6daa7291db3d5579d3468c48bf Mon Sep 17 00:00:00 2001
+From 06bfeb7f99afd9e983159592b6c21c780d32b7d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -45,5 +45,5 @@ index ae433b2..22f74a6 100644
  
              return i;
 -- 
-2.8.1
+2.8.0