Update upstream B/CB/S

--- work/Bukkit
Submodule work/Bukkit 1627782b..67e91ef7:
  > Fix some incorrectly handled JavaDoc
  > SPIGOT-4478: Update PlayerLoginEvent docs
  > Add API to manipulate boss bar of entities and those created by commands

--- work/CraftBukkit
Submodule work/CraftBukkit ca22de36..3a911828:
  > SPIGOT-4477: Arrows only firing direction of boat
  > SPIGOT-4478: NPE during PlayerLoginEvent recipe manipulation
  > Add API to manipulate boss bar of entities and those created by commands

--- work/Spigot
Submodule work/Spigot 2474d93d..947a8e7f:
  > Rebuild patches

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

@@ -1,4 +1,4 @@
-From 4c1cbaf5edb5f969dcec1686549b9a70395fac77 Mon Sep 17 00:00:00 2001
+From 0ea9ab16a027e3e06f6e2bd3eb45f2c110664fa4 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 new file mode 100644
-index 000000000..98079dc0c
+index 00000000..98079dc0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 @@ -0,0 +1,82 @@
@@ -94,7 +94,7 @@ index 000000000..98079dc0c
 +}
 diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
 new file mode 100644
-index 000000000..8c43e2061
+index 00000000..8c43e206
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
 @@ -0,0 +1,61 @@
@@ -161,7 +161,7 @@ index 000000000..8c43e2061
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 new file mode 100644
-index 000000000..feddcdbd4
+index 00000000..feddcdbd
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 @@ -0,0 +1,81 @@
@@ -248,7 +248,7 @@ index 000000000..feddcdbd4
 +}
 diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
 new file mode 100644
-index 000000000..b2260104c
+index 00000000..b2260104
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
 @@ -0,0 +1,76 @@
@@ -330,7 +330,7 @@ index 000000000..b2260104c
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
 new file mode 100644
-index 000000000..f222d6b7d
+index 00000000..f222d6b7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingData.java
 @@ -0,0 +1,120 @@
@@ -456,7 +456,7 @@ index 000000000..f222d6b7d
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
 new file mode 100644
-index 000000000..521c985e6
+index 00000000..521c985e
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHandler.java
 @@ -0,0 +1,200 @@
@@ -662,7 +662,7 @@ index 000000000..521c985e6
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 new file mode 100644
-index 000000000..28d0954a3
+index 00000000..28d0954a
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -0,0 +1,345 @@
@@ -1013,7 +1013,7 @@ index 000000000..28d0954a3
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 new file mode 100644
-index 000000000..0e114eb32
+index 00000000..0e114eb3
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 @@ -0,0 +1,55 @@
@@ -1074,7 +1074,7 @@ index 000000000..0e114eb32
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
 new file mode 100644
-index 000000000..a7f1f44d7
+index 00000000..a7f1f44d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
 @@ -0,0 +1,106 @@
@@ -1186,7 +1186,7 @@ index 000000000..a7f1f44d7
 +}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 new file mode 100644
-index 000000000..f907649ba
+index 00000000..f907649b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
 @@ -0,0 +1,284 @@
@@ -1476,7 +1476,7 @@ index 000000000..f907649ba
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 new file mode 100644
-index 000000000..56b10e898
+index 00000000..56b10e89
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
 @@ -0,0 +1,119 @@
@@ -1601,7 +1601,7 @@ index 000000000..56b10e898
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 new file mode 100644
-index 000000000..df7f42595
+index 00000000..df7f4259
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -0,0 +1,342 @@
@@ -1949,7 +1949,7 @@ index 000000000..df7f42595
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
 new file mode 100644
-index 000000000..f63e7033c
+index 00000000..f63e7033
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
 @@ -0,0 +1,187 @@
@@ -2142,7 +2142,7 @@ index 000000000..f63e7033c
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 new file mode 100644
-index 000000000..e7c389c05
+index 00000000..e7c389c0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
 @@ -0,0 +1,72 @@
@@ -2220,7 +2220,7 @@ index 000000000..e7c389c05
 +}
 diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 new file mode 100644
-index 000000000..5edaba128
+index 00000000..5edaba12
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 @@ -0,0 +1,51 @@
@@ -2277,7 +2277,7 @@ index 000000000..5edaba128
 +}
 diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
 new file mode 100644
-index 000000000..23ac07f2c
+index 00000000..23ac07f2
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/Counter.java
 @@ -0,0 +1,35 @@
@@ -2318,7 +2318,7 @@ index 000000000..23ac07f2c
 +}
 diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
 new file mode 100644
-index 000000000..962749750
+index 00000000..96274975
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/JSONUtil.java
 @@ -0,0 +1,129 @@
@@ -2453,7 +2453,7 @@ index 000000000..962749750
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
 new file mode 100644
-index 000000000..24eae4bea
+index 00000000..24eae4be
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingIntMap.java
 @@ -0,0 +1,71 @@
@@ -2530,7 +2530,7 @@ index 000000000..24eae4bea
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
 new file mode 100644
-index 000000000..9a4f9dca8
+index 00000000..9a4f9dca
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingMap.java
 @@ -0,0 +1,339 @@
@@ -2875,7 +2875,7 @@ index 000000000..9a4f9dca8
 +}
 diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
 new file mode 100644
-index 000000000..df592d855
+index 00000000..df592d85
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/MRUMapCache.java
 @@ -0,0 +1,102 @@
@@ -2982,10 +2982,10 @@ index 000000000..df592d855
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d6cdbdd80..242c6fba7 100644
+index 2ce17440..7fdd1a08 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -567,7 +567,6 @@ public final class Bukkit {
+@@ -568,7 +568,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2994,10 +2994,10 @@ index d6cdbdd80..242c6fba7 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index da4ced2d6..33934411d 100644
+index 63392d5e..0e7a81c8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1083,12 +1083,27 @@ public interface Server extends PluginMessageRecipient {
+@@ -1150,12 +1150,27 @@ public interface Server extends PluginMessageRecipient {
      // Spigot start
      public class Spigot
      {
@@ -3028,7 +3028,7 @@ index da4ced2d6..33934411d 100644
           *
 diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 new file mode 100644
-index 000000000..fd452bce4
+index 00000000..fd452bce
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 @@ -0,0 +1,18 @@
@@ -3051,7 +3051,7 @@ index 000000000..fd452bce4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4c931f186..4a479627d 100644
+index 4c931f18..4a479627 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -33,7 +33,8 @@ public abstract class Command {
@@ -3081,7 +3081,7 @@ index 4c931f186..4a479627d 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index 502578837..9c80f4640 100644
+index 50257883..9c80f464 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 @@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
@@ -3104,7 +3104,7 @@ index 502578837..9c80f4640 100644
      }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 000000000..5527e7c86
+index 00000000..5527e7c8
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
 @@ -0,0 +1,105 @@
@@ -3214,7 +3214,7 @@ index 000000000..5527e7c86
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index d9183db2f..43e52a77a 100644
+index d9183db2..43e52a77 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -29,7 +29,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -3249,7 +3249,7 @@ index d9183db2f..43e52a77a 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 bba914d7f..000000000
+index bba914d7..00000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -1,253 +0,0 @@
@@ -3507,7 +3507,7 @@ index bba914d7f..000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bff56f488..fc9a32ce7 100644
+index bff56f48..fc9a32ce 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1591,6 +1591,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3523,7 +3523,7 @@ index bff56f488..fc9a32ce7 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 8b130abb7..80c152ba9 100644
+index 8b130abb..80c152ba 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -293,7 +293,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3580,7 +3580,7 @@ index 8b130abb7..80c152ba9 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 113b899cc..81b428222 100644
+index 113b899c..81b42822 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
@@ -3629,7 +3629,7 @@ index 113b899cc..81b428222 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 af8af8ef0..44093af29 100644
+index af8af8ef..44093af2 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -23,7 +23,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
@@ -3643,7 +3643,7 @@ index af8af8ef0..44093af29 100644
      private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
      private final PluginDescriptionFile description;
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 5ca863b36..048047067 100644
+index 5ca863b3..04804706 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
 @@ -12,4 +12,6 @@ import org.bukkit.event.server.ServerListPingEvent;
@@ -3655,7 +3655,7 @@ index 5ca863b36..048047067 100644
 +    public String getData(); // Spigot
 +}
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index 8d982974e..e9f76006e 100644
+index 8d982974..e9f76006 100644
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
 @@ -1,165 +1,105 @@

Spigot-API-Patches/0005-Add-getTPS-method.patch

@@ -1,14 +1,14 @@
-From 76511263884d3cda914b6672710ece89277ab42b Mon Sep 17 00:00:00 2001
+From 54b68ef1792c46a500d9e0ece68e0c42ef4d1b90 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 242c6fba..c7bb73e6 100644
+index 7fdd1a08..a20c7b73 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1195,6 +1195,16 @@ public final class Bukkit {
+@@ -1270,6 +1270,16 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -26,10 +26,10 @@ index 242c6fba..c7bb73e6 100644
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 33934411..ddfd2219 100644
+index 0e7a81c8..6e8b1380 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -985,6 +985,15 @@ public interface Server extends PluginMessageRecipient {
+@@ -1052,6 +1052,15 @@ public interface Server extends PluginMessageRecipient {
       */
      Entity getEntity(UUID uuid);
  
@@ -46,5 +46,5 @@ index 33934411..ddfd2219 100644
       * Get the advancement specified by this key.
       *
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0013-Expose-server-CommandMap.patch

@@ -1,36 +1,24 @@
-From ed3bce499ebcdfea83b210abbbb180c39700a3a9 Mon Sep 17 00:00:00 2001
+From 76b7c9bfc8893c63975484bf9223df8c1e50c6e7 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 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 c7bb73e6..97dc7b22 100644
+index a20c7b73..32db4b77 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
- import org.bukkit.boss.BarFlag;
- import org.bukkit.boss.BarStyle;
- import org.bukkit.boss.BossBar;
--import org.bukkit.command.CommandException;
--import org.bukkit.command.CommandSender;
--import org.bukkit.command.ConsoleCommandSender;
--import org.bukkit.command.PluginCommand;
-+import org.bukkit.command.*;
- import org.bukkit.entity.Entity;
- import org.bukkit.entity.Player;
- import org.bukkit.event.inventory.InventoryType;
-@@ -1315,6 +1312,17 @@ public final class Bukkit {
+@@ -1390,6 +1390,17 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
 +    // Paper start
 +    /**
-+     * Gets the active {@link CommandMap}
++     * Gets the active {@link org.bukkit.command.CommandMap}
 +     *
 +     * @return the active command map
 +     */
-+    public static CommandMap getCommandMap() {
++    public static org.bukkit.command.CommandMap getCommandMap() {
 +        return server.getCommandMap();
 +    }
 +    // Paper end
@@ -39,36 +27,24 @@ index c7bb73e6..97dc7b22 100644
      {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ddfd2219..4d00b141 100644
+index 6e8b1380..10ee377a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
- import org.bukkit.boss.BarFlag;
- import org.bukkit.boss.BarStyle;
- import org.bukkit.boss.BossBar;
--import org.bukkit.command.CommandException;
--import org.bukkit.command.CommandSender;
--import org.bukkit.command.ConsoleCommandSender;
--import org.bukkit.command.PluginCommand;
-+import org.bukkit.command.*;
- import org.bukkit.entity.Entity;
- import org.bukkit.entity.Player;
- import org.bukkit.event.inventory.InventoryType;
-@@ -994,6 +991,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1061,6 +1061,14 @@ public interface Server extends PluginMessageRecipient {
      public double[] getTPS();
      // Paper end
  
 +    // Paper start
 +    /**
-+     * Gets the active {@link CommandMap}
++     * Gets the active {@link org.bukkit.command.CommandMap}
 +     *
 +     * @return the active command map
 +     */
-+    CommandMap getCommandMap();
++    org.bukkit.command.CommandMap getCommandMap();
 +
      /**
       * Get the advancement specified by this key.
       *
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From 6ae06e8ef33f227d5099b96f19d474f27f51526d Mon Sep 17 00:00:00 2001
+From be81a0b2cb871e4e376040817021dd947c57b00a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 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 97dc7b22d..4571816c9 100644
+index 32db4b77..0119a2cd 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -281,6 +281,26 @@ public final class Bukkit {
+@@ -285,6 +285,26 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -37,10 +37,10 @@ index 97dc7b22d..4571816c9 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 4d00b141b..eb307395d 100644
+index 10ee377a..6ad830d7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -229,6 +229,26 @@ public interface Server extends PluginMessageRecipient {
+@@ -233,6 +233,26 @@ public interface Server extends PluginMessageRecipient {
       */
      public int broadcastMessage(String message);
  
@@ -68,7 +68,7 @@ index 4d00b141b..eb307395d 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/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index be78cb64f..c763277d3 100644
+index be78cb64..c763277d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -428,6 +428,36 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -1,4 +1,4 @@
-From 7ddbde69ccd135b1ed1756a6f21c4b6db5b4bd9a Mon Sep 17 00:00:00 2001
+From 2ff0f3ba22c66ac327e2a70fbbd807f6d52e9747 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -6,11 +6,11 @@ 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 4571816c..438e141d 100644
+index 0119a2cd..39ff2f9e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1341,6 +1341,13 @@ public final class Bukkit {
-     public static CommandMap getCommandMap() {
+@@ -1419,6 +1419,13 @@ public final class Bukkit {
+     public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
 +
@@ -24,10 +24,10 @@ index 4571816c..438e141d 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 eb307395..2f515d2a 100644
+index 6ad830d7..80ef1270 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1166,4 +1166,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1236,4 +1236,6 @@ public interface Server extends PluginMessageRecipient {
  
      Spigot spigot();
      // Spigot end
@@ -105,5 +105,5 @@ index b88f31ca..bd0588a2 100644
 +
  }
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From 667e0445be4fd373482c993003ed3d3bbb2b8f45 Mon Sep 17 00:00:00 2001
+From f643969a027f9886c578f9702b3d919bf573e93c Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 438e141d1..e4e9c8f99 100644
+index 39ff2f9e..b4a7835a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1348,6 +1348,15 @@ public final class Bukkit {
+@@ -1426,6 +1426,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 438e141d1..e4e9c8f99 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 2f515d2ac..678ef1589 100644
+index 80ef1270..1a0a30ee 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1168,4 +1168,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1238,4 +1238,6 @@ public interface Server extends PluginMessageRecipient {
      // Spigot end
  
      void reloadPermissions(); // Paper
@@ -37,7 +37,7 @@ index 2f515d2ac..678ef1589 100644
 +    boolean reloadCommandAliases(); // Paper
  }
 diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
-index 30d60247e..938959aa5 100644
+index 30d60247..938959aa 100644
 --- a/src/main/java/org/bukkit/command/CommandMap.java
 +++ b/src/main/java/org/bukkit/command/CommandMap.java
 @@ -123,4 +123,13 @@ public interface CommandMap {
@@ -55,7 +55,7 @@ index 30d60247e..938959aa5 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 65ad78c48..41e95692e 100644
+index 65ad78c4..41e95692 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -279,4 +279,10 @@ public class SimpleCommandMap implements CommandMap {
@@ -70,7 +70,7 @@ index 65ad78c48..41e95692e 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index f331a4423..a977045de 100644
+index f331a442..a977045d 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 @@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {

Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,4 +1,4 @@
-From 28e2ca4e152b523b70b5b76585b3fbdd9d2ae330 Mon Sep 17 00:00:00 2001
+From 8b39d39d06c4539f1826da9a4309c0503679928e Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e4e9c8f9..756d9c34 100644
+index b4a7835a..cb21a4e4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1357,6 +1357,16 @@ public final class Bukkit {
+@@ -1435,6 +1435,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index e4e9c8f9..756d9c34 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 678ef158..4b342052 100644
+index 1a0a30ee..10f56d4f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1170,4 +1170,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1240,4 +1240,14 @@ public interface Server extends PluginMessageRecipient {
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
@@ -58,5 +58,5 @@ index 2abe1208..c660c178 100644
          }
          return completions;
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch

@@ -1,4 +1,4 @@
-From 38f055fc91d837187231311389f933b0c48b0fed Mon Sep 17 00:00:00 2001
+From 92e96b7704bba384e2967231145548974b1d5cbe Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 43239f844..fe8d34685 100644
+index 43239f84..fe8d3468 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -38,8 +38,8 @@ public final class NamespacedKey {
@@ -21,7 +21,7 @@ index 43239f844..fe8d34685 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 06bcee03b..849ad2cbb 100644
+index 06bcee03..849ad2cb 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1567,6 +1567,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -89,7 +89,7 @@ index 06bcee03b..849ad2cbb 100644
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
  
 diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
-index 107574546..6d5410eab 100644
+index 10757454..6d5410ea 100644
 --- a/src/main/java/org/bukkit/entity/AbstractHorse.java
 +++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
 @@ -22,7 +22,7 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
@@ -102,7 +102,7 @@ index 107574546..6d5410eab 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index 9a569d3a3..8c5efd17e 100644
+index 9a569d3a..8c5efd17 100644
 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 @@ -138,6 +138,7 @@ public interface AreaEffectCloud extends Entity {
@@ -114,7 +114,7 @@ index 9a569d3a3..8c5efd17e 100644
      <T> void setParticle(Particle particle, T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
-index 98af0563c..ec6890ae6 100644
+index 98af0563..ec6890ae 100644
 --- a/src/main/java/org/bukkit/entity/Guardian.java
 +++ b/src/main/java/org/bukkit/entity/Guardian.java
 @@ -12,7 +12,7 @@ public interface Guardian extends Monster {
@@ -127,7 +127,7 @@ index 98af0563c..ec6890ae6 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
-index cfce8fa57..8660070bb 100644
+index cfce8fa5..8660070b 100644
 --- a/src/main/java/org/bukkit/entity/Horse.java
 +++ b/src/main/java/org/bukkit/entity/Horse.java
 @@ -151,7 +151,7 @@ public interface Horse extends AbstractHorse {
@@ -140,7 +140,7 @@ index cfce8fa57..8660070bb 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4b0caae51..45690a2fa 100644
+index 4b0caae5..45690a2f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -445,7 +445,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -233,7 +233,7 @@ index 4b0caae51..45690a2fa 100644
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 2a02ab855..e33d00b30 100644
+index 2a02ab85..e33d00b3 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java
 +++ b/src/main/java/org/bukkit/entity/Skeleton.java
 @@ -15,6 +15,7 @@ public interface Skeleton extends Monster {
@@ -245,7 +245,7 @@ index 2a02ab855..e33d00b30 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index cf53ea22f..629233796 100644
+index cf53ea22..62923379 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -29,14 +29,14 @@ public interface Zombie extends Monster {
@@ -266,10 +266,10 @@ index cf53ea22f..629233796 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
-index de4fb37f3..f1de2af6e 100644
+index 6532c24f..ee0b1273 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
-@@ -24,6 +24,7 @@ public class PlayerLoginEvent extends PlayerEvent {
+@@ -28,6 +28,7 @@ public class PlayerLoginEvent extends PlayerEvent {
       * @param hostname The hostname that was used to connect to the server
       * @param address The address the player used to connect, provided for
       *     timing issues
@@ -277,7 +277,7 @@ index de4fb37f3..f1de2af6e 100644
       */
      public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address, final InetAddress realAddress) { // Spigot
          super(player);
-@@ -47,6 +48,7 @@ public class PlayerLoginEvent extends PlayerEvent {
+@@ -51,6 +52,7 @@ public class PlayerLoginEvent extends PlayerEvent {
       *     timing issues
       * @param result The result status for this event
       * @param message The message to be displayed if result denies login
@@ -286,7 +286,7 @@ index de4fb37f3..f1de2af6e 100644
      public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message, final InetAddress realAddress) { // Spigot
          this(player, hostname, address, realAddress); // Spigot
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 762c43d69..ec2b8b8ed 100644
+index 762c43d6..ec2b8b8e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -126,10 +126,10 @@ public interface ItemFactory {
@@ -304,7 +304,7 @@ index 762c43d69..ec2b8b8ed 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
-index c8e68570f..45431b360 100644
+index c8e68570..45431b36 100644
 --- a/src/main/java/org/bukkit/inventory/Merchant.java
 +++ b/src/main/java/org/bukkit/inventory/Merchant.java
 @@ -32,7 +32,7 @@ public interface Merchant {
@@ -326,7 +326,7 @@ index c8e68570f..45431b360 100644
      void setRecipe(int i, MerchantRecipe recipe) throws IndexOutOfBoundsException;
  
 diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
-index 1413b361b..b4a8051cc 100644
+index 1413b361..b4a8051c 100644
 --- a/src/main/java/org/bukkit/potion/Potion.java
 +++ b/src/main/java/org/bukkit/potion/Potion.java
 @@ -78,6 +78,7 @@ public class Potion {
@@ -338,7 +338,7 @@ index 1413b361b..b4a8051cc 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
-index 40f8d12b9..33d192287 100644
+index 40f8d12b..33d19228 100644
 --- a/src/main/java/org/bukkit/potion/PotionBrewer.java
 +++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
 @@ -34,6 +34,8 @@ public interface PotionBrewer {
@@ -351,7 +351,7 @@ index 40f8d12b9..33d192287 100644
       */
      public Collection<PotionEffect> getEffects(PotionType type, boolean upgraded, boolean extended);
 diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
-index 034421a76..f1a54c23c 100644
+index 034421a7..f1a54c23 100644
 --- a/src/main/java/org/bukkit/potion/PotionType.java
 +++ b/src/main/java/org/bukkit/potion/PotionType.java
 @@ -68,6 +68,7 @@ public enum PotionType {
@@ -381,7 +381,7 @@ index 034421a76..f1a54c23c 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index ab71f3c31..358ea386b 100644
+index ab71f3c3..358ea386 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -84,7 +84,7 @@ public interface Team {

Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 45870392712448cb1e7f594cb52128792cf41fb1 Mon Sep 17 00:00:00 2001
+From 5f476c71f78bbd03f6d90d9bde7ae9254569f79d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -232,10 +232,10 @@ index 00000000..d17061e6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 756d9c34..b80a22b0 100644
+index cb21a4e4..02e7d118 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -47,6 +47,9 @@ import org.bukkit.generator.ChunkGenerator;
+@@ -51,6 +51,9 @@ import org.bukkit.generator.ChunkGenerator;
  import org.bukkit.inventory.ItemFactory;
  import org.bukkit.inventory.meta.ItemMeta;
  
@@ -245,7 +245,7 @@ index 756d9c34..b80a22b0 100644
  /**
   * Represents the Bukkit core, for version and Server singleton handling
   */
-@@ -1367,6 +1370,37 @@ public final class Bukkit {
+@@ -1445,6 +1448,37 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -284,10 +284,10 @@ index 756d9c34..b80a22b0 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 4b342052..5ac21b51 100644
+index 10f56d4f..9e7bc162 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -48,6 +48,9 @@ import org.bukkit.generator.ChunkGenerator;
+@@ -52,6 +52,9 @@ import org.bukkit.generator.ChunkGenerator;
  import org.bukkit.inventory.ItemFactory;
  import org.bukkit.inventory.meta.ItemMeta;
  
@@ -297,7 +297,7 @@ index 4b342052..5ac21b51 100644
  /**
   * Represents a server implementation.
   */
-@@ -1179,5 +1182,30 @@ public interface Server extends PluginMessageRecipient {
+@@ -1249,5 +1252,30 @@ public interface Server extends PluginMessageRecipient {
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
@@ -329,5 +329,5 @@ index 4b342052..5ac21b51 100644
      // Paper end
  }
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0088-getPlayerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From 7a5cdf865d3a693927a9f2c01082038f67eea707 Mon Sep 17 00:00:00 2001
+From 8ddad2ac0889f686038b73a4b10aaf8a3a6333fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:39:28 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 39e52986c..491c73832 100644
+index 02e7d118..233a7154 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -427,6 +427,20 @@ public final class Bukkit {
+@@ -431,6 +431,20 @@ public final class Bukkit {
          return server.getPlayer(id);
      }
  
@@ -34,10 +34,10 @@ index 39e52986c..491c73832 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 64c78caf3..f75fe8b15 100644
+index 9e7bc162..b8076fc3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -357,6 +357,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -361,6 +361,18 @@ public interface Server extends PluginMessageRecipient {
       */
      public Player getPlayer(UUID id);
  
@@ -57,5 +57,5 @@ index 64c78caf3..f75fe8b15 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 -- 
-2.18.0
+2.19.1
 

Spigot-API-Patches/0115-RangedEntity-API.patch

@@ -1,4 +1,4 @@
-From 294bb2b4e77686af5ff006e185603ee6afd1a4d5 Mon Sep 17 00:00:00 2001
+From 9dabc5dec763aaa3e40a936e56c3f466a83e7ecd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 21:34:40 -0400
 Subject: [PATCH] RangedEntity API
@@ -8,7 +8,7 @@ and to perform an attack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
 new file mode 100644
-index 000000000..8234de28f
+index 00000000..8234de28
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
 @@ -0,0 +1,30 @@
@@ -43,7 +43,7 @@ index 000000000..8234de28f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java
-index 7c92c431b..14e6c5ee0 100644
+index 7c92c431..14e6c5ee 100644
 --- a/src/main/java/org/bukkit/entity/Illusioner.java
 +++ b/src/main/java/org/bukkit/entity/Illusioner.java
 @@ -1,6 +1,10 @@
@@ -59,7 +59,7 @@ index 7c92c431b..14e6c5ee0 100644
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index 9422d56cd..92c30ed5a 100644
+index 9422d56c..92c30ed5 100644
 --- a/src/main/java/org/bukkit/entity/Llama.java
 +++ b/src/main/java/org/bukkit/entity/Llama.java
 @@ -1,11 +1,12 @@
@@ -77,7 +77,7 @@ index 9422d56cd..92c30ed5a 100644
      /**
       * Represents the base color that the llama has.
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index e33d00b30..40157befd 100644
+index e33d00b3..40157bef 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java
 +++ b/src/main/java/org/bukkit/entity/Skeleton.java
 @@ -1,9 +1,11 @@
@@ -94,7 +94,7 @@ index e33d00b30..40157befd 100644
      /**
       * Gets the current type of this skeleton.
 diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
-index 818efe2a4..10f8f6d45 100644
+index 818efe2a..10f8f6d4 100644
 --- a/src/main/java/org/bukkit/entity/Snowman.java
 +++ b/src/main/java/org/bukkit/entity/Snowman.java
 @@ -1,9 +1,11 @@
@@ -111,7 +111,7 @@ index 818efe2a4..10f8f6d45 100644
      /**
       * Gets whether this snowman is in "derp mode", meaning it is not wearing a
 diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index 9c5dc1f97..4b27f6890 100644
+index 9c5dc1f9..4b27f689 100644
 --- a/src/main/java/org/bukkit/entity/Witch.java
 +++ b/src/main/java/org/bukkit/entity/Witch.java
 @@ -1,7 +1,9 @@
@@ -126,7 +126,7 @@ index 9c5dc1f97..4b27f6890 100644
 +public interface Witch extends Monster, RangedEntity { // Paper
  }
 diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java
-index 0922c5c6a..c550ed061 100644
+index 3bc332ee..426d3693 100644
 --- a/src/main/java/org/bukkit/entity/Wither.java
 +++ b/src/main/java/org/bukkit/entity/Wither.java
 @@ -1,7 +1,9 @@
@@ -137,9 +137,9 @@ index 0922c5c6a..c550ed061 100644
  /**
   * Represents a Wither boss
   */
--public interface Wither extends Monster {
-+public interface Wither extends Monster, RangedEntity { // Paper
+-public interface Wither extends Monster, Boss {
++public interface Wither extends Monster, Boss, RangedEntity { // Paper
  }
 -- 
-2.18.0
+2.19.1
 

Spigot-API-Patches/0136-Make-EnderDragon-extend-Mob.patch

@@ -1,22 +1,22 @@
-From 0909253d02cf632d3abc621fa12672f8ecf42ddc Mon Sep 17 00:00:00 2001
+From acdfbc0be6e8f8c4802d06818ad3fc506bbd2924 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:08:34 -0400
 Subject: [PATCH] Make EnderDragon extend Mob
 
 
 diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index 4ea0e44e..fa115c09 100644
+index 7170d37a..3ba49208 100644
 --- a/src/main/java/org/bukkit/entity/EnderDragon.java
 +++ b/src/main/java/org/bukkit/entity/EnderDragon.java
 @@ -3,7 +3,7 @@ package org.bukkit.entity;
  /**
   * Represents an Ender Dragon
   */
--public interface EnderDragon extends ComplexLivingEntity {
-+public interface EnderDragon extends ComplexLivingEntity, org.bukkit.entity.Mob { // Paper - add Mob
+-public interface EnderDragon extends ComplexLivingEntity, Boss {
++public interface EnderDragon extends ComplexLivingEntity, Boss, org.bukkit.entity.Mob { // Paper - add Mob
  
      /**
       * Represents a phase or action that an Ender Dragon can perform.
 -- 
-2.19.0
+2.19.1