diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index bd8e7e3545..3cbdc3eb92 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 274261a0b59be13d67b3034b87f563f7e5751f58 Mon Sep 17 00:00:00 2001
+From 49063a185f72b716177dbb8a855753253d3150b5 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 00000000..1b33390d
+index 000000000..1b33390de
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,125 @@
@@ -137,7 +137,7 @@ index 00000000..1b33390d
 +}
 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 00000000..089154f6
+index 000000000..089154f62
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,131 @@
@@ -274,7 +274,7 @@ index 00000000..089154f6
 +}
 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 00000000..e0ad559b
+index 000000000..e0ad559b7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,99 @@
@@ -378,7 +378,7 @@ index 00000000..e0ad559b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5ab2cf6e..b5795b6d 100644
+index 5ab2cf6ee..b5795b6d3 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;
@@ -422,7 +422,7 @@ index 5ab2cf6e..b5795b6d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 2dca6dbc..35231096 100644
+index 2dca6dbcb..352310960 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 {
@@ -442,7 +442,7 @@ index 2dca6dbc..35231096 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 c4d9344a..350e0991 100644
+index c4d9344a7..350e0991d 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 {
@@ -490,7 +490,7 @@ index c4d9344a..350e0991 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 ac478fb2..69ded6aa 100644
+index ac478fb27..69ded6aa4 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -204,7 +204,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -503,7 +503,7 @@ index ac478fb2..69ded6aa 100644
              this.chunkLoader.saveChunk(this.world, chunk, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 50ec3adb..a401dec6 100644
+index 50ec3adb8..a401dec60 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -423,7 +423,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -543,7 +543,7 @@ index 50ec3adb..a401dec6 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 e1cb96a8..8f2afcc3 100644
+index e1cb96a88..8f2afcc32 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;
@@ -596,7 +596,7 @@ index e1cb96a8..8f2afcc3 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 40f06c5b..4c794a09 100644
+index 40f06c5bc..4c794a098 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;
@@ -635,7 +635,7 @@ index 40f06c5b..4c794a09 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 ee2d1f9a..e8401bba 100644
+index ee2d1f9a9..e8401bba7 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;
@@ -706,7 +706,7 @@ index ee2d1f9a..e8401bba 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index ce012402..a60f9460 100644
+index ce0124020..a60f94608 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 {
@@ -737,7 +737,7 @@ index ce012402..a60f9460 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c1a8816b..8d08b536 100644
+index c1a8816b4..8d08b536a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -48,8 +48,8 @@ import org.bukkit.Bukkit;
@@ -884,7 +884,7 @@ index c1a8816b..8d08b536 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 eeac3499..e4ed2e99 100644
+index eeac34998..e4ed2e991 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -984,7 +984,7 @@ index eeac3499..e4ed2e99 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cd2d58bf..da25a8be 100644
+index cd2d58bfb..da25a8bea 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;
@@ -1032,7 +1032,7 @@ index cd2d58bf..da25a8be 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index f74b0679..1fc632e0 100644
+index f74b06794..1fc632e0c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,15 +1,21 @@
@@ -1062,7 +1062,7 @@ index f74b0679..1fc632e0 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 588e9bd8..784d6b62 100644
+index 914f2e94a..b3321da59 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1072,7 +1072,7 @@ index 588e9bd8..784d6b62 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1205,10 +1206,11 @@ public abstract class PlayerList {
+@@ -1209,10 +1210,11 @@ public abstract class PlayerList {
      }
  
      public void savePlayers() {
@@ -1086,7 +1086,7 @@ index 588e9bd8..784d6b62 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 74e3f42c..66a80a77 100644
+index 74e3f42cd..66a80a776 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -1,5 +1,7 @@
@@ -1128,7 +1128,7 @@ index 74e3f42c..66a80a77 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 5a5a588e..d2d4ff6f 100644
+index 5a5a588e7..d2d4ff6fb 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;
@@ -1148,7 +1148,7 @@ index 5a5a588e..d2d4ff6f 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 843320ff..d902e263 100644
+index 843320ffb..d902e2630 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -19,11 +19,11 @@ import com.google.common.collect.Maps;
@@ -1254,7 +1254,7 @@ index 843320ff..d902e263 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 d4f25cbf..e492913a 100644
+index d4f25cbf2..e492913a2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -305,13 +305,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1388,7 +1388,7 @@ index d4f25cbf..e492913a 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 14851a3a..9042deed 100644
+index 14851a3a5..9042deed6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1756,12 +1756,31 @@ public final class CraftServer implements Server {
@@ -1425,7 +1425,7 @@ index 14851a3a..9042deed 100644
              org.spigotmc.RestartCommand.restart();
 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 4c8ab2bc..00000000
+index 4c8ab2bc9..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -1604,7 +1604,7 @@ index 4c8ab2bc..00000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b446..b5efb9c3 100644
+index 3a95b4465..b5efb9c3f 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 @@
@@ -1648,7 +1648,7 @@ index 3a95b446..b5efb9c3 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 e12e45e0..dfb5731c 100644
+index e12e45e01..dfb5731c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -41,7 +41,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1674,7 +1674,7 @@ index e12e45e0..dfb5731c 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 23d7ce26..d50bbd2a 100644
+index 23d7ce26f..d50bbd2a6 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;
@@ -1750,7 +1750,7 @@ index 23d7ce26..d50bbd2a 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 c37275f2..a03f933a 100644
+index c37275f2a..a03f933af 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 @@
@@ -1832,7 +1832,7 @@ index c37275f2..a03f933a 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 e52ef47b..3d90b342 100644
+index e52ef47b7..3d90b3426 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;
@@ -1844,7 +1844,7 @@ index e52ef47b..3d90b342 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 2bd690fd..38be7ed7 100644
+index 2bd690fdf..38be7ed71 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;
@@ -1906,5 +1906,5 @@ index 2bd690fd..38be7ed7 100644
      }
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
index 746cb61794..b971206cd5 100644
--- a/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
@@ -1,11 +1,11 @@
-From 7a2448f69b80dd8fce3f0e1516f1330ebb1a35a4 Mon Sep 17 00:00:00 2001
+From 47726f319a2cf8df91cec25ceaaa7f0f2c436f16 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 49d14b8e..1fd29332 100644
+index 49d14b8e9..1fd29332f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -206,4 +206,9 @@ public class PaperWorldConfig {
@@ -19,13 +19,13 @@ index 49d14b8e..1fd29332 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index e87f9047..0562c6e3 100644
+index 0149726ea..a5261d70b 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -19,6 +19,7 @@ public abstract class MobSpawnerAbstract {
-     private int maxNearbyEntities = 6;
-     private int requiredPlayerRange = 16;
-     private int spawnRange = 4;
+     public int maxNearbyEntities = 6; // CraftBukkit private -> public
+     public int requiredPlayerRange = 16; // CraftBukkit private -> public
+     public int spawnRange = 4; // CraftBukkit private -> public
 +    private int tickDelay = 0; // Paper
  
      public MobSpawnerAbstract() {}
@@ -64,5 +64,5 @@ index e87f9047..0562c6e3 100644
                  }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch
index d4681a9e61..825e41a754 100644
--- a/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch
@@ -1,11 +1,11 @@
-From cebc409ba3e41ef32d5f2c2a5a6537473c0c7c57 Mon Sep 17 00:00:00 2001
+From ba58b43d346cad8fad3ad291d8f65606f33e1583 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 ec464338..430b5d0c 100644
+index ec4643384..430b5d0cd 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 ec464338..430b5d0c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index b08274d9..0607e55d 100644
+index b08274d93..0607e55d3 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 b08274d9..0607e55d 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2300ee10..b6c4d98f 100644
+index 2300ee10b..b6c4d98fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -332,6 +332,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -62,7 +62,7 @@ index 2300ee10..b6c4d98f 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 549d4e89..df11764e 100644
+index 549d4e89d..df11764e0 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 549d4e89..df11764e 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7bdd5bcf..f38e8197 100644
+index 9f678530f..ed5852ef4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -74,6 +74,7 @@ public abstract class PlayerList {
@@ -99,7 +99,7 @@ index 7bdd5bcf..f38e8197 100644
          // CraftBukkit - Moved from above, added world
          PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
      }
-@@ -421,6 +428,16 @@ public abstract class PlayerList {
+@@ -425,6 +432,16 @@ public abstract class PlayerList {
          entityplayer.playerTick();// SPIGOT-924
          // CraftBukkit end
  
@@ -116,7 +116,7 @@ index 7bdd5bcf..f38e8197 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getVehicle();
-@@ -1345,7 +1362,13 @@ public abstract class PlayerList {
+@@ -1349,7 +1366,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end
@@ -132,5 +132,5 @@ index 7bdd5bcf..f38e8197 100644
  
      // CraftBukkit start
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
index 3323a8b342..a2d63294cf 100644
--- a/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 76ed4797cf898e49367bdfa5a9f9e92218b569f7 Mon Sep 17 00:00:00 2001
+From 21395ab1de11791b1dfb94aa74d1563c29276724 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 621c585e..da0984a3 100644
+index 621c585e7..da0984a35 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 621c585e..da0984a3 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 64e31dd2..a5986593 100644
+index 64e31dd20..a59865930 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 64e31dd2..a5986593 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8ec26b97..87730aec 100644
+index 8ec26b97c..87730aec3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -963,11 +963,9 @@ public class Chunk {
@@ -76,7 +76,7 @@ index 8ec26b97..87730aec 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 0adfcaa8..9e8f67ff 100644
+index 0adfcaa8b..9e8f67ffd 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 0adfcaa8..9e8f67ff 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b937b6d0..ef081a57 100644
+index b937b6d0d..ef081a57f 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 b937b6d0..ef081a57 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 ab793307..5c09c6ff 100644
+index ab7933079..5c09c6ff7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -119,6 +119,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -155,7 +155,7 @@ index ab793307..5c09c6ff 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 f38e8197..7a9b7912 100644
+index ed5852ef4..0e82c16b7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -343,6 +343,7 @@ public abstract class PlayerList {
@@ -166,7 +166,7 @@ index f38e8197..7a9b7912 100644
          this.playerFileData.save(entityplayer);
          ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit
  
-@@ -1238,13 +1239,23 @@ public abstract class PlayerList {
+@@ -1242,13 +1243,23 @@ public abstract class PlayerList {
  
      }
  
@@ -192,7 +192,7 @@ index f38e8197..7a9b7912 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 f2ddc22d..8493dcce 100644
+index f2ddc22dd..8493dccee 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 f2ddc22d..8493dcce 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch
index 534943ee24..0f4d0608fb 100644
--- a/Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 035affcdff7fd16b82818254cd2d47ead646bfa6 Mon Sep 17 00:00:00 2001
+From 22ea24f119b179ba0fd34826183d3d0fb1246e38 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,10 +7,10 @@ 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 7a9b7912..7378b4ec 100644
+index 0e82c16b7..4080ed26c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1245,6 +1245,7 @@ public abstract class PlayerList {
+@@ -1249,6 +1249,7 @@ public abstract class PlayerList {
      }
  
      public void savePlayers(Integer interval) {
@@ -18,7 +18,7 @@ index 7a9b7912..7378b4ec 100644
          long now = MinecraftServer.currentTick;
          MinecraftTimings.savePlayers.startTiming(); // Paper
          for (int i = 0; i < this.players.size(); ++i) {
-@@ -1254,6 +1255,7 @@ public abstract class PlayerList {
+@@ -1258,6 +1259,7 @@ public abstract class PlayerList {
              }
          }
          MinecraftTimings.savePlayers.stopTiming(); // Paper
@@ -27,5 +27,5 @@ index 7a9b7912..7378b4ec 100644
      // Paper end
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch
index 816aa5d472..7229e6aa4b 100644
--- a/Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 8dfa6fc384c76a62a24acb7df931f6f93f9bb64c Mon Sep 17 00:00:00 2001
+From 1536a04ca5d57cb2e1dcb5641d1843aa9930817b 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 13c6b5cc..908a5d27 100644
+index 13c6b5ccd..908a5d273 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -71,6 +71,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -78,10 +78,10 @@ index 13c6b5cc..908a5d27 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 7378b4ec..c67e152d 100644
+index 4080ed26c..ff01bbff5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1369,10 +1369,15 @@ public abstract class PlayerList {
+@@ -1373,10 +1373,15 @@ public abstract class PlayerList {
          entityplayer.playerInteractManager.b(world.getWorldData().getGameType());
      }
  
@@ -98,7 +98,7 @@ index 7378b4ec..c67e152d 100644
          }
          // CraftBukkit end
          // Paper start - Remove collideRule team if it exists
-@@ -1383,6 +1388,7 @@ public abstract class PlayerList {
+@@ -1387,6 +1392,7 @@ public abstract class PlayerList {
          }
          // Paper end
      }
@@ -107,7 +107,7 @@ index 7378b4ec..c67e152d 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 49768734..d51636c8 100644
+index 49768734d..d51636c8e 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 49768734..d51636c8 100644
      }
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
index 485d758541..2ea31b9c43 100644
--- a/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
@@ -1,14 +1,14 @@
-From c688ef07e5abac3735463beb6682d873211a8475 Mon Sep 17 00:00:00 2001
+From 7fdb4afbccad8dbe17271f9620764fec0bbb06b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 219734689..6af671c45 100644
+index 311c0b86f..06a5b6d02 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -538,9 +538,9 @@ public abstract class PlayerList {
+@@ -542,9 +542,9 @@ public abstract class PlayerList {
  
              // return s;
              if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
@@ -20,7 +20,7 @@ index 219734689..6af671c45 100644
          } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
              IpBanEntry ipbanentry = this.l.get(socketaddress);
  
-@@ -1202,9 +1202,25 @@ public abstract class PlayerList {
+@@ -1206,9 +1206,25 @@ public abstract class PlayerList {
  
      }
  
@@ -48,5 +48,5 @@ index 219734689..6af671c45 100644
      public boolean isOp(GameProfile gameprofile) {
          return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit
 -- 
-2.15.1
+2.16.1
 
diff --git a/work/Bukkit b/work/Bukkit
index 7eb6b52fb2..2b1f48cd2c 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 7eb6b52fb21699805eab4b074599030861227e64
+Subproject commit 2b1f48cd2c88434401001efcae22b0de9f61ba37
diff --git a/work/CraftBukkit b/work/CraftBukkit
index bdcc7c7b02..c7656468e4 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit bdcc7c7b02947498f0c9b5adfd4a66bc1600d2cf
+Subproject commit c7656468e4601fb70e0d7049c4b947e16034546f