diff --git a/Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0146-Inventory-removeItemAnySlot.patch
similarity index 95%
rename from Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch
rename to Spigot-API-Patches/0146-Inventory-removeItemAnySlot.patch
index 620ce79566..153af19ce8 100644
--- a/Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch
+++ b/Spigot-API-Patches/0146-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From 5e044c9dc29d14964fb2823ee23288d6e33a0ec0 Mon Sep 17 00:00:00 2001
+From a973a74dfbdfd018a94e15f615d045b8b2f7b1f7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:06 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
-index 2dbba001..ec58e972 100644
+index 2dbba0012..ec58e9727 100644
 --- a/src/main/java/org/bukkit/inventory/Inventory.java
 +++ b/src/main/java/org/bukkit/inventory/Inventory.java
 @@ -117,6 +117,33 @@ public interface Inventory extends Iterable<ItemStack> {
diff --git a/Spigot-Server-Patches/0354-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0355-Inventory-removeItemAnySlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0354-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0355-Inventory-removeItemAnySlot.patch
index 9009f8338b..0af8c2d57d 100644
--- a/Spigot-Server-Patches/0354-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0355-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From d29d86fc4ab460dd1f96a04d2323098b0afb66ae Mon Sep 17 00:00:00 2001
+From e01493d9b51364dc5d48c6ba22ddb19cba25f3d9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:15 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index dd7b3d766..01af98293 100644
+index dd7b3d766f..01af982933 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -213,10 +213,16 @@ public class CraftInventory implements Inventory {
diff --git a/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0356-Optimize-getChunkIfLoaded-type-calls.patch
similarity index 96%
rename from Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch
rename to Spigot-Server-Patches/0356-Optimize-getChunkIfLoaded-type-calls.patch
index 6b231dee63..84b63b2a24 100644
--- a/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/0356-Optimize-getChunkIfLoaded-type-calls.patch
@@ -1,4 +1,4 @@
-From b8345560939d63b8f8e221f468aaf9792c61152a Mon Sep 17 00:00:00 2001
+From 7dc2f28d7234646faf52d0f4c7c66e1fd4a6b7ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Aug 2018 21:59:22 -0400
 Subject: [PATCH] Optimize getChunkIfLoaded type calls
@@ -23,7 +23,7 @@ index 96d49b469a..c0ec896eea 100644
                      neighbor.setNeighborUnloaded(-x, -z);
                      chunk.setNeighborUnloaded(x, z);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 49809372d8..0437cfdd55 100644
+index 2b5b0c4df6..acd0c93cec 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -165,7 +165,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -55,7 +55,7 @@ index 49809372d8..0437cfdd55 100644
              return chunk != null && !chunk.isEmpty();
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1ccf2a7609..d9766447de 100644
+index 755d2632fd..585a0c7fd2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -227,7 +227,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0356-Don-t-double-add-golems-to-world.patch b/Spigot-Server-Patches/0357-Don-t-double-add-golems-to-world.patch
similarity index 93%
rename from Spigot-Server-Patches/0356-Don-t-double-add-golems-to-world.patch
rename to Spigot-Server-Patches/0357-Don-t-double-add-golems-to-world.patch
index be83e5b3f9..432941beef 100644
--- a/Spigot-Server-Patches/0356-Don-t-double-add-golems-to-world.patch
+++ b/Spigot-Server-Patches/0357-Don-t-double-add-golems-to-world.patch
@@ -1,4 +1,4 @@
-From d85eedcdf9fd25773e885a9c527dd89cba473f05 Mon Sep 17 00:00:00 2001
+From 916e4d1edfde6390f74dcf4245fc9a6f5a2c9731 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 30 Aug 2018 20:56:26 -0400
 Subject: [PATCH] Don't double add golems to world
diff --git a/Spigot-Server-Patches/0357-fix-newlines-in-spigot-tab-list-API.patch b/Spigot-Server-Patches/0358-fix-newlines-in-spigot-tab-list-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0357-fix-newlines-in-spigot-tab-list-API.patch
rename to Spigot-Server-Patches/0358-fix-newlines-in-spigot-tab-list-API.patch
index 9aefb78992..85ca0ebc1a 100644
--- a/Spigot-Server-Patches/0357-fix-newlines-in-spigot-tab-list-API.patch
+++ b/Spigot-Server-Patches/0358-fix-newlines-in-spigot-tab-list-API.patch
@@ -1,4 +1,4 @@
-From 8e85f047aee118800f7ecdf97ac8456800cff021 Mon Sep 17 00:00:00 2001
+From d53683a29cf68210c2222eec64a5849ea8382b3a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 1 Sep 2018 11:29:52 +0100
 Subject: [PATCH] fix newlines in spigot tab list API
diff --git a/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0359-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 90%
rename from Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0359-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 978f6e968b..f0d0a1ae0e 100644
--- a/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0359-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 742ac3031d1078c6b75cd7c6c2b9de1361d329a7 Mon Sep 17 00:00:00 2001
+From 9248fae968af8978811a695b5bf6c030499376a8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d9766447..3bb86cc5 100644
+index 585a0c7fd2..b38e394f83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -304,7 +304,7 @@ public class CraftWorld implements World {