Upstream update

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,11 +1,11 @@
-From 4bbb8c7aa24cea492d251eae531d0d88c1565b94 Mon Sep 17 00:00:00 2001
+From c61566569311803c43acb48153d515d4d9871c53 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 f175b611..2fe7b78e 100644
+index 31b8f93e..360d2f08 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,39 +3,39 @@
@@ -83,8 +83,8 @@ index f175b611..2fe7b78e 100644
      <dependencies>
          <dependency>
              <groupId>commons-lang</groupId>
-@@ -57,6 +68,13 @@
+@@ -56,6 +67,13 @@
-             <type>jar</type>
+             <version>1.1.1</version>
              <scope>compile</scope>
          </dependency>
 +        <!-- bundled with Minecraft, shouldn't ever change -->
@@ -97,7 +97,7 @@ index f175b611..2fe7b78e 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -101,6 +119,7 @@
+@@ -100,6 +118,7 @@
      </dependencies>
  
      <build>
@@ -105,7 +105,7 @@ index f175b611..2fe7b78e 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -120,26 +139,6 @@
+@@ -119,26 +138,6 @@
                  </dependencies>
              </plugin>
              <plugin>
@@ -132,7 +132,7 @@ index f175b611..2fe7b78e 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-shade-plugin</artifactId>
                  <version>3.0.0</version>
-@@ -152,6 +151,7 @@
+@@ -151,6 +150,7 @@
                      </execution>
                  </executions>
                  <configuration>
@@ -141,5 +141,5 @@ index f175b611..2fe7b78e 100644
                      <shadedArtifactAttached>true</shadedArtifactAttached>
                  </configuration>
 -- 
-2.13.4
+2.13.0
 

Spigot-API-Patches/0003-Timings-v2.patch

@@ -1,4 +1,4 @@
-From feb30e1e5157616d1a66269983609d6fa9dc3241 Mon Sep 17 00:00:00 2001
+From 98b1fecba12a6cdde5a5c08d9dc2a84851a7669b 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
@@ -2963,7 +2963,7 @@ index 00000000..df592d85
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5649aaf7..b7c939a2 100644
+index eb6b7976..a9081ddb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -523,7 +523,6 @@ public final class Bukkit {
@@ -2975,7 +2975,7 @@ index 5649aaf7..b7c939a2 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7a08fd1e..7dd895a0 100644
+index 83b66361..bc3211f9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -945,12 +945,27 @@ public interface Server extends PluginMessageRecipient {
@@ -3230,7 +3230,7 @@ index 71709126..b886cd82 100644
              // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 deleted file mode 100644
-index a8f61f2d..00000000
+index bba914d7..00000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -1,253 +0,0 @@
@@ -3504,7 +3504,7 @@ index bd2cc354..d2a78f56 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index a8b4db1c..de0ef125 100644
+index b3bcda52..041a4cd7 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
 -    }
  }
 -- 
-2.13.2
+2.13.0
 

Spigot-API-Patches/0018-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From a10595b22bc0699a4ae1d75c993c30a278a1024c Mon Sep 17 00:00:00 2001
+From 04898a9642c98cc38ace2c8862794f1710081a7d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@@ -458,7 +458,7 @@ index 00000000..5582999f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 39b275cb..6e9fc84f 100644
+index b886cd82..f1e9f200 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -10,6 +10,9 @@ import java.util.List;
@@ -494,7 +494,7 @@ index 39b275cb..6e9fc84f 100644
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index b43ffd36..d68e3bee 100644
+index 041a4cd7..68dd3332 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -18,6 +18,9 @@ import java.util.logging.Level;
@@ -587,5 +587,5 @@ index b43ffd36..d68e3bee 100644
          }
      }
 -- 
-2.11.0
+2.13.0
 

Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch

@@ -1,4 +1,4 @@
-From 10a16475692e849a7707ad9d542df68bd9ace602 Mon Sep 17 00:00:00 2001
+From 780e7e1c25c5f7857d4ce5b834f07f4aef6f6814 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 1e57d386..de5bc3f3 100644
+index c6bdf44e..31b6f51b 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -129,6 +129,12 @@
+@@ -128,6 +128,12 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>
@@ -395,5 +395,5 @@ index d8b9c244..40fd71dc 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.13.3.windows.1
+2.13.0
 

Spigot-Server-Patches/0002-Paper-config-files.patch

@@ -1,4 +1,4 @@
-From 74540d1d2671859627d8738cc1b28247a90c08cd Mon Sep 17 00:00:00 2001
+From 556b36cdcad1887c409bfd4a40b0b58efadae1eb 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 e0fa25bb2..3354bf65f 100644
+index 63740c6f1..ec98b3a02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -692,6 +692,7 @@ public final class CraftServer implements Server {
+@@ -698,6 +698,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -384,7 +384,7 @@ index e0fa25bb2..3354bf65f 100644
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
-@@ -707,6 +708,7 @@ public final class CraftServer implements Server {
+@@ -713,6 +714,7 @@ public final class CraftServer implements Server {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }
              world.spigotConfig.init(); // Spigot
@@ -392,7 +392,7 @@ index e0fa25bb2..3354bf65f 100644
          }
  
          pluginManager.clearPlugins();
-@@ -714,6 +716,7 @@ public final class CraftServer implements Server {
+@@ -720,6 +722,7 @@ public final class CraftServer implements Server {
          resetRecipes();
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@@ -400,7 +400,7 @@ index e0fa25bb2..3354bf65f 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
  
          int pollCount = 0;
-@@ -1776,4 +1779,26 @@ public final class CraftServer implements Server {
+@@ -1782,4 +1785,26 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
@@ -428,7 +428,7 @@ index e0fa25bb2..3354bf65f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a1b240daf..96585fb24 100644
+index a151451d5..0c5862a3f 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 {
@@ -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.3.windows.1
+2.13.0
 

Spigot-Server-Patches/0006-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 591e8bd51a21e7051fe5f4daad108fc54f63f840 Mon Sep 17 00:00:00 2001
+From 58e43b6b0747683bae76a23aaa7e2846aed7aa75 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
@@ -1399,10 +1399,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 3354bf65f..8c9e26eb9 100644
+index ec98b3a02..63bbcf0b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1749,6 +1749,7 @@ public final class CraftServer implements Server {
+@@ -1755,6 +1755,7 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -1410,7 +1410,7 @@ index 3354bf65f..8c9e26eb9 100644
          @Override
          public YamlConfiguration getConfig()
          {
-@@ -1756,6 +1757,24 @@ public final class CraftServer implements Server {
+@@ -1762,6 +1763,24 @@ public final class CraftServer implements Server {
          }
  
          @Override
@@ -1918,5 +1918,5 @@ index 2bd690fdf..38be7ed71 100644
      }
  }
 -- 
-2.13.3.windows.1
+2.13.0
 

Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch

@@ -1,4 +1,4 @@
-From 63751d970ad43e4cf66e5959c4001330da8fa78e Mon Sep 17 00:00:00 2001
+From edc5e3daa46c310bda6adb8233ae47b95e82f790 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 f17e36e7e..24fcdd382 100644
+index a4444212a..296431312 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1746,6 +1746,17 @@ public final class CraftServer implements Server {
+@@ -1752,6 +1752,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.3.windows.1
+2.13.0
 

Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch

@@ -1,4 +1,4 @@
-From 181cef0697ca43aa730223a75d278d9803146a71 Mon Sep 17 00:00:00 2001
+From 9c8f05e7c10b1e69eda731012af1937c28fd4408 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 24fcdd382..f28471901 100644
+index 296431312..29aa11372 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -638,6 +638,29 @@ public final class CraftServer implements Server {
+@@ -644,6 +644,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 24fcdd382..f28471901 100644
              return true;
          }
 -- 
-2.13.3.windows.1
+2.13.0
 

Spigot-Server-Patches/0053-Expose-server-CommandMap.patch

@@ -1,14 +1,14 @@
-From 4155fd5b7a8c302eb6e607c8ec0240d34ec46d03 Mon Sep 17 00:00:00 2001
+From 100720158cb1c4ada709e7727c9351fb11c9cf4c 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 f28471901..7c2bb6d01 100644
+index 29aa11372..4ed92a652 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1557,6 +1557,7 @@ public final class CraftServer implements Server {
+@@ -1563,6 +1563,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  
@@ -17,5 +17,5 @@ index f28471901..7c2bb6d01 100644
          return commandMap;
      }
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0059-Add-velocity-warnings.patch

@@ -1,14 +1,14 @@
-From 4054c255ab9374fcf130f546651e7dbf38cbd472 Mon Sep 17 00:00:00 2001
+From 7089660ba58e4cb240c3a9a27e0f827ebbb9f977 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 7c2bb6d01..491d6ef7c 100644
+index 4ed92a652..52a03a2c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -175,6 +175,7 @@ public final class CraftServer implements Server {
+@@ -176,6 +176,7 @@ public final class CraftServer implements Server {
      private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8));
      private final List<CraftPlayer> playerView;
      public int reloadCount;
@@ -17,7 +17,7 @@ index 7c2bb6d01..491d6ef7c 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 d12278a52..05f3df4e7 100644
+index 9ee7593b2..437c3da11 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 {
@@ -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.13.3
+2.13.0
 

Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch

@@ -1,4 +1,4 @@
-From cc980dd4551c6a8f673c7bc520ed6b6b3bd83ee7 Mon Sep 17 00:00:00 2001
+From af66fd610888564e235ff3ffb0b6a3f78aa63e9d 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 491d6ef7c..d8b01145f 100644
+index 52a03a2c5..f178725b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -315,6 +315,7 @@ public final class CraftServer implements Server {
+@@ -321,6 +321,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              helpMap.clear();
              helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index 491d6ef7c..d8b01145f 100644
          }
  
          Plugin[] plugins = pluginManager.getPlugins();
-@@ -332,7 +333,7 @@ public final class CraftServer implements Server {
+@@ -338,7 +339,7 @@ public final class CraftServer implements Server {
              setVanillaCommands(false);
              // Spigot end
              commandMap.registerServerAliases();
@@ -51,5 +51,5 @@ index 491d6ef7c..d8b01145f 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch

@@ -1,4 +1,4 @@
-From 874067837c16fd8ccd4b7d84d8002a95f1c3b70f Mon Sep 17 00:00:00 2001
+From c3d13ca80d237a7c2501ea542048376f3b524852 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 d8b01145f..43348d56c 100644
+index f178725b1..832e473ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1856,5 +1856,20 @@ public final class CraftServer implements Server {
+@@ -1862,5 +1862,20 @@ public final class CraftServer implements Server {
              return false;
          }
      }
@@ -31,5 +31,5 @@ index d8b01145f..43348d56c 100644
      // Paper end
  }
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch

@@ -1,4 +1,4 @@
-From cd8468c6aaa9547eb65d947e6ce8eebb67633cd1 Mon Sep 17 00:00:00 2001
+From e267205ef91b784595c3f49e3743ab734e03c97b 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 43348d56c..c48e5f12c 100644
+index 832e473ac..90e94c55b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -736,8 +736,18 @@ public final class CraftServer implements Server {
+@@ -742,8 +742,18 @@ public final class CraftServer implements Server {
              world.paperConfig.init(); // Paper
          }
  
@@ -30,5 +30,5 @@ index 43348d56c..c48e5f12c 100644
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From dfe77a67a5e52ca18384f004a065c17de5870270 Mon Sep 17 00:00:00 2001
+From 99dc84b2ea93771312d3b2a7617554400f9531ae 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 c48e5f12c..04b4f7251 100644
+index 90e94c55b..76ee8a394 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -954,7 +954,7 @@ public final class CraftServer implements Server {
+@@ -960,7 +960,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.3.windows.1
+2.13.0
 

Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch

@@ -1,4 +1,4 @@
-From e44db9a616ae69b6329413692978638b5bcf4ea1 Mon Sep 17 00:00:00 2001
+From daac5694f61ff9d8b6088ca650495d549e85090d 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 04b4f7251..af3e1a7ac 100644
+index 76ee8a394..49444274f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1328,7 +1328,8 @@ public final class CraftServer implements Server {
+@@ -1334,7 +1334,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 04b4f7251..af3e1a7ac 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From 5e93308e21111deaf7799f42955d37791d72e62f Mon Sep 17 00:00:00 2001
+From 3f9a7ae4ccc41b78c465ffb294f80f289c2601c7 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 af3e1a7ac..b76b7c46a 100644
+index 49444274f..8b6a64a6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1882,5 +1882,24 @@ public final class CraftServer implements Server {
+@@ -1888,5 +1888,24 @@ public final class CraftServer implements Server {
              });
          }
      }
@@ -35,5 +35,5 @@ index af3e1a7ac..b76b7c46a 100644
      // Paper end
  }
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,4 +1,4 @@
-From 9e3ed05cadb989ae8e0c9e82f04a3c71bc3af6b5 Mon Sep 17 00:00:00 2001
+From 42a0bd2ee0ca78a7c08aad3b4cb42155f753e19f 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 b76b7c46a..c01c43394 100644
+index 8b6a64a6a..444f28019 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1901,5 +1901,10 @@ public final class CraftServer implements Server {
+@@ -1907,5 +1907,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
@@ -35,5 +35,5 @@ index b76b7c46a..c01c43394 100644
      // Paper end
  }
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -1,4 +1,4 @@
-From 65ebb33b40bb557b9e20f19e92cd6f61f5b40e9c Mon Sep 17 00:00:00 2001
+From 017a4e3009fcef926398be53f8c39f4f2c11bf4e 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
@@ -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 c01c43394..bef164983 100644
+index 444f28019..9c0b3c60e 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 c01c43394..bef164983 100644
  import org.apache.commons.lang.StringUtils;
  import org.bukkit.NamespacedKey;
  import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-@@ -1087,9 +1086,13 @@ public final class CraftServer implements Server {
+@@ -1093,9 +1092,13 @@ public final class CraftServer implements Server {
          return logger;
      }
  
@@ -639,5 +639,5 @@ index 5cee8f00e..08b6bb7f9 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.13.4
+2.13.0
 

Spigot-Server-Patches/0216-Add-UnknownCommandEvent.patch

@@ -1,11 +1,11 @@
-From c5237a813380ef84b3988222166a0bd0682dde11 Mon Sep 17 00:00:00 2001
+From 11823e523a56b4804bf890eca51e9716cd1c4542 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 bef164983..3541ad3ff 100644
+index 9c0b3c60e..202e7c20d 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 bef164983..3541ad3ff 100644
  import org.bukkit.event.inventory.InventoryType;
  import org.bukkit.event.player.PlayerChatTabCompleteEvent;
  import org.bukkit.event.server.BroadcastMessageEvent;
-@@ -668,7 +669,13 @@ public final class CraftServer implements Server {
+@@ -674,7 +675,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) {
@@ -32,5 +32,5 @@ index bef164983..3541ad3ff 100644
          // Spigot end
  
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0229-Fix-this-stupid-bullshit.patch

@@ -1,11 +1,11 @@
-From f9f7222700d139f4324848ca6ac980625ac035cd Mon Sep 17 00:00:00 2001
+From ae60508ad1503cb1cb293934e8b3def2431716d4 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d3d848f8..9faeef1d 100644
+index d3d848f8c..9faeef1dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -203,6 +203,8 @@ public class Main {
@@ -27,5 +27,5 @@ index d3d848f8..9faeef1d 100644
                  System.out.println("Loading libraries, please wait...");
                  MinecraftServer.main(options);
 -- 
-2.13.4
+2.13.0
 

Spigot-Server-Patches/0229-fix-construction-order-in-CraftBanner.patch

@@ -1,30 +0,0 @@
-From b0336c182dad6d1d0ab9ce63028fa30978e23fb2 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 6 Aug 2017 16:25:31 +0100
-Subject: [PATCH] fix construction order in CraftBanner
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
-index f374385e9..def728dd8 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
-@@ -16,7 +16,7 @@ import org.bukkit.block.banner.PatternType;
- public class CraftBanner extends CraftBlockEntityState<TileEntityBanner> implements Banner {
- 
-     private DyeColor base;
--    private List<Pattern> patterns = new ArrayList<Pattern>();
-+    private List<Pattern> patterns; /* = new ArrayList<Pattern>(); */ // Paper
- 
-     public CraftBanner(final Block block) {
-         super(block, TileEntityBanner.class);
-@@ -31,6 +31,7 @@ public class CraftBanner extends CraftBlockEntityState<TileEntityBanner> impleme
-         super.load(banner);
- 
-         base = DyeColor.getByDyeData((byte) banner.color.getInvColorIndex());
-+        patterns = new ArrayList<>(); // Paper - Ensure that patterns is initialized
- 
-         if (banner.patterns != null) {
-             for (int i = 0; i < banner.patterns.size(); i++) {
--- 
-2.13.4
-

work/Bukkit

@@ -1 +1 @@
-Subproject commit 079e67c2b0a68e8ab64bc292681161031e4211fa
+Subproject commit b44d1d7b0940236deb5798b0f7a964bd94d089b4

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 571760182fb8c5326de812259ddef80564953a1d
+Subproject commit e1f296d115cfd2c517413d122990033fc1eda78d

work/Spigot

@@ -1 +1 @@
-Subproject commit 0d820fa70fa4ca6bdfc6cd3c8a13377a60424774
+Subproject commit 5340a52690887488ebb8d88d6f4a7236eade58ca