diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index 84e2954d3..c8173cea3 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 6d7c54049384f29cda8dc22268864a57681ed022 Mon Sep 17 00:00:00 2001
+From 77a8b142f999db9495bf8c4f8ae2b2e4f51eff3f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -253,7 +253,7 @@ index 000000000..2e79b0b5f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
-index 000000000..5586575ce
+index 000000000..db79fe41b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +1,184 @@
@@ -597,7 +597,7 @@ index a84a182b2..9d5b3958b 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a0afe0561..2bf30cd6b 100644
+index 3b70a2857..6a44f0d91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -755,6 +755,7 @@ public final class CraftServer implements Server {
@@ -624,7 +624,7 @@ index a0afe0561..2bf30cd6b 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2012,4 +2015,26 @@ public final class CraftServer implements Server {
+@@ -2013,4 +2016,26 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 17ab2d30a..db12f6133 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From e84716d2f76eee566d1a8b95074f1d84127d2ab9 Mon Sep 17 00:00:00 2001
+From cc3ec2a98907b7604edc114dffd2c31097000221 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 0000000000..7a2a27cdb4
+index 000000000..7a2a27cdb
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,132 @@
@@ -144,7 +144,7 @@ index 0000000000..7a2a27cdb4
 +}
 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 0000000000..145cb274b0
+index 000000000..145cb274b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,104 @@
@@ -253,7 +253,7 @@ index 0000000000..145cb274b0
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5518ec1e54..7691409f6c 100644
+index 5518ec1e5..7691409f6 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;
@@ -297,7 +297,7 @@ index 5518ec1e54..7691409f6c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e89ba3e412..1dc13fcc30 100644
+index e89ba3e41..1dc13fcc3 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -22,6 +22,15 @@ public class Block implements IMaterial {
@@ -317,7 +317,7 @@ index e89ba3e412..1dc13fcc30 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 554fbeb071..2b1198ca8f 100644
+index 554fbeb07..2b1198ca8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -853,6 +853,7 @@ public class Chunk implements IChunkAccess {
@@ -337,7 +337,7 @@ index 554fbeb071..2b1198ca8f 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index df2711a5f8..732c8793e5 100644
+index df2711a5f..732c8793e 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -357,7 +357,7 @@ index df2711a5f8..732c8793e5 100644
  
          return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index a8cdcb7da8..eb83e20d50 100644
+index a8cdcb7da..eb83e20d5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -88,7 +88,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -398,7 +398,7 @@ index a8cdcb7da8..eb83e20d50 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, 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 8e5ce6c181..35976a26f3 100644
+index 8e5ce6c18..35976a26f 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -445,7 +445,7 @@ index 8e5ce6c181..35976a26f3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index 65574eb2e5..bc87cfc4b6 100644
+index 65574eb2e..bc87cfc4b 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -12,12 +12,22 @@ public class CustomFunction {
@@ -472,7 +472,7 @@ index 65574eb2e5..bc87cfc4b6 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index f28f4f3cd3..6b417be1dd 100644
+index f28f4f3cd..6b417be1d 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -100,7 +100,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@@ -485,7 +485,7 @@ index f28f4f3cd3..6b417be1dd 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index ad9c00bc80..4e9ef43b45 100644
+index ad9c00bc8..4e9ef43b4 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
@@ -538,7 +538,7 @@ index ad9c00bc80..4e9ef43b45 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 bdb4ca7643..131946154e 100644
+index bdb4ca764..131946154 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -27,7 +27,8 @@ import org.bukkit.command.CommandSender;
@@ -577,7 +577,7 @@ index bdb4ca7643..131946154e 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 011c7af218..b092b0fa23 100644
+index 011c7af21..b092b0fa2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -653,7 +653,7 @@ index 011c7af218..b092b0fa23 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index cd462f7dfc..45ab33d1ae 100644
+index cd462f7df..45ab33d1a 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -168,7 +168,7 @@ public class EntityTracker {
@@ -684,7 +684,7 @@ index cd462f7dfc..45ab33d1ae 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 72de40434f..7e89d7158b 100644
+index 72de40434..7e89d7158 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -837,7 +837,7 @@ index 72de40434f..7e89d7158b 100644
          this.methodProfiler.exit();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index c24f4a8fea..e01222ad2b 100644
+index c24f4a8fe..e01222ad2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -929,7 +929,7 @@ index c24f4a8fea..e01222ad2b 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d97cc4f727..1c90c9d7a3 100644
+index d97cc4f72..1c90c9d7a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -984,7 +984,7 @@ index d97cc4f727..1c90c9d7a3 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index a73947d261..596aa27feb 100644
+index a73947d26..596aa27fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,12 +1,19 @@
@@ -1008,7 +1008,7 @@ index a73947d261..596aa27feb 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 54e44cba35..3a83819d56 100644
+index 54e44cba3..3a83819d5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1032,7 +1032,7 @@ index 54e44cba35..3a83819d56 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index 0da57948a3..6571fc5952 100644
+index 0da57948a..6571fc595 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
@@ -1086,7 +1086,7 @@ index 0da57948a3..6571fc5952 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index c69209497b..68ac014aab 100644
+index c69209497..68ac014aa 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;
@@ -1106,7 +1106,7 @@ index c69209497b..68ac014aab 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9d5b3958bf..ad792af2bc 100644
+index 9d5b3958b..ad792af2b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1214,7 +1214,7 @@ index 9d5b3958bf..ad792af2bc 100644
  
      public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a7ae16681d..5a7087c758 100644
+index a7ae16681..5a7087c75 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1316,10 +1316,10 @@ index a7ae16681d..5a7087c758 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2bf30cd6b4..eb4d3fe069 100644
+index 6a44f0d91..fea49800d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1985,12 +1985,31 @@ public final class CraftServer implements Server {
+@@ -1986,12 +1986,31 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -1353,7 +1353,7 @@ index 2bf30cd6b4..eb4d3fe069 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 2ab4b11a8d..0000000000
+index 2ab4b11a8..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1531,7 +1531,7 @@ index 2ab4b11a8d..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 413dd35f06..52a8c48fa4 100644
+index 413dd35f0..52a8c48fa 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 @@
@@ -1567,7 +1567,7 @@ index 413dd35f06..52a8c48fa4 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 7f0465ec43..99f99148d6 100644
+index 7f0465ec4..99f99148d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1700,6 +1700,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1586,7 +1586,7 @@ index 7f0465ec43..99f99148d6 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 646128f16d..d75cc42e11 100644
+index 646128f16..d75cc42e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicReference;
@@ -1653,7 +1653,7 @@ index 646128f16d..d75cc42e11 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 3f55381c15..0d9a466809 100644
+index 3f55381c1..0d9a46680 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,9 +1,11 @@
@@ -1738,7 +1738,7 @@ index 3f55381c15..0d9a466809 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 e52ef47b78..3d90b34268 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;
@@ -1750,7 +1750,7 @@ index e52ef47b78..3d90b34268 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c1071c92ee..a99c0cea0f 100644
+index c1071c92e..a99c0cea0 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
index d4b23f305..35c9b188a 100644
--- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From 86b00542d1bb7a615289f1618673a12d50873eea Mon Sep 17 00:00:00 2001
+From c0d1faf046517654abb00da0e2a9840b56985eb7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index df85f35f37..7ca7b9f3ac 100644
+index df85f35f3..7ca7b9f3a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -141,7 +141,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -161,10 +161,10 @@ index df85f35f37..7ca7b9f3ac 100644
                      this.nextTick += 50L;
                      // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dd07d0d146..76fb126305 100644
+index 351313d98..7b4af7a90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1982,6 +1982,17 @@ public final class CraftServer implements Server {
+@@ -1983,6 +1983,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
@@ -183,7 +183,7 @@ index dd07d0d146..76fb126305 100644
      {
  
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index be2e31deae..6d21c32692 100644
+index be2e31dea..6d21c3269 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -1,8 +1,5 @@
@@ -224,5 +224,5 @@ index be2e31deae..6d21c32692 100644
          return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                  + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch
index ff9438d35..0b7be69d4 100644
--- a/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch
@@ -1,14 +1,14 @@
-From 348a5f37b3bcf9c703a0837baa7b8b780ced4617 Mon Sep 17 00:00:00 2001
+From 8c43b6ed6b6fac6a56a6247e223098ee14f3564c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b713bd2e9..f4bce56ef 100644
+index c6e6ae4fe..19fef2496 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1642,6 +1642,7 @@ public final class CraftServer implements Server {
+@@ -1643,6 +1643,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  
@@ -17,5 +17,5 @@ index b713bd2e9..f4bce56ef 100644
          return commandMap;
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch
index 15eeafd48..22cc6811c 100644
--- a/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From 1a6b4a1320fe548ce4755afce38b0a31049f1d65 Mon Sep 17 00:00:00 2001
+From 0b09c08d67705f2504a959cff57cf26182bd198a Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c592888ee5..e06eb50c5a 100644
+index 6f2d74cf1..c291bceed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2092,5 +2092,23 @@ public final class CraftServer implements Server {
+@@ -2093,5 +2093,23 @@ public final class CraftServer implements Server {
              return false;
          }
      }
@@ -34,5 +34,5 @@ index c592888ee5..e06eb50c5a 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index e02fe96cf..bb86e832e 100644
--- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 98961bc338270ab024b135c88508126d0cff607f Mon Sep 17 00:00:00 2001
+From f4e4fe03783d2f79376e0dfb9254d398d1635a2f 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 6b74f810a9..260c55016e 100644
+index 6b74f810a..260c55016 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -258,4 +258,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 6b74f810a9..260c55016e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ee45d3705b..01c5d3c572 100644
+index ee45d3705..01c5d3c57 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -486,13 +486,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -63,7 +63,7 @@ index ee45d3705b..01c5d3c572 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 34b5ca3a7e..8a445a1fa3 100644
+index 34b5ca3a7..8a445a1fa 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2853,8 +2853,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -78,10 +78,10 @@ index 34b5ca3a7e..8a445a1fa3 100644
  
      public LongSet ag() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 533dcd60d7..e107ddcf71 100644
+index 5e821b84d..b0ae0365e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1006,7 +1006,7 @@ public final class CraftServer implements Server {
+@@ -1007,7 +1007,7 @@ public final class CraftServer implements Server {
          System.out.println("Preparing start region for level " + (console.worldServer.size() - 1) + " (Seed: " + internal.getSeed() + ")");
  
          if (internal.getWorld().getKeepSpawnInMemory()) {
@@ -91,7 +91,7 @@ index 533dcd60d7..e107ddcf71 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 262c3f910e..a8c7e7931e 100644
+index 262c3f910..a8c7e7931 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1419,8 +1419,9 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch
index 241d28846..30301597c 100644
--- a/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch
@@ -1,11 +1,11 @@
-From 9cb3962db832174ee0d087d5441333176d112591 Mon Sep 17 00:00:00 2001
+From 8de2d292f66991d8cebb8501a31fe718da91ba3e 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 879951f24..894501c61 100644
+index c6d2c3033..b7b28591e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
@@ -45,10 +45,10 @@ index bf67dbf54..dcaba3c40 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 b64f3594a..c82cca49f 100644
+index b0ae0365e..c26da0984 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1412,7 +1412,8 @@ public final class CraftServer implements Server {
+@@ -1413,7 +1413,8 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
@@ -59,5 +59,5 @@ index b64f3594a..c82cca49f 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch
index 0b2356e59..719ba584c 100644
--- a/Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 5328690b007dbdf5e9e364093f620a6bf3882f45 Mon Sep 17 00:00:00 2001
+From 9fd607da2863237879996ac81926fc5cf51923b1 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,10 +6,10 @@ 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 7f5dacc2ae..02d2b80b91 100644
+index c26da0984..bb7792ce2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2121,5 +2121,24 @@ public final class CraftServer implements Server {
+@@ -2122,5 +2122,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }
@@ -35,5 +35,5 @@ index 7f5dacc2ae..02d2b80b91 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch
index 90c82912b..1552ac0b6 100644
--- a/Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 3282d3a441567161f7a424959345ac7695ebff22 Mon Sep 17 00:00:00 2001
+From 333f45be7ee9d1fe67eaff5df605f74052db7228 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a4853e04b..0f38b1fb4 100644
+index 17b4e01aa..d10d60921 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -280,4 +280,9 @@ public class PaperConfig {
@@ -20,10 +20,10 @@ index a4853e04b..0f38b1fb4 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 02d2b80b9..e238e760a 100644
+index bb7792ce2..962170cd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2140,5 +2140,10 @@ public final class CraftServer implements Server {
+@@ -2141,5 +2141,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
diff --git a/Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch
index 142601508..3954bec9c 100644
--- a/Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From a6a3ba9f6b3a8dae529a6202f3db6beb8b7e2735 Mon Sep 17 00:00:00 2001
+From 13eecfd7e9966c44ced76ef7b62ab5454a62c990 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -257,7 +257,7 @@ index 9d44dcb3b..8bb3fef21 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e238e760a..9cf2ee957 100644
+index 962170cd3..7e4f42b3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -146,8 +146,8 @@ import java.nio.ByteBuffer;
@@ -270,7 +270,7 @@ index e238e760a..9cf2ee957 100644
  import org.bukkit.NamespacedKey;
  import org.bukkit.block.data.BlockData;
  import org.bukkit.craftbukkit.block.data.CraftBlockData;
-@@ -1154,9 +1154,13 @@ public final class CraftServer implements Server {
+@@ -1155,9 +1155,13 @@ public final class CraftServer implements Server {
          return logger;
      }
  
diff --git a/Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch
index 2d140d3b1..e255062d6 100644
--- a/Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 48590dd6c44d630eb5b4830660f2ae85784abab6 Mon Sep 17 00:00:00 2001
+From b18a6e1b22b0928f9d1a2788e5424a406f245a92 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -486,7 +486,7 @@ index 9bf2521be..059665836 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6dad8fab2..ec17eaf9d 100644
+index e8991ce1c..1e8c4a85c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -164,6 +164,10 @@ import org.bukkit.event.server.ServerLoadEvent;
@@ -500,7 +500,7 @@ index 6dad8fab2..ec17eaf9d 100644
  public final class CraftServer implements Server {
      private final String serverName = "Paper"; // Paper
      private final String serverVersion;
-@@ -2156,5 +2160,21 @@ public final class CraftServer implements Server {
+@@ -2157,5 +2161,21 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
diff --git a/Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch
index 627a3de5f..1a66cc0f4 100644
--- a/Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 9b37d252cca84ac2fb7f722cbe42bd983595ff68 Mon Sep 17 00:00:00 2001
+From d33a4d96ec866b65c24939762aa3a47b8d5dc033 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -70,10 +70,10 @@ index bae10827a..273385ee0 100644
  
      public void a(PacketPlayInSetCommandBlock packetplayinsetcommandblock) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ec17eaf9d..cddd824c3 100644
+index 1e8c4a85c..8315f6377 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1723,7 +1723,7 @@ public final class CraftServer implements Server {
+@@ -1724,7 +1724,7 @@ public final class CraftServer implements Server {
              offers = tabCompleteChat(player, message);
          }
  
diff --git a/Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch
index 687fba0ca..dea75a601 100644
--- a/Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 9fbfb40a23093f741ad240fddd85057b400d9987 Mon Sep 17 00:00:00 2001
+From a040128d3a806e0073846e0849d1abf679ec4aef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cddd824c3..95d51fb5b 100644
+index 8315f6377..268653acd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1416,6 +1416,26 @@ public final class CraftServer implements Server {
+@@ -1417,6 +1417,26 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  
diff --git a/Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch
index 882f9c479..968ba98cb 100644
--- a/Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 46226e106cc137643f5ac72ef84644664d2b5760 Mon Sep 17 00:00:00 2001
+From 5e4a9fdd33c48b305e30babab70c19cf81c5cc89 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
@@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
 a permanent change in that it won't go back if you remove it from paper.yml
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6bd59a886..359c538f3 100644
+index 2023b5af0..07d7976d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@@ -85,10 +85,10 @@ index 8458dc17d..b5fb95293 100644
              String s = nbttagcompound.getString("generatorName");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 81e27949d..6cea317d5 100644
+index d5ab1d11a..3cf303785 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -989,7 +989,7 @@ public final class CraftServer implements Server {
+@@ -990,7 +990,7 @@ public final class CraftServer implements Server {
          WorldData worlddata = sdm.getWorldData();
          WorldSettings worldSettings = null;
          if (worlddata == null) {
diff --git a/Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch
index 5d2cc5c50..0817f0e30 100644
--- a/Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 0334632709977dec5c7b1ddeeb99070ea77f3eb8 Mon Sep 17 00:00:00 2001
+From 497abc68440564a2d7e9758183bcc06c55845125 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@@ -8,10 +8,10 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6cea317d5..fac42f8e5 100644
+index 3cf303785..d4d8fbb55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -975,7 +975,7 @@ public final class CraftServer implements Server {
+@@ -976,7 +976,7 @@ public final class CraftServer implements Server {
          boolean used = false;
          do {
              for (WorldServer server : console.getWorlds()) {
diff --git a/Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch
index 34e1fb089..d83292394 100644
--- a/Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch
@@ -1,4 +1,4 @@
-From c9d95cbf8d5ef37223484c7ced54dad5a840e484 Mon Sep 17 00:00:00 2001
+From 43d96e4be29752e4c7f7d11df974daa7bd2a5a4b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@@ -43,7 +43,7 @@ reading or writing to the chunk will be safe, so plugins still
 should not be touching chunks asynchronously!
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 359c538f3..942520088 100644
+index 07d7976d2..c25db284f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -376,4 +376,57 @@ public class PaperConfig {
@@ -458,7 +458,7 @@ index 000000000..8f18c2869
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9f28d7775..fb00e7a9c 100644
+index 4ae0acbf1..4f64072a7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -190,6 +190,7 @@ public class Chunk implements IChunkAccess {
@@ -949,7 +949,7 @@ index f5a6387f2..f45685099 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index be555f82d..3e81ebdb8 100644
+index 3d90fdb64..d6d0dd6d8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -207,7 +207,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2072,7 +2072,7 @@ index 284e96710..8b08efe1f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4c971ddfb..1c66c833b 100644
+index 0d45e2157..97a0fbd55 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -41,7 +41,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -2343,10 +2343,10 @@ index 0ff3fe03d..e71a40580 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fac42f8e5..59b1628e5 100644
+index d4d8fbb55..af065bd70 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1021,8 +1021,12 @@ public final class CraftServer implements Server {
+@@ -1022,8 +1022,12 @@ public final class CraftServer implements Server {
          if (internal.getWorld().getKeepSpawnInMemory()) {
              short short1 = internal.paperConfig.keepLoadedRange; // Paper
              long i = System.currentTimeMillis();
@@ -2361,7 +2361,7 @@ index fac42f8e5..59b1628e5 100644
                      long l = System.currentTimeMillis();
  
                      if (l < i) {
-@@ -1038,7 +1042,7 @@ public final class CraftServer implements Server {
+@@ -1039,7 +1043,7 @@ public final class CraftServer implements Server {
                      }
  
                      BlockPosition chunkcoordinates = internal.getSpawn();
@@ -2471,7 +2471,7 @@ index 68e30185a..7905420ca 100644
  
          if (!event.isCancelled()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 9c917370a..a299092a5 100644
+index 9e553866e..04c0adf7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -21,6 +21,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
diff --git a/Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch
index 6fa32fe89..110aede0c 100644
--- a/Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From 52001926d936c225b023d7526ad3dd1635076281 Mon Sep 17 00:00:00 2001
+From 382ea0607828b984ef41ff022e5e74b18b6becf5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 07f0b4529..a7673dd49 100644
+index c5b8354fa..9f240c35d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -21,6 +21,7 @@ import java.util.regex.Pattern;
@@ -29,10 +29,10 @@ index 07f0b4529..a7673dd49 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59b1628e5..8d26f8d52 100644
+index af065bd70..9c5b79920 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2187,6 +2187,10 @@ public final class CraftServer implements Server {
+@@ -2188,6 +2188,10 @@ public final class CraftServer implements Server {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
  
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 812f66aa9..7c395d429 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 812f66aa99d7ef65f29ea60690dccbcc4ccec369
+Subproject commit 7c395d429ce2bdfe9668664ebe96799cd540e7b7