diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index e269a39cb7..c147137ade 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From a5783dd1bfe8f0f0166976f3afc04a1f35ba3acb Mon Sep 17 00:00:00 2001
+From 43344bd333e548df23d8a9d68833c74d63d84964 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 8ee129d9..133d1660 100644
+index 73ef3193..4220760f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,39 +3,39 @@
@@ -32,9 +32,9 @@ index 8ee129d9..133d1660 100644
      <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
--        <maven.compiler.source>1.6</maven.compiler.source>
--        <maven.compiler.target>1.6</maven.compiler.target>
-+        <!-- Paper - Bump to 1.8 - Because Duh... -->
+-        <maven.compiler.source>1.7</maven.compiler.source>
+-        <maven.compiler.target>1.7</maven.compiler.target>
++        <!-- Paper - Bump to 1.8 - Get off your dinosaur and get on this rocket ship... -->
 +        <maven.compiler.source>1.8</maven.compiler.source>
 +        <maven.compiler.target>1.8</maven.compiler.target>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -157,5 +157,5 @@ index 8ee129d9..133d1660 100644
 -    </profiles>
  </project>
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index 65b6da01ff..318463d14a 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 5d5dc477a6998af553a15def100d0ef1407b6dba Mon Sep 17 00:00:00 2001
+From 64f62bc4e2c8b60a6679fbcc608d1a5ee8fe7944 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3610,10 +3610,10 @@ index 80c6a72e..759c4617 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 4cffa137..b2cbf9e4 100644
+index d7d5ac7b..a657fce5 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -15,7 +15,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
+@@ -23,7 +23,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
  /**
   * A ClassLoader for plugins, to allow shared classes across multiple plugins
   */
@@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
 -    }
  }
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index 84b6ed99f0..31863b72a8 100644
--- a/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@@ -1,4 +1,4 @@
-From 3b173da428895d6a961b7d68065468338beef633 Mon Sep 17 00:00:00 2001
+From e7a4374c01a9df9539436e80ac3b8eba4eebdc92 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Thu, 21 Sep 2017 19:41:20 +0200
 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@@ -77,10 +77,10 @@ index 0abad9ad..14dda205 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index b2cbf9e4..2a4587e8 100644
+index a657fce5..67b53d4e 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -25,6 +25,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -36,6 +36,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
      final JavaPlugin plugin;
      private JavaPlugin pluginInit;
      private IllegalStateException pluginState;
@@ -88,16 +88,16 @@ index b2cbf9e4..2a4587e8 100644
  
      // Spigot Start
      static
-@@ -59,6 +60,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
-         this.dataFolder = dataFolder;
-         this.file = file;
+@@ -73,6 +74,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+         this.manifest = jar.getManifest();
+         this.url = file.toURI().toURL();
  
 +        this.logger = new com.destroystokyo.paper.utils.PaperPluginLogger(description); // Paper - Register logger early
 +
          try {
              Class<?> jarClass;
              try {
-@@ -126,6 +129,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -177,6 +180,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          pluginState = new IllegalStateException("Initial initialization");
          this.pluginInit = javaPlugin;
  
@@ -106,5 +106,5 @@ index b2cbf9e4..2a4587e8 100644
      }
  }
 -- 
-2.14.1.windows.1
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index b9585759b1..dca9b0c0d5 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 70528653756975b3b743d0ce9f5ab727b70036c0 Mon Sep 17 00:00:00 2001
+From ea90973fc4de71ac189efc820005ea00590223b5 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 new file mode 100644
-index 000000000..ecd1c65a9
+index 00000000..ecd1c65a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -0,0 +1,193 @@
@@ -205,7 +205,7 @@ index 000000000..ecd1c65a9
 +}
 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..3d8ee9ed3
+index 00000000..3d8ee9ed
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +1,173 @@
@@ -384,7 +384,7 @@ index 000000000..3d8ee9ed3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 new file mode 100644
-index 000000000..621bf7051
+index 00000000..621bf705
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +1,66 @@
@@ -455,7 +455,7 @@ index 000000000..621bf7051
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/CommandAbstract.java b/src/main/java/net/minecraft/server/CommandAbstract.java
-index 76501e299..76bf04f56 100644
+index 76501e29..76bf04f5 100644
 --- a/src/main/java/net/minecraft/server/CommandAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandAbstract.java
 @@ -634,6 +634,7 @@ public abstract class CommandAbstract implements ICommand {
@@ -467,7 +467,7 @@ index 76501e299..76bf04f56 100644
          return a(astring, (Collection) Arrays.asList(astring1));
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8c5361d61..e1cb96a88 100644
+index 8c5361d6..e1cb96a8 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -184,6 +184,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -482,7 +482,7 @@ index 8c5361d61..e1cb96a88 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b944be5c5..40f06c5bc 100644
+index b944be5c..40f06c5b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -122,9 +122,9 @@ public abstract class Entity implements ICommandListener {
@@ -499,7 +499,7 @@ index b944be5c5..40f06c5bc 100644
      public boolean impulse;
      public int portalCooldown;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index eb6a955e3..77b81a575 100644
+index eb6a955e..77b81a57 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -21,6 +21,7 @@ public class EntityTypes {
@@ -519,7 +519,7 @@ index eb6a955e3..77b81a575 100644
          return EntityTypes.d;
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f62e7d9e4..dbfed7c62 100644
+index 740633d9..843320ff 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -129,6 +129,8 @@ public abstract class World implements IBlockAccess {
@@ -540,10 +540,10 @@ index f62e7d9e4..dbfed7c62 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 e374e0fc1..18c62b20f 100644
+index 0d320baa..b2bbccb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -700,6 +700,7 @@ public final class CraftServer implements Server {
+@@ -699,6 +699,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -551,7 +551,7 @@ index e374e0fc1..18c62b20f 100644
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
-@@ -715,6 +716,7 @@ public final class CraftServer implements Server {
+@@ -714,6 +715,7 @@ public final class CraftServer implements Server {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }
              world.spigotConfig.init(); // Spigot
@@ -559,7 +559,7 @@ index e374e0fc1..18c62b20f 100644
          }
  
          pluginManager.clearPlugins();
-@@ -722,6 +724,7 @@ public final class CraftServer implements Server {
+@@ -721,6 +723,7 @@ public final class CraftServer implements Server {
          resetRecipes();
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@@ -567,7 +567,7 @@ index e374e0fc1..18c62b20f 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
  
          int pollCount = 0;
-@@ -1784,4 +1787,26 @@ public final class CraftServer implements Server {
+@@ -1783,4 +1786,26 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
@@ -595,7 +595,7 @@ index e374e0fc1..18c62b20f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a151451d5..0c5862a3f 100644
+index a151451d..0c5862a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -126,6 +126,14 @@ public class Main {
@@ -614,7 +614,7 @@ index a151451d5..0c5862a3f 100644
          };
  
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 01e73eb89..0b66f5e35 100644
+index 01e73eb8..0b66f5e3 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -39,31 +39,31 @@ public class SpigotWorldConfig
@@ -655,5 +655,5 @@ index 01e73eb89..0b66f5e35 100644
          config.addDefault( "world-settings.default." + path, def );
          return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index 09351f73fd..a233780cb4 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,4 +1,4 @@
-From de8e09394533bfc3baf552877d5088a7bb52eefa Mon Sep 17 00:00:00 2001
+From 8e28c20dbf59bb8d63c126f63d7ecd46298f9b0b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..1b33390de
+index 00000000..1b33390d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,125 @@
@@ -137,7 +137,7 @@ index 000000000..1b33390de
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 000000000..089154f62
+index 00000000..089154f6
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,131 @@
@@ -274,7 +274,7 @@ index 000000000..089154f62
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 000000000..e0ad559b7
+index 00000000..e0ad559b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,99 @@
@@ -378,7 +378,7 @@ index 000000000..e0ad559b7
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5ab2cf6ee..b5795b6d3 100644
+index 5ab2cf6e..b5795b6d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -422,7 +422,7 @@ index 5ab2cf6ee..b5795b6d3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 2dca6dbcb..352310960 100644
+index 2dca6dbc..35231096 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 2dca6dbcb..352310960 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 c4d9344a7..350e0991d 100644
+index c4d9344a..350e0991 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 c4d9344a7..350e0991d 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 ac478fb27..69ded6aa4 100644
+index ac478fb2..69ded6aa 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 ac478fb27..69ded6aa4 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 50ec3adb8..a401dec60 100644
+index 50ec3adb..a401dec6 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 50ec3adb8..a401dec60 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 e1cb96a88..8f2afcc32 100644
+index e1cb96a8..8f2afcc3 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 e1cb96a88..8f2afcc32 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 40f06c5bc..4c794a098 100644
+index 40f06c5b..4c794a09 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 40f06c5bc..4c794a098 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 ee2d1f9a9..e8401bba7 100644
+index ee2d1f9a..e8401bba 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 ee2d1f9a9..e8401bba7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 284d1204d..3aab54206 100644
+index 284d1204..3aab5420 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -175,7 +175,7 @@ public class EntityTracker {
@@ -737,7 +737,7 @@ index 284d1204d..3aab54206 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c1a8816b4..8d08b536a 100644
+index c1a8816b..8d08b536 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 c1a8816b4..8d08b536a 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index eeac34998..e4ed2e991 100644
+index eeac3499..e4ed2e99 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -984,7 +984,7 @@ index eeac34998..e4ed2e991 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cd2d58bfb..da25a8bea 100644
+index cd2d58bf..da25a8be 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 cd2d58bfb..da25a8bea 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index f74b06794..1fc632e0c 100644
+index f74b0679..1fc632e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,15 +1,21 @@
@@ -1062,7 +1062,7 @@ index f74b06794..1fc632e0c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c00aee885..b3356b40f 100644
+index c00aee88..b3356b40 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1086,7 +1086,7 @@ index c00aee885..b3356b40f 100644
  
      public void addWhitelist(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 74e3f42cd..66a80a776 100644
+index 74e3f42c..66a80a77 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 74e3f42cd..66a80a776 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 5a5a588e7..d2d4ff6fb 100644
+index 5a5a588e..d2d4ff6f 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 5a5a588e7..d2d4ff6fb 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 843320ffb..d902e2630 100644
+index 843320ff..d902e263 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 843320ffb..d902e2630 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 d4f25cbf2..e492913a2 100644
+index d4f25cbf..e492913a 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,10 +1388,10 @@ index d4f25cbf2..e492913a2 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 18c62b20f..cdef8254f 100644
+index b2bbccb5..7e1df932 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1757,12 +1757,31 @@ public final class CraftServer implements Server {
+@@ -1756,12 +1756,31 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -1425,7 +1425,7 @@ index 18c62b20f..cdef8254f 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 4c8ab2bc9..000000000
+index 4c8ab2bc..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -1604,7 +1604,7 @@ index 4c8ab2bc9..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b4465..b5efb9c3f 100644
+index 3a95b446..b5efb9c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1648,7 +1648,7 @@ index 3a95b4465..b5efb9c3f 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 328a81dcf..f387b623d 100644
+index 328a81dc..f387b623 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 328a81dcf..f387b623d 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 23d7ce26f..d50bbd2a6 100644
+index 23d7ce26..d50bbd2a 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 23d7ce26f..d50bbd2a6 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 c37275f2a..a03f933af 100644
+index c37275f2..a03f933a 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 c37275f2a..a03f933af 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b7..3d90b3426 100644
+index e52ef47b..3d90b342 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1844,7 +1844,7 @@ index e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 2bd690fdf..38be7ed71 100644
+index 2bd690fd..38be7ed7 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither;
@@ -1906,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644
      }
  }
 -- 
-2.15.1
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 8c78d756e3..32bf1ad171 100644
--- a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From a0c490de7c95d2fd8dd5f77bfae08e9a69e3cd60 Mon Sep 17 00:00:00 2001
+From 17fe4583cab6632ee9ec76e92101474233148721 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index 8361888c2..3623751bf 100644
+index 8361888c..3623751b 100644
 --- a/src/main/java/net/minecraft/server/EULA.java
 +++ b/src/main/java/net/minecraft/server/EULA.java
 @@ -51,7 +51,8 @@ public class EULA {
@@ -20,7 +20,7 @@ index 8361888c2..3623751bf 100644
              EULA.a.warn("Failed to save {}", this.b, exception);
          } finally {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5b5c143b0..42abdfe12 100644
+index 8d08b536..92d48025 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1049,7 +1049,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -33,20 +33,20 @@ index 5b5c143b0..42abdfe12 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8c9e26eb9..f17e36e7e 100644
+index 7e1df932..d6fdc535 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -137,7 +137,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
+@@ -136,7 +136,7 @@ import org.bukkit.event.server.TabCompleteEvent;
+ import net.md_5.bungee.api.chat.BaseComponent;
  
  public final class CraftServer implements Server {
-     private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
 -    private final String serverName = "CraftBukkit";
 +    private final String serverName = "Paper";
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 96585fb24..f95da9e26 100644
+index 0c5862a3..e3667e55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -192,7 +192,7 @@ public class Main {
@@ -59,7 +59,7 @@ index 96585fb24..f95da9e26 100644
                          Thread.sleep(TimeUnit.SECONDS.toMillis(15));
                      }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 94a3d4237..3ed983cc0 100644
+index 94a3d423..3ed983cc 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
@@ -93,5 +93,5 @@ index 94a3d4237..3ed983cc0 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.13.3.windows.1
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
index e1e0240b1f..2625c1f5ba 100644
--- a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From 58b45080e2438562356f599536095115a997929c Mon Sep 17 00:00:00 2001
+From 9106bda96d42fe08b005d0ed685fbf3cdd8e6cc7 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 92d480251..47fe9262a 100644
+index 92d48025..47fe9262 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -114,16 +114,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -147,10 +147,10 @@ index 92d480251..47fe9262a 100644
                      }
                      lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e540650bc..22650a566 100644
+index d6fdc535..58826d3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1754,6 +1754,17 @@ public final class CraftServer implements Server {
+@@ -1753,6 +1753,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
@@ -169,7 +169,7 @@ index e540650bc..22650a566 100644
      {
  
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index be2e31dea..6d21c3269 100644
+index be2e31de..6d21c326 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -1,8 +1,5 @@
@@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 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.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
index 7a6b80483a..61959194ab 100644
--- a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 481937be155c07c0370e1fa3ee51972ae389deea Mon Sep 17 00:00:00 2001
+From c8577b4b0cdf04d387238b817a3d215a20b26ea6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index da25a8bea..5348c0cbc 100644
+index da25a8be..5348c0cb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1311,6 +1311,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -48,10 +48,10 @@ index da25a8bea..5348c0cbc 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 22650a566..82f7109f1 100644
+index 58826d3d..b6e7f7e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -646,6 +646,29 @@ public final class CraftServer implements Server {
+@@ -645,6 +645,29 @@ public final class CraftServer implements Server {
          Validate.notNull(sender, "Sender cannot be null");
          Validate.notNull(commandLine, "CommandLine cannot be null");
  
@@ -82,5 +82,5 @@ index 22650a566..82f7109f1 100644
              return true;
          }
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
index cee1599f76..91c9ee65ce 100644
--- a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
@@ -1,14 +1,14 @@
-From 8487682f04e645c429b467724850d3829dc94146 Mon Sep 17 00:00:00 2001
+From 2a7fb1c3f5fbef8a3fe6818aa41ed5d964df233f 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 82f7109f1..5ede2abf1 100644
+index b6e7f7e9..c2d945f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1565,6 +1565,7 @@ public final class CraftServer implements Server {
+@@ -1564,6 +1564,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  
@@ -17,5 +17,5 @@ index 82f7109f1..5ede2abf1 100644
          return commandMap;
      }
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
index 04854f2707..91828847fd 100644
--- a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
@@ -1,14 +1,14 @@
-From d2b16855722957ca07e8f2c2baab169bb9d012f8 Mon Sep 17 00:00:00 2001
+From 7f4faf67b72574d46629d226bff8b657c1a06439 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5ede2abf1..5a054148c 100644
+index c2d945f1..137601d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -174,6 +174,7 @@ public final class CraftServer implements Server {
+@@ -173,6 +173,7 @@ public final class CraftServer implements Server {
      private boolean unrestrictedAdvancements;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
@@ -17,7 +17,7 @@ index 5ede2abf1..5a054148c 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0f38abaf8..8628cd5a2 100644
+index 0f38abaf..8628cd5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -240,12 +240,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -66,7 +66,7 @@ index 0f38abaf8..8628cd5a2 100644
      public double getHeight() {
          return getHandle().length;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 3ed983cc0..6384d50e7 100644
+index 3ed983cc..6384d50e 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -66,7 +66,19 @@ public class WatchdogThread extends Thread
@@ -91,5 +91,5 @@ index 3ed983cc0..6384d50e7 100644
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
                  dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
index 9e02e458d2..45ccd75bb4 100644
--- a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From 050ec3e7ee6b02af1e66d33480c4372757f673a3 Mon Sep 17 00:00:00 2001
+From 051d2c48ffa254b918d0e4ef4075acd11247c595 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3898ad8fa..2f6e169f5 100644
+index 3898ad8f..2f6e169f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -210,4 +210,9 @@ public class PaperConfig {
@@ -30,10 +30,10 @@ index 3898ad8fa..2f6e169f5 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5a054148c..4aba8dab8 100644
+index 137601d1..776f165b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -323,6 +323,7 @@ public final class CraftServer implements Server {
+@@ -322,6 +322,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              helpMap.clear();
              helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index 5a054148c..4aba8dab8 100644
          }
  
          Plugin[] plugins = pluginManager.getPlugins();
-@@ -340,7 +341,7 @@ public final class CraftServer implements Server {
+@@ -339,7 +340,7 @@ public final class CraftServer implements Server {
              setVanillaCommands(false);
              // Spigot end
              commandMap.registerServerAliases();
@@ -51,5 +51,5 @@ index 5a054148c..4aba8dab8 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
index 0d0a0949c6..7617c40046 100644
--- a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From 84ee34067cf36f3c0f9287d4bba0972149e44b5e Mon Sep 17 00:00:00 2001
+From e225af03264c4a4d03f205304964d22c755ce47d 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 4aba8dab8..411b8129c 100644
+index 776f165b..5df0fed2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1864,5 +1864,20 @@ public final class CraftServer implements Server {
+@@ -1863,5 +1863,20 @@ public final class CraftServer implements Server {
              return false;
          }
      }
@@ -31,5 +31,5 @@ index 4aba8dab8..411b8129c 100644
      // Paper end
  }
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
index 7629af5f35..71f9bd1604 100644
--- a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From 69c29f2b3c037fa0dca834c89951d06b5d6ce765 Mon Sep 17 00:00:00 2001
+From 062794319b62f22d10b7085e266d305551b6a82c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 411b8129c..ed4ddb86a 100644
+index 5df0fed2..728d0ff8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -744,8 +744,18 @@ public final class CraftServer implements Server {
+@@ -743,8 +743,18 @@ public final class CraftServer implements Server {
              world.paperConfig.init(); // Paper
          }
  
@@ -30,5 +30,5 @@ index 411b8129c..ed4ddb86a 100644
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 72b94cc20d..7b52cb148c 100644
--- a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From c5ca314202ca961e543c7bdf36cf96288f56a491 Mon Sep 17 00:00:00 2001
+From 5a6f8c98aead231b52d1c8e65a10b7c4ac722261 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 74a49a5fb..3a942c763 100644
+index 74a49a5f..3a942c76 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -284,4 +284,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 74a49a5fb..3a942c763 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4e8ce79ff..2300ee10b 100644
+index 4e8ce79f..2300ee10 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -357,8 +357,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -39,7 +39,7 @@ index 4e8ce79ff..2300ee10b 100644
  
                      if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 77791ffeb..71907eb56 100644
+index 279f0a26..a0b36b6b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3200,8 +3200,9 @@ public abstract class World implements IBlockAccess {
@@ -54,10 +54,10 @@ index 77791ffeb..71907eb56 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ed4ddb86a..a820c4335 100644
+index 728d0ff8..c1588879 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -962,7 +962,7 @@ public final class CraftServer implements Server {
+@@ -961,7 +961,7 @@ public final class CraftServer implements Server {
          System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
  
          if (internal.getWorld().getKeepSpawnInMemory()) {
@@ -67,7 +67,7 @@ index ed4ddb86a..a820c4335 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 01fc193db..69dc11e2b 100644
+index 01fc193d..69dc11e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1283,8 +1283,9 @@ public class CraftWorld implements World {
@@ -83,5 +83,5 @@ index 01fc193db..69dc11e2b 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.15.1
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
index b006f29fe3..d042de3cb4 100644
--- a/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
@@ -1,11 +1,11 @@
-From 12f33b01c48ffab95a36255308843a2fc11027b8 Mon Sep 17 00:00:00 2001
+From 7ca6855113de395c6e609d690ea6a4d57ce7a74d Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 011cbf5e3..cf06f8ac3 100644
+index 011cbf5e..cf06f8ac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -230,4 +230,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 011cbf5e3..cf06f8ac3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index b943a9b20..8f3b93dc1 100644
+index b943a9b2..8f3b93dc 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -66,7 +66,8 @@ public class NameReferencingFileConverter {
@@ -33,10 +33,10 @@ index b943a9b20..8f3b93dc1 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a820c4335..1bc394ada 100644
+index c1588879..54f0a1d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1336,7 +1336,8 @@ public final class CraftServer implements Server {
+@@ -1335,7 +1335,8 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
@@ -47,5 +47,5 @@ index a820c4335..1bc394ada 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch
index 9ffe56daed..f7121aa4aa 100644
--- a/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From f9e9f1781bdcaa1043638e0e18324cec41cb9978 Mon Sep 17 00:00:00 2001
+From 776269eb4581d0b6632f73ab19a32cb5e826f59d 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 1bc394ada..15d572489 100644
+index 54f0a1d6..f4eef421 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1890,5 +1890,24 @@ public final class CraftServer implements Server {
+@@ -1889,5 +1889,24 @@ public final class CraftServer implements Server {
              });
          }
      }
@@ -35,5 +35,5 @@ index 1bc394ada..15d572489 100644
      // Paper end
  }
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch
index 7a3e89a411..7b3580f1dc 100644
--- a/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 8ea05fcb53e23086119334e50f63d165ede7d0d8 Mon Sep 17 00:00:00 2001
+From fc05fffe922c4643ad950615cdbc248bc50de923 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 28917f63d..f4b237034 100644
+index 28917f63..f4b23703 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -265,4 +265,9 @@ public class PaperConfig {
@@ -20,10 +20,10 @@ index 28917f63d..f4b237034 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 15d572489..3cdce9d03 100644
+index f4eef421..aea0f480 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1909,5 +1909,10 @@ public final class CraftServer implements Server {
+@@ -1908,5 +1908,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
@@ -35,5 +35,5 @@ index 15d572489..3cdce9d03 100644
      // Paper end
  }
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch
index bd9519fb1a..2b66dfb080 100644
--- a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 299cd31c9f50d9193d79effc7c0cad2ab7fe3c4c Mon Sep 17 00:00:00 2001
+From 567b683a512799016d633249967e0c763dacfc34 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -20,7 +20,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index d49a624ec..93f70ab21 100644
+index f0adc3de..6fbee2a2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -53,12 +53,6 @@
@@ -90,7 +90,7 @@ index d49a624ec..93f70ab21 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 00000000..685deaa0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -113,7 +113,7 @@ index 000000000..685deaa0e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
 new file mode 100644
-index 000000000..d5bc61490
+index 00000000..d5bc6149
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
 @@ -0,0 +1,60 @@
@@ -178,7 +178,7 @@ index 000000000..d5bc61490
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8f2afcc32..b3f1aa999 100644
+index 8f2afcc3..b3f1aa99 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -231,7 +231,7 @@ index 8f2afcc32..b3f1aa999 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 908a5d273..e8bddc171 100644
+index 908a5d27..e8bddc17 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -42,7 +42,6 @@ import org.apache.commons.lang3.Validate;
@@ -290,7 +290,7 @@ index 908a5d273..e8bddc171 100644
  
      public boolean a(int i, String s) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b8a0b67a9..ebca377e5 100644
+index b8a0b67a..ebca377e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -78,8 +78,7 @@ public abstract class PlayerList {
@@ -304,7 +304,7 @@ index b8a0b67a9..ebca377e5 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 3cdce9d03..106dc7b29 100644
+index aea0f480..3a6e8d87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -128,7 +128,6 @@ import io.netty.buffer.ByteBuf;
@@ -315,7 +315,7 @@ index 3cdce9d03..106dc7b29 100644
  import org.apache.commons.lang.StringUtils;
  import org.bukkit.NamespacedKey;
  import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-@@ -1095,9 +1094,13 @@ public final class CraftServer implements Server {
+@@ -1094,9 +1093,13 @@ public final class CraftServer implements Server {
          return logger;
      }
  
@@ -330,7 +330,7 @@ index 3cdce9d03..106dc7b29 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ec9508e90..d3d848f8c 100644
+index ec9508e9..d3d848f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -14,7 +14,7 @@ import java.util.logging.Logger;
@@ -372,7 +372,7 @@ index ec9508e90..d3d848f8c 100644
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb894..000000000
+index 26a2fb89..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,74 +0,0 @@
@@ -451,7 +451,7 @@ index 26a2fb894..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02c..1e3aae3b8 100644
+index 33e8ea02..1e3aae3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -8,17 +8,27 @@ import java.util.logging.Level;
@@ -530,7 +530,7 @@ index 33e8ea02c..1e3aae3b8 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index a0cdd2317..0a1812883 100644
+index a0cdd231..0a181288 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -19,7 +19,7 @@ public class ServerShutdownThread extends Thread {
@@ -544,7 +544,7 @@ index a0cdd2317..0a1812883 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index b64097113..000000000
+index b6409711..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -603,7 +603,7 @@ index b64097113..000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00e..08b6bb7f9 100644
+index 5cee8f00..08b6bb7f 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
@@ -633,5 +633,5 @@ index 5cee8f00e..08b6bb7f9 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch
index e900011530..5bf2b18e84 100644
--- a/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 2780e985421f6fdeab70e6a8f2e5c4a07a6a3d04 Mon Sep 17 00:00:00 2001
+From bd173235efd360b6c6be2fcc273e8cf6e0265d5b Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 106dc7b29..aa098172f 100644
+index 3a6e8d87..3f683238 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -16,7 +16,7 @@ index 106dc7b29..aa098172f 100644
  import org.bukkit.event.inventory.InventoryType;
  import org.bukkit.event.player.PlayerChatTabCompleteEvent;
  import org.bukkit.event.server.BroadcastMessageEvent;
-@@ -676,7 +677,13 @@ public final class CraftServer implements Server {
+@@ -675,7 +676,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) {
@@ -32,5 +32,5 @@ index 106dc7b29..aa098172f 100644
          // Spigot end
  
 -- 
-2.15.0
+2.15.1.windows.2
 
diff --git a/Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch
index e01c66c1bd..e917a61466 100644
--- a/Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 53cac62ad4cf6b9c379fae5f0d51720ca5d4e886 Mon Sep 17 00:00:00 2001
+From c130ed826310705324a7d49797b0cba6fe989176 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d0ab87d0f..ca054afcf 100644
+index d0ab87d0..ca054afc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2276,24 +2276,51 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -80,10 +80,10 @@ index d0ab87d0f..ca054afcf 100644
  
      public void a(PacketPlayInSettings packetplayinsettings) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7370eae9f..7d3a04cb3 100644
+index 3f683238..00ea72b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1640,8 +1640,8 @@ public final class CraftServer implements Server {
+@@ -1639,8 +1639,8 @@ public final class CraftServer implements Server {
          } else {
              offers = tabCompleteChat(player, message);
          }
@@ -95,7 +95,7 @@ index 7370eae9f..7d3a04cb3 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 1e3aae3b8..95d13c146 100644
+index 1e3aae3b..95d13c14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
@@ -139,5 +139,5 @@ index 1e3aae3b8..95d13c146 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.15.1
+2.15.1.windows.2
 
diff --git a/work/Bukkit b/work/Bukkit
index c1a0994aa6..c29791a82d 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c1a0994aa668087b94784576ea9fb45505db9f1d
+Subproject commit c29791a82d9350af40164b501f6ca26d00e2ccba
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 8c37e2ebda..b5a10a9d6d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 8c37e2ebda99bfc27671c21b4cdd481d2ae7190a
+Subproject commit b5a10a9d6d6de739aa4082ba8ad6346da3a48370
diff --git a/work/Spigot b/work/Spigot
index 549c1fa536..b66ad9eed1 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 549c1fa536ddc0b877288e6d9252f02140e31d01
+Subproject commit b66ad9eed1a41a533e0d7ccf4b7aecfea7a06222