Update upstream B/CB

21 files changed, 82 insertions, 82 deletions

diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index c21817f2d2..48d14a838d 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 30dc07b0d34561883d0c878ff8ad5f9b70c98cb2 Mon Sep 17 00:00:00 2001
+From d01fb3a2f5dbe0d60e5d7bfd25c16a040df5315e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -2888,10 +2888,10 @@ index 0000000..3a288d2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5d8422e..ac8b0f5 100644
+index 07b44eb..07530ff 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -537,7 +537,6 @@ public final class Bukkit {
+@@ -538,7 +538,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2900,10 +2900,10 @@ index 5d8422e..ac8b0f5 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c5c3506..3cc741b 100644
+index 2a9c860..36d0be2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -925,12 +925,27 @@ public interface Server extends PluginMessageRecipient {
+@@ -935,12 +935,27 @@ public interface Server extends PluginMessageRecipient {
  
      public class Spigot
      {
diff --git a/Spigot-API-Patches/0005-Add-getTPS-method.patch b/Spigot-API-Patches/0005-Add-getTPS-method.patch
index 22d1f021c5..9990fc2634 100644
--- a/Spigot-API-Patches/0005-Add-getTPS-method.patch
+++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch
@@ -1,14 +1,14 @@
-From 10486c5a17f63eecf703a772acd168b74c0f6d40 Mon Sep 17 00:00:00 2001
+From 4af32b49e181ea1b8eff460f6d5906e3415d0a4b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ac8b0f5..86102a6 100644
+index 07530ff..ed646ca 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1121,6 +1121,14 @@ public final class Bukkit {
+@@ -1133,6 +1133,14 @@ public final class Bukkit {
      }
  
      /**
@@ -24,10 +24,10 @@ index ac8b0f5..86102a6 100644
       * @return the unsafe values instance
       */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3cc741b..1e65835 100644
+index 36d0be2..09f921a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -917,6 +917,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -927,6 +927,13 @@ public interface Server extends PluginMessageRecipient {
      BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag ...flags);
  
      /**
diff --git a/Spigot-API-Patches/0015-Expose-server-CommandMap.patch b/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
index 7668baa7d2..6a8a29da63 100644
--- a/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
@@ -1,11 +1,11 @@
-From a6fae8f6ab073c9006b14b039aebbf7e1d64e242 Mon Sep 17 00:00:00 2001
+From 8a43d9544b79be8a253b9129e32735c12aaf6a44 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 86102a6..5b0441a 100644
+index ed646ca..9b310d8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@@ -20,7 +20,7 @@ index 86102a6..5b0441a 100644
  import org.bukkit.entity.Entity;
  import org.bukkit.entity.Player;
  import org.bukkit.event.inventory.InventoryType;
-@@ -1137,6 +1134,17 @@ public final class Bukkit {
+@@ -1149,6 +1146,17 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -39,7 +39,7 @@ index 86102a6..5b0441a 100644
      {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1e65835..de22136 100644
+index 09f921a..eea7239 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@@ -54,7 +54,7 @@ index 1e65835..de22136 100644
  import org.bukkit.entity.Entity;
  import org.bukkit.entity.Player;
  import org.bukkit.event.inventory.InventoryType;
-@@ -923,6 +920,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -933,6 +930,14 @@ public interface Server extends PluginMessageRecipient {
       */
      public double[] getTPS();
  
diff --git a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 6cebea2068..16f4fec173 100644
--- a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From 6767da41cfeee8b2ed1f1aa00d88af198fbc7a28 Mon Sep 17 00:00:00 2001
+From 1fd8e7ad43cd1fd7602774dc31d963d1078406c6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5b0441a..5265d68 100644
+index 9b310d8..87648ae 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -292,6 +292,26 @@ public final class Bukkit {
+@@ -293,6 +293,26 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -37,10 +37,10 @@ index 5b0441a..5265d68 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index de22136..c8d209e 100644
+index eea7239..6c2366b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -238,6 +238,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -239,6 +239,22 @@ public interface Server extends PluginMessageRecipient {
       */
      public int broadcastMessage(String message);
  
diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
index 8fa807281e..324b17ff10 100644
--- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From 8674a30c6579a14d5b0be4b545d2fb296eb9a3eb Mon Sep 17 00:00:00 2001
+From 72e6b053e69f99ec47de74886e42b95776a23ede Mon Sep 17 00:00:00 2001
 From: William <[email protected]>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5265d68..28a54fd 100644
+index 87648ae..1e98f39 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1163,6 +1163,13 @@ public final class Bukkit {
+@@ -1175,6 +1175,13 @@ public final class Bukkit {
      public static CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 5265d68..28a54fd 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c8d209e..4d82c6f 100644
+index 6c2366b..33e6080 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1001,4 +1001,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1011,4 +1011,6 @@ public interface Server extends PluginMessageRecipient {
      }
  
      Spigot spigot();
diff --git a/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch b/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
index 5bc0138e9a..5f07461e3b 100644
--- a/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
@@ -1,14 +1,14 @@
-From 2ab72f61fd122921fba37d85ee45181482a8b1bc Mon Sep 17 00:00:00 2001
+From 578af17993c01766dadb6c7c005fa42d98a4fb7b Mon Sep 17 00:00:00 2001
 From: DemonWav <[email protected]>
 Date: Wed, 30 Mar 2016 01:19:51 -0500
 Subject: [PATCH] Add getEntity by UUID API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 28a54fd..152f1d1 100644
+index 1e98f39..eb6fb2c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1170,6 +1170,16 @@ public final class Bukkit {
+@@ -1182,6 +1182,16 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 28a54fd..152f1d1 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 4d82c6f..4b56131 100644
+index 33e6080..0850009 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1003,4 +1003,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1013,4 +1013,12 @@ public interface Server extends PluginMessageRecipient {
      Spigot spigot();
  
      void reloadPermissions(); // Paper
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index c845f75634..226c4b17d9 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From ec03a27e95b1f53a612f33a4223a818ad61226fa Mon Sep 17 00:00:00 2001
+From ef49a98a7b98228c041a0dd310ebb8711b9071c5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -289,10 +289,10 @@ index a912719..8bd0250 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 6f31b47..d306f62 100644
+index bb066fa..14543f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -694,6 +694,7 @@ public final class CraftServer implements Server {
+@@ -696,6 +696,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -300,7 +300,7 @@ index 6f31b47..d306f62 100644
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
-@@ -709,12 +710,14 @@ public final class CraftServer implements Server {
+@@ -711,12 +712,14 @@ public final class CraftServer implements Server {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }
              world.spigotConfig.init(); // Spigot
diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index 0bb7948314..b26cbf39d8 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From fde1282d4783577f1f4212c58f6cf3d80e8b11cc Mon Sep 17 00:00:00 2001
+From 1777378abaf4ce4056089d6feb12035bd7570a85 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -969,7 +969,7 @@ index ae427b4..ce3390c 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9ab1e5d..4f1a6a3 100644
+index 1002f3d..6cacac5 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;
@@ -1342,10 +1342,10 @@ index 695bb42..6afcf7c 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d306f62..9460486 100644
+index 14543f3..0ddbd2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1722,6 +1722,7 @@ public final class CraftServer implements Server {
+@@ -1729,6 +1729,7 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -1353,7 +1353,7 @@ index d306f62..9460486 100644
          @Override
          public YamlConfiguration getConfig()
          {
-@@ -1729,6 +1730,24 @@ public final class CraftServer implements Server {
+@@ -1736,6 +1737,24 @@ public final class CraftServer implements Server {
          }
  
          @Override
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 c881946ece..654cd03903 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 6c8a2f785dd53582ad864a4413e44c2ac8564f18 Mon Sep 17 00:00:00 2001
+From 3059ae61c794fce3c54797e2ac440bf78765a779 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -33,10 +33,10 @@ index 81a69e8..c8c6959 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 9460486..e782a80 100644
+index 0ddbd2f..9113be9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -132,7 +132,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
+@@ -134,7 +134,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
  
  public final class CraftServer implements Server {
      private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
index d2af2e9d12..b705e5fd57 100644
--- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From 5cb731aebea389dbd75eaf4cb77841f9672baa62 Mon Sep 17 00:00:00 2001
+From 98a06688336bb1b699ef02030dd393fff7fe597f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -148,10 +148,10 @@ index c8c6959..127d11c 100644
                      }
                      lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e782a80..494c61a 100644
+index 9113be9..c1149a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1719,6 +1719,17 @@ public final class CraftServer implements Server {
+@@ -1726,6 +1726,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
diff --git a/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
index e4a739e079..4b9a4966f5 100644
--- a/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From ae88d4726bd36fdf6f523d427a86890011d7e48f Mon Sep 17 00:00:00 2001
+From e3d4bd0368b3f900252d3a0d6ea7a5a60662a563 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 a5aa755..bc35bc5 100644
+index 6cacac5..d833b61 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1249,6 +1249,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -48,10 +48,10 @@ index a5aa755..bc35bc5 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 494c61a..1d1d45b 100644
+index c1149a6..ff0a441 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 {
+@@ -646,6 +646,29 @@ public final class CraftServer implements Server {
          Validate.notNull(sender, "Sender cannot be null");
          Validate.notNull(commandLine, "CommandLine cannot be null");
  
diff --git a/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch
index a80372922e..78b8ea90b2 100644
--- a/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch
@@ -1,14 +1,14 @@
-From f5f6483d38eddfd97e1f94e93645e9e2c7eaf4ec Mon Sep 17 00:00:00 2001
+From 152826c44acd165e785f018fc2cd1b96d8e23b21 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 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 1d1d45b..8e00881 100644
+index ff0a441..a9ccc8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1559,6 +1559,7 @@ public final class CraftServer implements Server {
+@@ -1566,6 +1566,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  
diff --git a/Spigot-Server-Patches/0057-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0057-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 4c831cb331..bd44d46dcd 100644
--- a/Spigot-Server-Patches/0057-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-Server-Patches/0057-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,14 +1,14 @@
-From 6fd537ae42b766ced6401fcaabe0c0ac6a1133e8 Mon Sep 17 00:00:00 2001
+From 3c8a747e4c7fb30a356120b0098afdc7752fb0c5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8e00881..7dfe30b 100644
+index a9ccc8a..ef3980f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1312,6 +1312,18 @@ public final class CraftServer implements Server {
+@@ -1314,6 +1314,18 @@ public final class CraftServer implements Server {
          return count;
      }
  
@@ -28,7 +28,7 @@ index 8e00881..7dfe30b 100644
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2a577d5..e0ec47f 100644
+index e1b04cb..1d4e8b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0071-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0071-Default-loading-permissions.yml-before-plugins.patch
index b8f90a6b23..a21ea9d29a 100644
--- a/Spigot-Server-Patches/0071-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0071-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From 3adb29de0003d6c0b2d33e1712d60e68f7ee26fd Mon Sep 17 00:00:00 2001
+From b7317d54c56155ca9d901cc1905796e26bc69570 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,10 +30,10 @@ index c1a8243..88b6778 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7dfe30b..33b74cd 100644
+index ef3980f..bb49a22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -314,6 +314,7 @@ public final class CraftServer implements Server {
+@@ -316,6 +316,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              helpMap.clear();
              helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index 7dfe30b..33b74cd 100644
          }
  
          Plugin[] plugins = pluginManager.getPlugins();
-@@ -331,7 +332,7 @@ public final class CraftServer implements Server {
+@@ -333,7 +334,7 @@ public final class CraftServer implements Server {
              setVanillaCommands(false);
              // Spigot end
              commandMap.registerServerAliases();
diff --git a/Spigot-Server-Patches/0072-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0072-Allow-Reloading-of-Custom-Permissions.patch
index f34e09177f..a048af826b 100644
--- a/Spigot-Server-Patches/0072-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0072-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From 49e079c8034062024c738a0be37c44e24d9e45db Mon Sep 17 00:00:00 2001
+From b7ca75de3ebba6ca6772958e9ae6079e4fc5a385 Mon Sep 17 00:00:00 2001
 From: William <[email protected]>
 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 33b74cd..bb2ab84 100644
+index bb49a22..180a297 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1819,4 +1819,21 @@ public final class CraftServer implements Server {
+@@ -1826,4 +1826,21 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
diff --git a/Spigot-Server-Patches/0073-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0073-Remove-Metadata-on-reload.patch
index 926f946c24..224c0b6a06 100644
--- a/Spigot-Server-Patches/0073-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0073-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From 0ab3c7ee6304633f72b94f77cd2e789da522555d Mon Sep 17 00:00:00 2001
+From 29b28b03b5e0735a441d52d55b8847ca6e07d7c6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 bb2ab84..afefbc3 100644
+index 180a297..7364705 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -737,6 +737,14 @@ public final class CraftServer implements Server {
+@@ -739,6 +739,14 @@ public final class CraftServer implements Server {
              world.paperConfig.init(); // Paper
          }
  
diff --git a/Spigot-Server-Patches/0105-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0105-Add-getEntity-by-UUID-API.patch
index fb419bb51c..9fc988dc51 100644
--- a/Spigot-Server-Patches/0105-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0105-Add-getEntity-by-UUID-API.patch
@@ -1,4 +1,4 @@
-From 443056c8ed9fbe0c695c2e7e315b9e9234c7537e Mon Sep 17 00:00:00 2001
+From de9e7e0db359950df5f0f8213285b8845c8c38bf Mon Sep 17 00:00:00 2001
 From: DemonWav <[email protected]>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
@@ -26,7 +26,7 @@ index a872e76..3339985 100644
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index afefbc3..26528bc 100644
+index 7364705..119001c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -53,6 +53,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
@@ -37,7 +37,7 @@ index afefbc3..26528bc 100644
  import org.bukkit.craftbukkit.entity.CraftPlayer;
  import org.bukkit.craftbukkit.generator.CraftChunkData;
  import org.bukkit.craftbukkit.help.SimpleHelpMap;
-@@ -1843,5 +1844,14 @@ public final class CraftServer implements Server {
+@@ -1850,5 +1851,14 @@ public final class CraftServer implements Server {
              });
          }
      }
diff --git a/Spigot-Server-Patches/0111-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0111-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 926d7614ee..b4c73735d7 100644
--- a/Spigot-Server-Patches/0111-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0111-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From fcea52254a12482b03687fce9103b55b7117c789 Mon Sep 17 00:00:00 2001
+From 18a457e3d241695e085692e53f51dac84f468bfe Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -39,7 +39,7 @@ index 3339985..4cb71eb 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 b175b28..bd81a19 100644
+index 6c72e7e..c82ea39 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3222,8 +3222,9 @@ public abstract class World implements IBlockAccess {
@@ -54,10 +54,10 @@ index b175b28..bd81a19 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 26528bc..6dad363 100644
+index 119001c..67e802a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -949,7 +949,7 @@ public final class CraftServer implements Server {
+@@ -951,7 +951,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 26528bc..6dad363 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 c507858..0866f54 100644
+index 86ca901..18d0323 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1240,8 +1240,9 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0158-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0158-Add-setting-for-proxy-online-mode-status.patch
index 83619a27ca..a9c891a4d2 100644
--- a/Spigot-Server-Patches/0158-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0158-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From ac0baf843f3321abaee0f33c7d722989dd3916ba Mon Sep 17 00:00:00 2001
+From eaae681fc8287926596f6418c360884e23a20888 Mon Sep 17 00:00:00 2001
 From: Gabriele C <[email protected]>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
@@ -33,10 +33,10 @@ index 2ff8a6d..52e7360 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 6dad363..2cb0bae 100644
+index 67e802a..d5e602f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1345,7 +1345,8 @@ public final class CraftServer implements Server {
+@@ -1347,7 +1347,8 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
diff --git a/work/Bukkit b/work/Bukkit
-Subproject e4039b9e0c07901a0e274e804569f50f709087a
+Subproject 5037da9d4c088c32d235647c7ff37e4ad573926
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 7fc4255d1a5ce4017f6fec8326274df592e239d
+Subproject 691628ab5cc38c77b9c1a9bd884c7ce40b96373