diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index aa6d133d81..fe6870001f 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 556b36cdcad1887c409bfd4a40b0b58efadae1eb Mon Sep 17 00:00:00 2001
+From a954e3db87c50573a0e8397e3dd7a58023396295 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
@@ -373,10 +373,10 @@ index e1833f376..1096c6c66 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 63740c6f1..ec98b3a02 100644
+index 814be6ee5..37e3c14fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -698,6 +698,7 @@ public final class CraftServer implements Server {
+@@ -702,6 +702,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -384,7 +384,7 @@ index 63740c6f1..ec98b3a02 100644
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
-@@ -713,6 +714,7 @@ public final class CraftServer implements Server {
+@@ -717,6 +718,7 @@ public final class CraftServer implements Server {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }
              world.spigotConfig.init(); // Spigot
@@ -392,7 +392,7 @@ index 63740c6f1..ec98b3a02 100644
          }
  
          pluginManager.clearPlugins();
-@@ -720,6 +722,7 @@ public final class CraftServer implements Server {
+@@ -724,6 +726,7 @@ public final class CraftServer implements Server {
          resetRecipes();
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@@ -400,7 +400,7 @@ index 63740c6f1..ec98b3a02 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
  
          int pollCount = 0;
-@@ -1782,4 +1785,26 @@ public final class CraftServer implements Server {
+@@ -1786,4 +1789,26 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
@@ -488,5 +488,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.13.0
+2.14.1.windows.1
 
diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index d0a2a350a9..f7044310ad 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 36d40d52524328c145c01bd3d4250ac737f47b43 Mon Sep 17 00:00:00 2001
+From eab42136f14467e13cb47dc33446c680649ffd4c 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
@@ -1388,10 +1388,10 @@ index 8afe1d3d3..00b093976 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ec98b3a02..63bbcf0b1 100644
+index 37e3c14fd..fa6a74474 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1755,12 +1755,31 @@ public final class CraftServer implements Server {
+@@ -1759,12 +1759,31 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -1906,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644
      }
  }
 -- 
-2.14.1
+2.14.1.windows.1
 
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 b520a34479..072107a255 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 edc5e3daa46c310bda6adb8233ae47b95e82f790 Mon Sep 17 00:00:00 2001
+From 1639601e8c6aac033e2395d2c6b80dd1ff1c1d91 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
@@ -147,10 +147,10 @@ index 42abdfe12..f4d0e2678 100644
                      }
                      lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a4444212a..296431312 100644
+index 588521ff2..80e175e59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1752,6 +1752,17 @@ public final class CraftServer implements Server {
+@@ -1756,6 +1756,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
@@ -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.13.0
+2.14.1.windows.1
 
diff --git a/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
index f066f3e7f5..41b756f3ce 100644
--- a/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
@@ -1,11 +1,11 @@
-From bf24caf82339d24a9c4a6fd4ef31cdb3c7496d1b Mon Sep 17 00:00:00 2001
+From f30b8e431b4adb7701d0fda4d572b2195f05ef67 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index c0c4f8e7d..8c81544f0 100644
+index 4976eb26a..a04b3a9e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
@@ -14,9 +14,9 @@ index c0c4f8e7d..8c81544f0 100644
  import net.minecraft.server.TileEntitySkull;
 +import net.minecraft.server.*;
  
+ import org.bukkit.Bukkit;
  import org.bukkit.Material;
- import org.bukkit.configuration.serialization.DelegateDeserialization;
-@@ -134,8 +135,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -151,8 +152,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          if (name == null) {
              profile = null;
          } else {
@@ -31,5 +31,5 @@ index c0c4f8e7d..8c81544f0 100644
              // Spigot end
          }
 -- 
-2.12.2
+2.14.1.windows.1
 
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 896f7bd420..e3e1f2ae07 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 9c8f05e7c10b1e69eda731012af1937c28fd4408 Mon Sep 17 00:00:00 2001
+From 8ec664bfcb1379e06548827ca31d835b940b868b 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
@@ -48,10 +48,10 @@ index 03bbac737..4f784742c 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 296431312..29aa11372 100644
+index 80e175e59..7762cb432 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -644,6 +644,29 @@ public final class CraftServer implements Server {
+@@ -648,6 +648,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 296431312..29aa11372 100644
              return true;
          }
 -- 
-2.13.0
+2.14.1.windows.1
 
diff --git a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
index 1f06fa4944..ff694b99ed 100644
--- a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
@@ -1,14 +1,14 @@
-From 100720158cb1c4ada709e7727c9351fb11c9cf4c Mon Sep 17 00:00:00 2001
+From 44bc7fe619551870a5daa7f128492b764192a0cd 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 29aa11372..4ed92a652 100644
+index 7762cb432..59ead80b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1563,6 +1563,7 @@ public final class CraftServer implements Server {
+@@ -1567,6 +1567,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  
@@ -17,5 +17,5 @@ index 29aa11372..4ed92a652 100644
          return commandMap;
      }
 -- 
-2.13.0
+2.14.1.windows.1
 
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 bc31e59231..6f5a947e73 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 af66fd610888564e235ff3ffb0b6a3f78aa63e9d Mon Sep 17 00:00:00 2001
+From 67655fe56970c3f18883964c6563000ad398b929 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
@@ -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 52a03a2c5..f178725b1 100644
+index 49f14e495..04ff4a555 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -321,6 +321,7 @@ public final class CraftServer implements Server {
+@@ -325,6 +325,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              helpMap.clear();
              helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index 52a03a2c5..f178725b1 100644
          }
  
          Plugin[] plugins = pluginManager.getPlugins();
-@@ -338,7 +339,7 @@ public final class CraftServer implements Server {
+@@ -342,7 +343,7 @@ public final class CraftServer implements Server {
              setVanillaCommands(false);
              // Spigot end
              commandMap.registerServerAliases();
@@ -51,5 +51,5 @@ index 52a03a2c5..f178725b1 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.13.0
+2.14.1.windows.1
 
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 6bd9290850..bf6c8e19e2 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 c3d13ca80d237a7c2501ea542048376f3b524852 Mon Sep 17 00:00:00 2001
+From 0b85bd49b7813d26cad70e517f5e293cb9fd1980 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 f178725b1..832e473ac 100644
+index 04ff4a555..7be225421 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1862,5 +1862,20 @@ public final class CraftServer implements Server {
+@@ -1866,5 +1866,20 @@ public final class CraftServer implements Server {
              return false;
          }
      }
@@ -31,5 +31,5 @@ index f178725b1..832e473ac 100644
      // Paper end
  }
 -- 
-2.13.0
+2.14.1.windows.1
 
diff --git a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
index 4920507a95..635bcc5000 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 e267205ef91b784595c3f49e3743ab734e03c97b Mon Sep 17 00:00:00 2001
+From ab2d474cfd44d63c2dbc39e265e85838e6d115a7 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 832e473ac..90e94c55b 100644
+index 7be225421..d0ec4e0bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -742,8 +742,18 @@ public final class CraftServer implements Server {
+@@ -746,8 +746,18 @@ public final class CraftServer implements Server {
              world.paperConfig.init(); // Paper
          }
  
@@ -30,5 +30,5 @@ index 832e473ac..90e94c55b 100644
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
 -- 
-2.13.0
+2.14.1.windows.1
 
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 7a0012f684..99fc1f3c38 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 99dc84b2ea93771312d3b2a7617554400f9531ae Mon Sep 17 00:00:00 2001
+From 4786be5899e3b6dfaa445a411a3b4792cbe22253 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
@@ -54,10 +54,10 @@ index 7164f224f..f235f7483 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 90e94c55b..76ee8a394 100644
+index d0ec4e0bf..5e37b54ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -960,7 +960,7 @@ public final class CraftServer implements Server {
+@@ -964,7 +964,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()) {
@@ -83,5 +83,5 @@ index 843a3415f..24b4a7ea7 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.13.0
+2.14.1.windows.1
 
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 76445375c8..ddfeb14a15 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,4 +1,4 @@
-From daac5694f61ff9d8b6088ca650495d549e85090d Mon Sep 17 00:00:00 2001
+From 451bf9278c72ef0d1b95229787cd23f7530eb955 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
@@ -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 76ee8a394..49444274f 100644
+index 5e37b54ae..d40b13c6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1334,7 +1334,8 @@ public final class CraftServer implements Server {
+@@ -1338,7 +1338,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 76ee8a394..49444274f 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.13.0
+2.14.1.windows.1
 
diff --git a/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
index a6dddb3412..b337fc97b0 100644
--- a/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 3f9a7ae4ccc41b78c465ffb294f80f289c2601c7 Mon Sep 17 00:00:00 2001
+From 27326fc9080806c4213bd311c9f8faad37abd804 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 49444274f..8b6a64a6a 100644
+index d40b13c6e..5bbb09c9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1888,5 +1888,24 @@ public final class CraftServer implements Server {
+@@ -1892,5 +1892,24 @@ public final class CraftServer implements Server {
              });
          }
      }
@@ -35,5 +35,5 @@ index 49444274f..8b6a64a6a 100644
      // Paper end
  }
 -- 
-2.13.0
+2.14.1.windows.1
 
diff --git a/Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
index bf90db79e3..c1f1e3ae7a 100644
--- a/Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 42a0bd2ee0ca78a7c08aad3b4cb42155f753e19f Mon Sep 17 00:00:00 2001
+From b4f7fd881033978a4cf32a6d1c1f6170840ebdf7 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
@@ -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 8b6a64a6a..444f28019 100644
+index 5bbb09c9d..5c36e7373 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1907,5 +1907,10 @@ public final class CraftServer implements Server {
+@@ -1911,5 +1911,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
@@ -35,5 +35,5 @@ index 8b6a64a6a..444f28019 100644
      // Paper end
  }
 -- 
-2.13.0
+2.14.1.windows.1
 
diff --git a/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
index aa8801cd28..da57206f16 100644
--- a/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From d1999325ad4e522cd4e5636816b77855beca4695 Mon Sep 17 00:00:00 2001
+From 3bd758c95ec441e1261ce7ca497b40fc5f515094 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 7f6f7fe84..d36611644 100644
+index 69bcf936d..a62a698fd 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -53,12 +53,6 @@
@@ -310,7 +310,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 444f28019..9c0b3c60e 100644
+index 5c36e7373..cb4b78e0e 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;
@@ -321,7 +321,7 @@ index 444f28019..9c0b3c60e 100644
  import org.apache.commons.lang.StringUtils;
  import org.bukkit.NamespacedKey;
  import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-@@ -1093,9 +1092,13 @@ public final class CraftServer implements Server {
+@@ -1097,9 +1096,13 @@ public final class CraftServer implements Server {
          return logger;
      }
  
@@ -639,5 +639,5 @@ index 5cee8f00e..08b6bb7f9 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.14.1
+2.14.1.windows.1
 
diff --git a/Spigot-Server-Patches/0216-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0216-Add-UnknownCommandEvent.patch
index 531289b268..55994aa28f 100644
--- a/Spigot-Server-Patches/0216-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0216-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 11823e523a56b4804bf890eca51e9716cd1c4542 Mon Sep 17 00:00:00 2001
+From 5d9e9c3c88db23fc1a46b0310f0ebf29901d8970 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 9c0b3c60e..202e7c20d 100644
+index cb4b78e0e..b42f4e9ee 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 9c0b3c60e..202e7c20d 100644
  import org.bukkit.event.inventory.InventoryType;
  import org.bukkit.event.player.PlayerChatTabCompleteEvent;
  import org.bukkit.event.server.BroadcastMessageEvent;
-@@ -674,7 +675,13 @@ public final class CraftServer implements Server {
+@@ -678,7 +679,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) {
@@ -32,5 +32,5 @@ index 9c0b3c60e..202e7c20d 100644
          // Spigot end
  
 -- 
-2.13.0
+2.14.1.windows.1