diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index 40a9ead0b..90c4aa45e 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From b748d51a21472920c2b329eb91b814f0a0cabc52 Mon Sep 17 00:00:00 2001
+From 4c1cbaf5edb5f969dcec1686549b9a70395fac77 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 00000000..98079dc0
+index 000000000..98079dc0c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 @@ -0,0 +1,82 @@
@@ -94,7 +94,7 @@ index 00000000..98079dc0
 +}
 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 00000000..8c43e206
+index 000000000..8c43e2061
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
 @@ -0,0 +1,61 @@
@@ -161,7 +161,7 @@ index 00000000..8c43e206
 +}
 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 00000000..feddcdbd
+index 000000000..feddcdbd4
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 @@ -0,0 +1,81 @@
@@ -248,7 +248,7 @@ index 00000000..feddcdbd
 +}
 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 00000000..b2260104
+index 000000000..b2260104c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
 @@ -0,0 +1,76 @@
@@ -330,7 +330,7 @@ index 00000000..b2260104
 +}
 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 00000000..f222d6b7
+index 000000000..f222d6b7d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingData.java
 @@ -0,0 +1,120 @@
@@ -456,7 +456,7 @@ index 00000000..f222d6b7
 +}
 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 00000000..521c985e
+index 000000000..521c985e6
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHandler.java
 @@ -0,0 +1,200 @@
@@ -662,7 +662,7 @@ index 00000000..521c985e
 +}
 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 00000000..28d0954a
+index 000000000..28d0954a3
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -0,0 +1,345 @@
@@ -1013,7 +1013,7 @@ index 00000000..28d0954a
 +}
 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 00000000..0e114eb3
+index 000000000..0e114eb32
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 @@ -0,0 +1,55 @@
@@ -1074,7 +1074,7 @@ index 00000000..0e114eb3
 +}
 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 00000000..a7f1f44d
+index 000000000..a7f1f44d7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
 @@ -0,0 +1,106 @@
@@ -1186,7 +1186,7 @@ index 00000000..a7f1f44d
 +}
 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 00000000..f907649b
+index 000000000..f907649ba
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
 @@ -0,0 +1,284 @@
@@ -1476,7 +1476,7 @@ index 00000000..f907649b
 +}
 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 00000000..56b10e89
+index 000000000..56b10e898
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
 @@ -0,0 +1,119 @@
@@ -1601,7 +1601,7 @@ index 00000000..56b10e89
 +}
 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 00000000..df7f4259
+index 000000000..df7f42595
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -0,0 +1,342 @@
@@ -1949,7 +1949,7 @@ index 00000000..df7f4259
 +}
 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 00000000..f63e7033
+index 000000000..f63e7033c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
 @@ -0,0 +1,187 @@
@@ -2142,7 +2142,7 @@ index 00000000..f63e7033
 +}
 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 00000000..e7c389c0
+index 000000000..e7c389c05
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
 @@ -0,0 +1,72 @@
@@ -2220,7 +2220,7 @@ index 00000000..e7c389c0
 +}
 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 00000000..5edaba12
+index 000000000..5edaba128
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 @@ -0,0 +1,51 @@
@@ -2277,7 +2277,7 @@ index 00000000..5edaba12
 +}
 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 00000000..23ac07f2
+index 000000000..23ac07f2c
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/Counter.java
 @@ -0,0 +1,35 @@
@@ -2318,7 +2318,7 @@ index 00000000..23ac07f2
 +}
 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 00000000..96274975
+index 000000000..962749750
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/JSONUtil.java
 @@ -0,0 +1,129 @@
@@ -2453,7 +2453,7 @@ index 00000000..96274975
 +}
 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 00000000..24eae4be
+index 000000000..24eae4bea
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingIntMap.java
 @@ -0,0 +1,71 @@
@@ -2530,7 +2530,7 @@ index 00000000..24eae4be
 +}
 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 00000000..9a4f9dca
+index 000000000..9a4f9dca8
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingMap.java
 @@ -0,0 +1,339 @@
@@ -2875,7 +2875,7 @@ index 00000000..9a4f9dca
 +}
 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 00000000..df592d85
+index 000000000..df592d855
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/MRUMapCache.java
 @@ -0,0 +1,102 @@
@@ -2982,7 +2982,7 @@ index 00000000..df592d85
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d6cdbdd8..242c6fba 100644
+index d6cdbdd80..242c6fba7 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 {
@@ -2994,7 +2994,7 @@ index d6cdbdd8..242c6fba 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index da4ced2d..33934411 100644
+index da4ced2d6..33934411d 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 {
@@ -3028,7 +3028,7 @@ index da4ced2d..33934411 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 00000000..fd452bce
+index 000000000..fd452bce4
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 @@ -0,0 +1,18 @@
@@ -3051,10 +3051,10 @@ index 00000000..fd452bce
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 7ca5be84..86c78098 100644
+index 4c931f186..4a479627d 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
-@@ -32,7 +32,8 @@ public abstract class Command {
+@@ -33,7 +33,8 @@ public abstract class Command {
      protected String usageMessage;
      private String permission;
      private String permissionMessage;
@@ -3064,7 +3064,7 @@ index 7ca5be84..86c78098 100644
  
      protected Command(String name) {
          this(name, "", "/" + name, new ArrayList<String>());
-@@ -46,7 +47,6 @@ public abstract class Command {
+@@ -47,7 +48,6 @@ public abstract class Command {
          this.usageMessage = usageMessage;
          this.aliases = aliases;
          this.activeAliases = new ArrayList<String>(aliases);
@@ -3072,7 +3072,7 @@ index 7ca5be84..86c78098 100644
      }
  
      /**
-@@ -235,7 +235,6 @@ public abstract class Command {
+@@ -236,7 +236,6 @@ public abstract class Command {
      public boolean setLabel(String name) {
          this.nextLabel = name;
          if (!isRegistered()) {
@@ -3081,7 +3081,7 @@ index 7ca5be84..86c78098 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index 50257883..9c80f464 100644
+index 502578837..9c80f4640 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 50257883..9c80f464 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 00000000..5527e7c8
+index 000000000..5527e7c86
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
 @@ -0,0 +1,105 @@
@@ -3214,10 +3214,10 @@ index 00000000..5527e7c8
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 1d826bae..38130cc3 100644
+index d9183db2f..43e52a77a 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -30,7 +30,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -29,7 +29,7 @@ public class SimpleCommandMap implements CommandMap {
          register("bukkit", new VersionCommand("version"));
          register("bukkit", new ReloadCommand("reload"));
          register("bukkit", new PluginsCommand("plugins"));
@@ -3226,7 +3226,7 @@ index 1d826bae..38130cc3 100644
      }
  
      public void setFallbackCommands() {
-@@ -59,6 +59,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -58,6 +58,7 @@ public class SimpleCommandMap implements CommandMap {
       * {@inheritDoc}
       */
      public boolean register(String label, String fallbackPrefix, Command command) {
@@ -3234,7 +3234,7 @@ index 1d826bae..38130cc3 100644
          label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
          fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
          boolean registered = register(label, command, false, fallbackPrefix);
-@@ -134,6 +135,12 @@ public class SimpleCommandMap implements CommandMap {
+@@ -133,6 +134,12 @@ public class SimpleCommandMap implements CommandMap {
              return false;
          }
  
@@ -3249,7 +3249,7 @@ index 1d826bae..38130cc3 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 bba914d7..00000000
+index bba914d7f..000000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -1,253 +0,0 @@
@@ -3507,10 +3507,10 @@ index bba914d7..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9252d4af..067e217e 100644
+index bff56f488..fc9a32ce7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1580,6 +1580,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1591,6 +1591,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -3523,7 +3523,7 @@ index 9252d4af..067e217e 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 8b130abb..80c152ba 100644
+index 8b130abb7..80c152ba9 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 8b130abb..80c152ba 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 113b899c..81b42822 100644
+index 113b899cc..81b428222 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 113b899c..81b42822 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 af8af8ef..44093af2 100644
+index af8af8ef0..44093af29 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 af8af8ef..44093af2 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 5ca863b3..04804706 100644
+index 5ca863b36..048047067 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 5ca863b3..04804706 100644
 +    public String getData(); // Spigot
 +}
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index 8d982974..e9f76006 100644
+index 8d982974e..e9f76006e 100644
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
 @@ -1,165 +1,105 @@
diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
index 83a8d0f7c..9e9c47375 100644
--- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
@@ -1,14 +1,14 @@
-From 495d39a106804807258ae2f6782d58da9b5f86fc Mon Sep 17 00:00:00 2001
+From 35f1ddc77e007fa75ef13cce62b922bc8dbaab97 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 29 Feb 2016 17:22:34 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 067e217ea..c062e5dc1 100644
+index fc9a32ce7..d9680af01 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1473,6 +1473,22 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1484,6 +1484,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public String getLocale();
  
@@ -32,5 +32,5 @@ index 067e217ea..c062e5dc1 100644
       * Update the list of commands sent to the client.
       * <br>
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0006-Entity-Origin-API.patch b/Spigot-API-Patches/0006-Entity-Origin-API.patch
index 216dc2179..808c9e429 100644
--- a/Spigot-API-Patches/0006-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0006-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From b6b21b6bdacb1ea6abdd132e3f173822ef543836 Mon Sep 17 00:00:00 2001
+From d79b1de71ec4b1352fe7c1c060ec3df5b79dc1f7 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 4f5eb367..d793de62 100644
+index 4f5eb3676..d793de62c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -557,4 +557,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -25,7 +25,7 @@ index 4f5eb367..d793de62 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 0cd830d9..170a9aee 100644
+index 0cd830d90..170a9aee5 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -51,4 +51,15 @@ public interface FallingBlock extends Entity {
@@ -45,10 +45,10 @@ index 0cd830d9..170a9aee 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index fcd0a9b2..2abef57c 100644
+index a439eaf56..04cc23ef1 100644
 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
 +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
-@@ -35,4 +35,15 @@ public interface TNTPrimed extends Explosive {
+@@ -37,4 +37,15 @@ public interface TNTPrimed extends Explosive {
       * @return the source of this primed TNT
       */
      public Entity getSource();
diff --git a/Spigot-API-Patches/0007-Check-Paper-versions.patch b/Spigot-API-Patches/0007-Check-Paper-versions.patch
index 9f24f1866..65cde94c8 100644
--- a/Spigot-API-Patches/0007-Check-Paper-versions.patch
+++ b/Spigot-API-Patches/0007-Check-Paper-versions.patch
@@ -1,14 +1,14 @@
-From 044a6e8b11ac010734eec362f0187c7b844a450c Mon Sep 17 00:00:00 2001
+From 121fabf8e1502b935c8d3f94635247b6d369de24 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:58:01 -0600
 Subject: [PATCH] Check Paper versions
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 760d58eb..52952aa4 100644
+index 5a994953b..f38f68640 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -28,6 +28,11 @@ import org.json.simple.JSONObject;
+@@ -26,6 +26,11 @@ import org.json.simple.JSONObject;
  import org.json.simple.parser.JSONParser;
  import org.json.simple.parser.ParseException;
  
@@ -20,7 +20,7 @@ index 760d58eb..52952aa4 100644
  public class VersionCommand extends BukkitCommand {
      public VersionCommand(String name) {
          super(name);
-@@ -151,7 +156,7 @@ public class VersionCommand extends BukkitCommand {
+@@ -149,7 +154,7 @@ public class VersionCommand extends BukkitCommand {
  
      private void sendVersion(CommandSender sender) {
          if (hasVersion) {
@@ -29,7 +29,7 @@ index 760d58eb..52952aa4 100644
                  lastCheck = System.currentTimeMillis();
                  hasVersion = false;
              } else {
-@@ -182,24 +187,28 @@ public class VersionCommand extends BukkitCommand {
+@@ -180,24 +185,28 @@ public class VersionCommand extends BukkitCommand {
          }
      }
  
@@ -70,7 +70,7 @@ index 760d58eb..52952aa4 100644
              version = version.substring("git-Bukkit-".length());
              int cbVersions = getDistance("craftbukkit", version.substring(0, version.indexOf(' ')));
              if (cbVersions == -1) {
-@@ -232,8 +241,16 @@ public class VersionCommand extends BukkitCommand {
+@@ -230,8 +239,16 @@ public class VersionCommand extends BukkitCommand {
          }
      }
  
@@ -88,7 +88,7 @@ index 760d58eb..52952aa4 100644
              BufferedReader reader = Resources.asCharSource(
                      new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, "UTF-8") + "&withCounts=true"),
                      Charsets.UTF_8
-@@ -247,9 +264,57 @@ public class VersionCommand extends BukkitCommand {
+@@ -245,9 +262,57 @@ public class VersionCommand extends BukkitCommand {
              } finally {
                  reader.close();
              }
@@ -147,5 +147,5 @@ index 760d58eb..52952aa4 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0009-Add-player-view-distance-API.patch b/Spigot-API-Patches/0009-Add-player-view-distance-API.patch
index 139f83748..64cfd077c 100644
--- a/Spigot-API-Patches/0009-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0009-Add-player-view-distance-API.patch
@@ -1,14 +1,14 @@
-From fd03948745cf5823135697e592518069871c061b Mon Sep 17 00:00:00 2001
+From a8ce84c2a0455c326c6e569cb07b36b931815077 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c062e5dc1..ee5c8ece2 100644
+index d9680af01..be78cb64f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1497,6 +1497,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1508,6 +1508,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void updateCommands();
  
@@ -30,5 +30,5 @@ index c062e5dc1..ee5c8ece2 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 37d27e244..28da2868e 100644
--- a/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From 22f7ed80cfd47412a215facc5aa618f451d19692 Mon Sep 17 00:00:00 2001
+From 6ae06e8ef33f227d5099b96f19d474f27f51526d 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,7 +6,7 @@ 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 dbfd6e41d..4c5e0035a 100644
+index 97dc7b22d..4571816c9 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 {
@@ -37,7 +37,7 @@ index dbfd6e41d..4c5e0035a 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 c23ae761e..4f9dd992a 100644
+index 4d00b141b..eb307395d 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 {
@@ -68,10 +68,10 @@ index c23ae761e..4f9dd992a 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 ee5c8ece2..17f69f028 100644
+index be78cb64f..c763277d3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -429,6 +429,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -428,6 +428,36 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(MapView map);
  
@@ -109,5 +109,5 @@ index ee5c8ece2..17f69f028 100644
       * Forces an update of the player's entire inventory.
       *
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch
index 18e46e88e..6942ebdfd 100644
--- a/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 53eebe4bef4140a3774f3f7b6033f0ff87595848 Mon Sep 17 00:00:00 2001
+From 220b260a9a931229d3cb17bfa979d10fa05e0787 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -369,7 +369,7 @@ index 000000000..3c2b63db4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 17f69f028..a84c6991e 100644
+index c763277d3..95d686c6f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -380,7 +380,7 @@ index 17f69f028..a84c6991e 100644
  import org.bukkit.Achievement;
  import org.bukkit.ChatColor;
  import org.bukkit.Effect;
-@@ -457,6 +458,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -456,6 +457,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
@@ -498,5 +498,5 @@ index 17f69f028..a84c6991e 100644
  
      /**
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0016-Add-exception-reporting-event.patch b/Spigot-API-Patches/0016-Add-exception-reporting-event.patch
index f6c81d386..c271b609f 100644
--- a/Spigot-API-Patches/0016-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0016-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 32c9f326e8bbb099b3143bd59e2c2cc1f4c850a4 Mon Sep 17 00:00:00 2001
+From 46d9ff00a27f92c65eb4d40037300c5f3fbc394c 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
 new file mode 100644
-index 00000000..4109454a
+index 000000000..4109454a3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
 @@ -0,0 +1,37 @@
@@ -49,7 +49,7 @@ index 00000000..4109454a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
 new file mode 100644
-index 00000000..6fb39af0
+index 000000000..6fb39af04
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
 @@ -0,0 +1,64 @@
@@ -119,7 +119,7 @@ index 00000000..6fb39af0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
 new file mode 100644
-index 00000000..410b2413
+index 000000000..410b24139
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
 @@ -0,0 +1,52 @@
@@ -177,7 +177,7 @@ index 00000000..410b2413
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
 new file mode 100644
-index 00000000..c06ea394
+index 000000000..c06ea3942
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
 @@ -0,0 +1,23 @@
@@ -206,7 +206,7 @@ index 00000000..c06ea394
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
 new file mode 100644
-index 00000000..e762ed0d
+index 000000000..e762ed0db
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
 @@ -0,0 +1,35 @@
@@ -247,7 +247,7 @@ index 00000000..e762ed0d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
 new file mode 100644
-index 00000000..f016ba3b
+index 000000000..f016ba3b1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
 @@ -0,0 +1,20 @@
@@ -274,7 +274,7 @@ index 00000000..f016ba3b
 \ No newline at end of file
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
 new file mode 100644
-index 00000000..6defac28
+index 000000000..6defac287
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
 @@ -0,0 +1,38 @@
@@ -318,7 +318,7 @@ index 00000000..6defac28
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
 new file mode 100644
-index 00000000..89e13252
+index 000000000..89e132525
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
 @@ -0,0 +1,64 @@
@@ -388,7 +388,7 @@ index 00000000..89e13252
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
 new file mode 100644
-index 00000000..2d0b2d4a
+index 000000000..2d0b2d4a9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
 @@ -0,0 +1,37 @@
@@ -431,7 +431,7 @@ index 00000000..2d0b2d4a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
 new file mode 100644
-index 00000000..5582999f
+index 000000000..5582999fe
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
 @@ -0,0 +1,22 @@
@@ -458,12 +458,12 @@ index 00000000..5582999f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 38130cc3..75dfa95e 100644
+index 43e52a77a..65ad78c48 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;
+@@ -9,6 +9,9 @@ import java.util.Iterator;
+ import java.util.List;
  import java.util.Map;
- import java.util.regex.Pattern;
  
 +import com.destroystokyo.paper.event.server.ServerExceptionEvent;
 +import com.destroystokyo.paper.exception.ServerCommandException;
@@ -471,7 +471,7 @@ index 38130cc3..75dfa95e 100644
  import org.apache.commons.lang.Validate;
  import org.bukkit.Location;
  import org.bukkit.Server;
-@@ -147,11 +150,14 @@ public class SimpleCommandMap implements CommandMap {
+@@ -146,11 +149,14 @@ public class SimpleCommandMap implements CommandMap {
              target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
              target.timings.stopTiming(); // Spigot
          } catch (CommandException ex) {
@@ -487,7 +487,7 @@ index 38130cc3..75dfa95e 100644
          }
  
          // return true as command was handled
-@@ -223,7 +229,9 @@ public class SimpleCommandMap implements CommandMap {
+@@ -222,7 +228,9 @@ public class SimpleCommandMap implements CommandMap {
          } catch (CommandException ex) {
              throw ex;
          } catch (Throwable ex) {
@@ -499,7 +499,7 @@ index 38130cc3..75dfa95e 100644
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 80c152ba..b88f31ca 100644
+index 80c152ba9..b88f31ca2 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;
diff --git a/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 164d4b3de..c88dd7c09 100644
--- a/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@@ -1,4 +1,4 @@
-From 74ed2b2b57a6ce4a0c9b62d594d8b27035b2e2ab Mon Sep 17 00:00:00 2001
+From 8756efbf55d92fb7e4272f3c818cd35f4778d920 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 13:05:59 -0800
 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
@@ -40,10 +40,10 @@ index abf68a2c7..fcb03b830 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a84c6991e..f22f6a881 100644
+index 95d686c6f..d6ad55468 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -436,6 +436,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -435,6 +435,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param component the components to send
       */
@@ -51,7 +51,7 @@ index a84c6991e..f22f6a881 100644
      public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
          spigot().sendMessage(component);
      }
-@@ -445,6 +446,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -444,6 +445,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param components the components to send
       */
@@ -60,5 +60,5 @@ index a84c6991e..f22f6a881 100644
          spigot().sendMessage(components);
      }
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index b0da930f4..092f54b67 100644
--- a/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,14 +1,14 @@
-From 94390b309f18a31512191e9599c08a2cdf746191 Mon Sep 17 00:00:00 2001
+From 6608ee077047ceaa21424db91fcc3140555ac72c Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ed1d5064..ed6463c6 100644
+index 8cf98673d..f67711fd7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -454,4 +454,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -453,4 +453,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @return collision status
       */
      boolean isCollidable();
diff --git a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
index 0386cee12..2117972e2 100644
--- a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 5ac595ea87b0142696e012f6ee13638ebda9ac26 Mon Sep 17 00:00:00 2001
+From 7d5bb565021f2fe65c31e71f849bdf882a0d72a4 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f22f6a881..972adf9cb 100644
+index d6ad55468..9011c690d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1243,7 +1243,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1242,7 +1242,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index f22f6a881..972adf9cb 100644
      public void setResourcePack(String url);
  
      /**
-@@ -1654,6 +1656,60 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1665,6 +1667,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setViewDistance(int viewDistance);
  
diff --git a/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch
index 4201deae2..d3f1e2e96 100644
--- a/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,14 +1,14 @@
-From 8121678797e7b682fc53643ab34992d1aeacba8d Mon Sep 17 00:00:00 2001
+From 230d52bcaba8bbb8dafe803bb5fb6b26554abb1e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-index 1dd50c56..74fc12e9 100644
+index 976b80b7e..a5ac3edf3 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-@@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
+@@ -12,12 +12,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
      private boolean cancelled;
      private double amount;
      private final RegainReason regainReason;
@@ -41,5 +41,5 @@ index 1dd50c56..74fc12e9 100644
      /**
       * Gets the amount of regained health
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
index 145afe8ab..d0cd4e80d 100644
--- a/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 2e4bd921ec9d8b9da7b6bdd24ff257a3f7859f8b Mon Sep 17 00:00:00 2001
+From 667e0445be4fd373482c993003ed3d3bbb2b8f45 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,7 +6,7 @@ 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 438e141d..e4e9c8f9 100644
+index 438e141d1..e4e9c8f99 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 {
@@ -26,7 +26,7 @@ index 438e141d..e4e9c8f9 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 2f515d2a..678ef158 100644
+index 2f515d2ac..678ef1589 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 {
@@ -37,7 +37,7 @@ index 2f515d2a..678ef158 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 30d60247..938959aa 100644
+index 30d60247e..938959aa5 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,10 +55,10 @@ index 30d60247..938959aa 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 75dfa95e..afc0774b 100644
+index 65ad78c48..41e95692e 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -280,4 +280,10 @@ public class SimpleCommandMap implements CommandMap {
+@@ -279,4 +279,10 @@ public class SimpleCommandMap implements CommandMap {
              }
          }
      }
@@ -70,7 +70,7 @@ index 75dfa95e..afc0774b 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 f331a442..a977045d 100644
+index f331a4423..a977045de 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 {
diff --git a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
index 404173164..e01025041 100644
--- a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
@@ -1,14 +1,14 @@
-From f541b6e9582d670d817b710d901685d8ce7d9125 Mon Sep 17 00:00:00 2001
+From 77e4331a608f29656cddeb6ec5b151d6a4c96da8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 972adf9cb..1d703e7c6 100644
+index 9011c690d..4b0caae51 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -431,6 +431,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -430,6 +430,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(MapView map);
  
      // Paper start
@@ -35,7 +35,7 @@ index 972adf9cb..1d703e7c6 100644
      /**
       * Sends the component to the player
       *
-@@ -454,9 +474,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -453,9 +473,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
@@ -47,7 +47,7 @@ index 972adf9cb..1d703e7c6 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1793,9 +1815,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1804,9 +1826,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index 972adf9cb..1d703e7c6 100644
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1803,9 +1827,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1814,9 +1838,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
diff --git a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
index 2fe7018ac..f81736bd7 100644
--- a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -1,4 +1,4 @@
-From ed11ef22d0208c77b50c740e7fd69c217d3688ba Mon Sep 17 00:00:00 2001
+From 38f055fc91d837187231311389f933b0c48b0fed 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 43239f84..fe8d3468 100644
+index 43239f844..fe8d34685 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 43239f84..fe8d3468 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 06bcee03..849ad2cb 100644
+index 06bcee03b..849ad2cbb 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 06bcee03..849ad2cb 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 10757454..6d5410ea 100644
+index 107574546..6d5410eab 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 10757454..6d5410ea 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index 9a569d3a..8c5efd17 100644
+index 9a569d3a3..8c5efd17e 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 9a569d3a..8c5efd17 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 98af0563..ec6890ae 100644
+index 98af0563c..ec6890ae6 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 98af0563..ec6890ae 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
-index cfce8fa5..8660070b 100644
+index cfce8fa57..8660070bb 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,10 +140,10 @@ index cfce8fa5..8660070b 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 99353714..e848ab5b 100644
+index 4b0caae51..45690a2fa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -446,7 +446,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -445,7 +445,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -152,7 +152,7 @@ index 99353714..e848ab5b 100644
       * @param message The message to send
       */
      public void sendActionBar(char alternateChar, String message);
-@@ -513,6 +513,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -512,6 +512,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -160,7 +160,7 @@ index 99353714..e848ab5b 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -521,6 +522,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -520,6 +521,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -168,7 +168,7 @@ index 99353714..e848ab5b 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -529,6 +531,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -528,6 +530,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -176,7 +176,7 @@ index 99353714..e848ab5b 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -537,6 +540,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -536,6 +539,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -184,7 +184,7 @@ index 99353714..e848ab5b 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -1457,6 +1461,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1456,6 +1460,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -192,7 +192,7 @@ index 99353714..e848ab5b 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1472,6 +1477,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1471,6 +1476,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -200,7 +200,7 @@ index 99353714..e848ab5b 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1521,6 +1527,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1520,6 +1526,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -208,7 +208,7 @@ index 99353714..e848ab5b 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1540,6 +1547,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1539,6 +1546,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -216,7 +216,7 @@ index 99353714..e848ab5b 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1595,6 +1603,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1594,6 +1602,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -224,7 +224,7 @@ index 99353714..e848ab5b 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1616,6 +1625,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1615,6 +1624,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -233,7 +233,7 @@ index 99353714..e848ab5b 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 2a02ab85..e33d00b3 100644
+index 2a02ab855..e33d00b30 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 2a02ab85..e33d00b3 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index cf53ea22..62923379 100644
+index cf53ea22f..629233796 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,7 +266,7 @@ index cf53ea22..62923379 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 de4fb37f..f1de2af6 100644
+index de4fb37f3..f1de2af6e 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 {
@@ -286,7 +286,7 @@ index de4fb37f..f1de2af6 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 762c43d6..ec2b8b8e 100644
+index 762c43d69..ec2b8b8ed 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 762c43d6..ec2b8b8e 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
-index c8e68570..45431b36 100644
+index c8e68570f..45431b360 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 c8e68570..45431b36 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 1413b361..b4a8051c 100644
+index 1413b361b..b4a8051cc 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 1413b361..b4a8051c 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
-index 40f8d12b..33d19228 100644
+index 40f8d12b9..33d192287 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 40f8d12b..33d19228 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 034421a7..f1a54c23 100644
+index 034421a76..f1a54c23c 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 034421a7..f1a54c23 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index ab71f3c3..358ea386 100644
+index ab71f3c31..358ea386b 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 {
diff --git a/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
index df212c31b..a9e04486c 100644
--- a/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
@@ -1,14 +1,14 @@
-From 4fc8923239da47d511fbb1e243105c0144a99bee Mon Sep 17 00:00:00 2001
+From 6375ebed57681517bbb310753cd556cecb82843a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:04:51 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 144e432cd..d137d6bf2 100644
+index 71e52b486..36a8e8906 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -258,6 +258,24 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
+@@ -257,6 +257,24 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getExpToLevel();
  
@@ -34,5 +34,5 @@ index 144e432cd..d137d6bf2 100644
       * Discover a recipe for this player such that it has not already been
       * discovered. This method will add the key's associated recipe to the
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0064-LivingEntity-setKiller.patch b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch
index 376e0e3eb..17ac52097 100644
--- a/Spigot-API-Patches/0064-LivingEntity-setKiller.patch
+++ b/Spigot-API-Patches/0064-LivingEntity-setKiller.patch
@@ -1,14 +1,14 @@
-From 9c0208e3612a2a5a623ace987c4e420f500e2bd1 Mon Sep 17 00:00:00 2001
+From b267465c0b09938121dd4582c5a62ae80d90da48 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:43 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ed6463c6..7770da71 100644
+index f67711fd7..3f93b70c1 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -18,6 +18,8 @@ import org.bukkit.projectiles.ProjectileSource;
+@@ -17,6 +17,8 @@ import org.bukkit.projectiles.ProjectileSource;
  import org.bukkit.util.RayTraceResult;
  import org.bukkit.util.Vector;
  
@@ -17,7 +17,7 @@ index ed6463c6..7770da71 100644
  /**
   * Represents a living entity, such as a monster or player
   */
-@@ -240,6 +242,15 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -239,6 +241,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      public Player getKiller();
  
diff --git a/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch
index 2faa23a84..3f482c9c3 100644
--- a/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch
@@ -1,4 +1,4 @@
-From daf70a992ec9bf7b009aeda61cca417d7930e989 Mon Sep 17 00:00:00 2001
+From 082f9d34462d71296bfea52d7a17efc3dd2b547b Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:13 +0200
 Subject: [PATCH] Handle plugin prefixes in implementation logging
@@ -17,10 +17,10 @@ The implementation should handle plugin prefixes by displaying
 logger names when appropriate.
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 16b1eb37..0abad9ad 100644
+index 678878064..a81dae439 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-@@ -50,7 +50,7 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
      private boolean naggable = true;
      private FileConfiguration newConfig = null;
      private File configFile = null;
@@ -29,7 +29,7 @@ index 16b1eb37..0abad9ad 100644
  
      public JavaPlugin() {
          final ClassLoader classLoader = this.getClass().getClassLoader();
-@@ -277,7 +277,8 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -267,7 +267,8 @@ public abstract class JavaPlugin extends PluginBase {
          this.dataFolder = dataFolder;
          this.classLoader = classLoader;
          this.configFile = new File(dataFolder, "config.yml");
@@ -40,5 +40,5 @@ index 16b1eb37..0abad9ad 100644
  
      /**
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index 5700893ba..40e39b534 100644
--- a/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@@ -1,4 +1,4 @@
-From 4238aee0bc9d32a0a9cb3b490e0ece722759fedb Mon Sep 17 00:00:00 2001
+From 62be624eee349e6f2381582d772249d57a485fc7 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 19:41:20 +0200
 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@@ -14,7 +14,7 @@ parent of the plugin logger to avoid this.
 
 diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 new file mode 100644
-index 00000000..d052b2f5
+index 000000000..d052b2f55
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 @@ -0,0 +1,39 @@
@@ -58,10 +58,10 @@ index 00000000..d052b2f5
 +
 +}
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 0abad9ad..93fa3493 100644
+index a81dae439..15f22ade2 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-@@ -50,7 +50,7 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
      private boolean naggable = true;
      private FileConfiguration newConfig = null;
      private File configFile = null;
@@ -70,7 +70,7 @@ index 0abad9ad..93fa3493 100644
  
      public JavaPlugin() {
          final ClassLoader classLoader = this.getClass().getClassLoader();
-@@ -277,8 +277,11 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -267,8 +267,11 @@ public abstract class JavaPlugin extends PluginBase {
          this.dataFolder = dataFolder;
          this.classLoader = classLoader;
          this.configFile = new File(dataFolder, "config.yml");
@@ -85,7 +85,7 @@ index 0abad9ad..93fa3493 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 44093af2..ab79b71b 100644
+index 44093af29..ab79b71bf 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -36,6 +36,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -114,5 +114,5 @@ index 44093af2..ab79b71b 100644
      }
  }
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
index 3ab65581b..4c239c06b 100644
--- a/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 7505bac8503213c06c401a6196dd1c870060ae75 Mon Sep 17 00:00:00 2001
+From 80fa06b6f43663f3373953a11477ae13e07b0d91 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to:
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 new file mode 100644
-index 00000000..9072e384
+index 000000000..9072e384d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 @@ -0,0 +1,39 @@
@@ -55,18 +55,18 @@ index 00000000..9072e384
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 47a12d71..362467e5 100644
+index 45690a2fa..7434203a4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -31,7 +31,7 @@ import org.bukkit.scoreboard.Scoreboard;
+@@ -30,7 +30,7 @@ import org.bukkit.scoreboard.Scoreboard;
  /**
   * Represents a player, connected or not
   */
--public interface Player extends HumanEntity, Conversable, CommandSender, OfflinePlayer, PluginMessageRecipient {
-+public interface Player extends HumanEntity, Conversable, CommandSender, OfflinePlayer, PluginMessageRecipient, com.destroystokyo.paper.network.NetworkClient { // Paper - Extend NetworkClient
+-public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient {
++public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, com.destroystokyo.paper.network.NetworkClient { // Paper - Extend NetworkClient
  
      /**
       * Gets the "friendly" name to display of this player. This may include
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
index 1681f6c1e..5ecff37c1 100644
--- a/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 2b5c8b0903e0f3215a5e5e1aa3aa29fff18e5cf4 Mon Sep 17 00:00:00 2001
+From 31449a899a71af0d14ad3781233e26ed634f220a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:38:07 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,10 +10,10 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2e71054d..fd359fe0 100644
+index 7434203a4..575791cf7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -953,12 +953,33 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -952,12 +952,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
@@ -49,5 +49,5 @@ index 2e71054d..fd359fe0 100644
      /**
       * Gives the player the amount of experience levels specified. Levels can
 -- 
-2.16.1.windows.4
+2.19.1
 
diff --git a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
index 760b410d1..be288b43c 100644
--- a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From dfa969fa41263825a69021b0c8cfea7fd78590e8 Mon Sep 17 00:00:00 2001
+From 493eccb7661a318e36ec70b8fe8162a2a136db14 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 495bac991..ec37e3e35 100644
+index 575791cf7..6f87abb91 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index 495bac991..ec37e3e35 100644
  import org.bukkit.Achievement;
  import org.bukkit.ChatColor;
  import org.bukkit.Effect;
-@@ -1761,6 +1762,19 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1772,6 +1773,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
diff --git a/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
index 31f909c4f..69b75bf35 100644
--- a/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
@@ -1,14 +1,14 @@
-From bb4320c8362db25900dd40bdcbe30d2d2b9500f0 Mon Sep 17 00:00:00 2001
+From c0769b04ea413231d16ba24c0c274854a5050851 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:28:43 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index d137d6bf2..3590149a8 100644
+index 36a8e8906..ca789867d 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -388,4 +388,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
+@@ -387,4 +387,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      @Deprecated
      public void setShoulderEntityRight(Entity entity);
@@ -23,5 +23,5 @@ index d137d6bf2..3590149a8 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0091-Add-version-history-to-version-command.patch b/Spigot-API-Patches/0091-Add-version-history-to-version-command.patch
index 4077b0b10..bfb4c5dd4 100644
--- a/Spigot-API-Patches/0091-Add-version-history-to-version-command.patch
+++ b/Spigot-API-Patches/0091-Add-version-history-to-version-command.patch
@@ -1,4 +1,4 @@
-From ec7ab0fda0b8db766c75b88b151228cd8a7f99e6 Mon Sep 17 00:00:00 2001
+From 34043f0447c8342e21d4a3e64a0991a7cb00a46c Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:37:52 -0600
 Subject: [PATCH] Add version history to version command
@@ -6,7 +6,7 @@ Subject: [PATCH] Add version history to version command
 
 diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
 new file mode 100644
-index 00000000..1daaca2f
+index 000000000..1daaca2fd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
 @@ -0,0 +1,143 @@
@@ -154,10 +154,10 @@ index 00000000..1daaca2f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 044361af..c45faf4c 100644
+index f38f68640..5cebb2454 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -31,6 +31,7 @@ import org.json.simple.parser.ParseException;
+@@ -29,6 +29,7 @@ import org.json.simple.parser.ParseException;
  // Paper start
  import java.io.InputStreamReader;
  import java.net.HttpURLConnection;
@@ -165,7 +165,7 @@ index 044361af..c45faf4c 100644
  // Paper end
  
  public class VersionCommand extends BukkitCommand {
-@@ -49,6 +50,7 @@ public class VersionCommand extends BukkitCommand {
+@@ -47,6 +48,7 @@ public class VersionCommand extends BukkitCommand {
  
          if (args.length == 0) {
              sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
@@ -173,7 +173,7 @@ index 044361af..c45faf4c 100644
              sendVersion(sender);
          } else {
              StringBuilder name = new StringBuilder();
-@@ -85,6 +87,22 @@ public class VersionCommand extends BukkitCommand {
+@@ -83,6 +85,22 @@ public class VersionCommand extends BukkitCommand {
          return true;
      }
  
@@ -197,5 +197,5 @@ index 044361af..c45faf4c 100644
          PluginDescriptionFile desc = plugin.getDescription();
          sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
index d4f2470e3..f4370de74 100644
--- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
@@ -1,4 +1,4 @@
-From b62098168d7c8280b83549b64b31aa2071042200 Mon Sep 17 00:00:00 2001
+From f8d4bb2005c7020b83b96410fc20803a644a6c3a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
@@ -8,10 +8,10 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 3ab2e4c7b..8daf2ddc7 100644
+index d82790717..658eac264 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -40,6 +40,56 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -39,6 +39,56 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * @return true if banned, otherwise false
       */
      public boolean isBanned();
@@ -43,7 +43,7 @@ index 3ab2e4c7b..8daf2ddc7 100644
 +     * @param expires When to expire the ban
 +     * @return Ban Entry
 +     */
-+    public default BanEntry banPlayer(String reason, Date expires) {
++    public default BanEntry banPlayer(String reason, java.util.Date expires) {
 +        return banPlayer(reason, expires, null);
 +    }
 +
@@ -54,10 +54,10 @@ index 3ab2e4c7b..8daf2ddc7 100644
 +     * @param source Source of the ban or null for default
 +     * @return Ban Entry
 +     */
-+    public default BanEntry banPlayer(String reason, Date expires, String source) {
++    public default BanEntry banPlayer(String reason, java.util.Date expires, String source) {
 +        return banPlayer(reason, expires, source, true);
 +    }
-+    public default BanEntry banPlayer(String reason, Date expires, String source, boolean kickIfOnline) {
++    public default BanEntry banPlayer(String reason, java.util.Date expires, String source, boolean kickIfOnline) {
 +        BanEntry banEntry = Bukkit.getServer().getBanList(BanList.Type.NAME).addBan(getName(), reason, expires, source);
 +        if (kickIfOnline && isOnline()) {
 +            getPlayer().kickPlayer(reason);
@@ -69,7 +69,7 @@ index 3ab2e4c7b..8daf2ddc7 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4020cee58..6da68835d 100644
+index 6f87abb91..bd8f8ff10 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,10 +1,14 @@
@@ -87,7 +87,7 @@ index 4020cee58..6da68835d 100644
  import org.bukkit.ChatColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -432,6 +436,139 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -431,6 +435,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(MapView map);
  
      // Paper start
@@ -228,5 +228,5 @@ index 4020cee58..6da68835d 100644
      /**
       * Sends an Action Bar message to the client.
 -- 
-2.18.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
index 1a5cffe83..ea6cf1e18 100644
--- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
@@ -1,14 +1,14 @@
-From bffcdf28d7682a5c6c9094d680b691a7d8d71656 Mon Sep 17 00:00:00 2001
+From 3eca0e7cd62c270ed2103ccb6aeaf42b77182278 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 7770da71..3191aeca 100644
+index 3f93b70c1..99845e67a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -479,5 +479,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -478,5 +478,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param arrows Number of arrows to stick in this entity
       */
      void setArrowsStuck(int arrows);
diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
index 46d965a75..3669b0665 100644
--- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From fcf363977c7c1a57154fbfe638aa85f6480329ba Mon Sep 17 00:00:00 2001
+From d398034fd391fa3cd12b5d4427d0d92502b08c79 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 3191aeca..f4f60de2 100644
+index 99845e67a..e3bc04e1c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -12,6 +12,7 @@ import org.bukkit.World;
+@@ -11,6 +11,7 @@ import org.bukkit.World;
  import org.bukkit.attribute.Attributable;
  import org.bukkit.block.Block;
  import org.bukkit.inventory.EntityEquipment;
@@ -17,7 +17,7 @@ index 3191aeca..f4f60de2 100644
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -493,5 +494,31 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -492,5 +493,31 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);
diff --git a/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
index 828226da0..ae04b1f78 100644
--- a/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From c0fe423e87026d3311fa8cfb5cd1e07e97c420b3 Mon Sep 17 00:00:00 2001
+From e555fe63f21a161afa93b949759f1a0ed9dbea57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:52:52 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 3590149a8..972c8f970 100644
+index ca789867d..d4b3caebd 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -139,6 +139,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
+@@ -138,6 +138,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public void closeInventory();
  
@@ -90,5 +90,5 @@ index 19889b278..e6e45b936 100644
  
      /**
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch
index 6765c7b87..2625e29cb 100644
--- a/Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From b5c238367804b804eed5fd262a61d3b9eaf8128d Mon Sep 17 00:00:00 2001
+From f7250d46b04c8d3ea217087c674301f006f92287 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:13:53 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 new file mode 100644
-index 00000000..fe43d955
+index 000000000..fe43d9557
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 @@ -0,0 +1,50 @@
@@ -61,10 +61,10 @@ index 00000000..fe43d955
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f4f60de2..c3c31f50 100644
+index e3bc04e1c..bd47e7209 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -79,6 +79,77 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -78,6 +78,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      public Block getTargetBlock(Set<Material> transparent, int maxDistance);
  
diff --git a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
index ab1c825a1..bffeacfee 100644
--- a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,14 +1,14 @@
-From b86384c308d48374aa7dd641b03ed8b8b6594745 Mon Sep 17 00:00:00 2001
+From ddd94060db4fce582cb293b2a7d01b4cdeae9451 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 571a88e62..ba5096ca5 100644
+index bd8f8ff10..f10a9e958 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1912,6 +1912,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1923,6 +1923,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(PlayerProfile profile);
diff --git a/Spigot-API-Patches/0160-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0160-Add-LivingEntity-getTargetEntity.patch
index c62accdaa..e158bdcd8 100644
--- a/Spigot-API-Patches/0160-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-API-Patches/0160-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From ae10d61250d9ca7880f64c2a8923ea699696102d Mon Sep 17 00:00:00 2001
+From 4b568e4b100ab191c511089dd45114dee7e1c7b8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:32:53 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 new file mode 100644
-index 00000000..5df8eed2
+index 000000000..5df8eed23
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 @@ -0,0 +1,35 @@
@@ -46,10 +46,10 @@ index 00000000..5df8eed2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index c3c31f50..263a94a7 100644
+index bd47e7209..34a8fe3f7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -148,6 +148,50 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -147,6 +147,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      @Nullable
      public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 3da0367b6..12fff8af7 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 155c59138feb1470d84c679f22c0d72c3c2874ca Mon Sep 17 00:00:00 2001
+From 82b7bfef7310f5b69225d5948efabdf7a547d7b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..a6292f1d7
+index 0000000000..a6292f1d74
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,132 @@
@@ -144,7 +144,7 @@ index 000000000..a6292f1d7
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 000000000..145cb274b
+index 0000000000..145cb274b0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,104 @@
@@ -253,7 +253,7 @@ index 000000000..145cb274b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 87a7b6980..2f17e5219 100644
+index 87a7b69800..2f17e5219c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -297,7 +297,7 @@ index 87a7b6980..2f17e5219 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index dfcb285df..bb8b450ac 100644
+index dfcb285df5..bb8b450ac4 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -23,6 +23,15 @@ public class Block implements IMaterial {
@@ -317,7 +317,7 @@ index dfcb285df..bb8b450ac 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e634325ba..68ba638c6 100644
+index e634325ba8..68ba638c6b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -842,6 +842,7 @@ public class Chunk implements IChunkAccess {
@@ -337,7 +337,7 @@ index e634325ba..68ba638c6 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 85a065f03..4b8b77710 100644
+index 85a065f039..4b8b77710b 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -357,7 +357,7 @@ index 85a065f03..4b8b77710 100644
  
          return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5819e86f3..7239f5437 100644
+index 5819e86f32..7239f54377 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -90,7 +90,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -398,7 +398,7 @@ index 5819e86f3..7239f5437 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 71c0e069a..e53e40e43 100644
+index 71c0e069a6..e53e40e439 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -445,7 +445,7 @@ index 71c0e069a..e53e40e43 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index b7cdc495a..8b9b076de 100644
+index b7cdc495a3..8b9b076ded 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -13,12 +13,22 @@ public class CustomFunction {
@@ -472,7 +472,7 @@ index b7cdc495a..8b9b076de 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index 4d7e15179..40ff72f72 100644
+index 4d7e151793..40ff72f725 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -109,7 +109,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@@ -485,7 +485,7 @@ index 4d7e15179..40ff72f72 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7f56df0b6..b488178d5 100644
+index 7f56df0b66..b488178d5b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
@@ -538,7 +538,7 @@ index 7f56df0b6..b488178d5 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fde9d4d51..c765b5cf3 100644
+index fde9d4d517..c765b5cf32 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -577,7 +577,7 @@ index fde9d4d51..c765b5cf3 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 03cd1db36..dec9d2d08 100644
+index 03cd1db365..dec9d2d08c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -653,7 +653,7 @@ index 03cd1db36..dec9d2d08 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index ae31935c4..70c9b1f50 100644
+index ae31935c48..70c9b1f50c 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -168,7 +168,7 @@ public class EntityTracker {
@@ -684,7 +684,7 @@ index ae31935c4..70c9b1f50 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bdbd24b6b..2d812b024 100644
+index bdbd24b6b5..2d812b0242 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -837,7 +837,7 @@ index bdbd24b6b..2d812b024 100644
          this.methodProfiler.e();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 15194bd63..12a8fec29 100644
+index 15194bd635..12a8fec29a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -931,7 +931,7 @@ index 15194bd63..12a8fec29 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5646f28a8..e6bb2506c 100644
+index 5646f28a8a..e6bb2506cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -59,6 +59,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -986,7 +986,7 @@ index 5646f28a8..e6bb2506c 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index 616797dc6..3a5daf670 100644
+index 616797dc6e..3a5daf6705 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,10 +1,16 @@
@@ -1007,7 +1007,7 @@ index 616797dc6..3a5daf670 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 393c4c118..4d800957a 100644
+index 393c4c118f..4d800957ae 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1031,7 +1031,7 @@ index 393c4c118..4d800957a 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index a07895935..ee5c2421b 100644
+index a07895935e..ee5c2421bb 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
@@ -1085,7 +1085,7 @@ index a07895935..ee5c2421b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index c69209497..68ac014aa 100644
+index c69209497b..68ac014aab 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1105,7 +1105,7 @@ index c69209497..68ac014aa 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 433d0ad96..759fa98c4 100644
+index 433d0ad96a..759fa98c45 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1220,7 +1220,7 @@ index 433d0ad96..759fa98c4 100644
  
      public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 74a61f300..d10fb980d 100644
+index 74a61f300c..d10fb980dd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1327,7 +1327,7 @@ index 74a61f300..d10fb980d 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6dd4e18e9..b34a3564c 100644
+index 6dd4e18e9a..b34a3564c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1896,12 +1896,31 @@ public final class CraftServer implements Server {
@@ -1364,7 +1364,7 @@ index 6dd4e18e9..b34a3564c 100644
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 666d1eb9e..000000000
+index 666d1eb9e6..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,175 +0,0 @@
@@ -1544,7 +1544,7 @@ index 666d1eb9e..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 413dd35f0..52a8c48fa 100644
+index 413dd35f06..52a8c48fa4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1580,10 +1580,10 @@ index 413dd35f0..52a8c48fa 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9f78f2c4a..832d2de47 100644
+index b1a5937b1e..b5afd5d1c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1715,6 +1715,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1720,6 +1720,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -1599,7 +1599,7 @@ index 9f78f2c4a..832d2de47 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index f11bd7545..93b9134d6 100644
+index f11bd7545f..93b9134d6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -1675,7 +1675,7 @@ index f11bd7545..93b9134d6 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 7e7ce9a81..46029ce24 100644
+index 7e7ce9a81b..46029ce246 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1757,7 +1757,7 @@ index 7e7ce9a81..46029ce24 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b7..3d90b3426 100644
+index e52ef47b78..3d90b34268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1769,7 +1769,7 @@ index e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c1071c92e..a99c0cea0 100644
+index c1071c92ee..a99c0cea0f 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 76472cd27..4abff1dc8 100644
--- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From 68a9bbb09750538538bbcd3188803b142ba3f4e0 Mon Sep 17 00:00:00 2001
+From 900dfb0128fba638e3ef37e1042ff2056ef776de Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -6,10 +6,10 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index b64cac252..cc333de50 100644
+index b64cac2523..526f3af516 100644
 --- a/src/main/java/net/minecraft/server/EULA.java
 +++ b/src/main/java/net/minecraft/server/EULA.java
-@@ -49,13 +49,12 @@ public class EULA {
+@@ -49,7 +49,7 @@ public class EULA {
                  Properties properties = new Properties();
                  fileoutputstream = new FileOutputStream(this.b);
                  properties.setProperty("eula", "false");
@@ -18,14 +18,8 @@ index b64cac252..cc333de50 100644
              } catch (Exception exception) {
                  a.warn("Failed to save {}", this.b, exception);
              } finally {
-                 IOUtils.closeQuietly(fileoutputstream);
-             }
--
-         }
-     }
- }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2d812b024..8a6589d95 100644
+index 2d812b0242..8a6589d95d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1213,7 +1213,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -38,7 +32,7 @@ index 2d812b024..8a6589d95 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 b34a3564c..3a8e3ee81 100644
+index b34a3564c2..3a8e3ee818 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -159,7 +159,7 @@ import org.bukkit.event.server.TabCompleteEvent;
@@ -51,10 +45,10 @@ index b34a3564c..3a8e3ee81 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 31c7404c3..1ce1a2435 100644
+index 28a34b54e0..1ce1a2435d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -200,13 +200,24 @@ public class Main {
+@@ -200,12 +200,25 @@ public class Main {
                      deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
                          System.err.println("*** Error, this build is outdated ***");
@@ -65,7 +59,6 @@ index 31c7404c3..1ce1a2435 100644
                      }
                  }
  
--                System.err.println("*** WARNING: This is a development build. It is not meant for production server usage! Please keep backups and update frequently.");
 +                // Paper start - Log Java and OS versioning to help with debugging plugin issues
 +                java.lang.management.RuntimeMXBean runtimeMX = java.lang.management.ManagementFactory.getRuntimeMXBean();
 +                java.lang.management.OperatingSystemMXBean osMX = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
@@ -78,11 +71,12 @@ index 31c7404c3..1ce1a2435 100644
 +                    System.out.println("Unable to read system info");
 +                }
 +                // Paper end
- 
++
                  System.out.println("Loading libraries, please wait...");
                  MinecraftServer.main(options);
+             } catch (Throwable t) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 94a3d4237..91b8aa6a1 100644
+index 94a3d4237d..91b8aa6a16 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
diff --git a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
index d1ad9fef8..a5f12dbfa 100644
--- a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
@@ -1,14 +1,14 @@
-From 4e28941b1ac27f9fd6a7f6ad68d93e60fa976fd9 Mon Sep 17 00:00:00 2001
+From 6c2b13c9d3cc34962b70aba9cf1beebfe17105e2 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 9996c7f77b..89f3d17f24 100644
+index 5c1f7d72a5..6b58f632bd 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -72,6 +72,9 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -71,6 +71,9 @@ public abstract class EntityHuman extends EntityLiving {
      private final ItemCooldown ce;
      @Nullable
      public EntityFishingHook hookedFish;
@@ -19,7 +19,7 @@ index 9996c7f77b..89f3d17f24 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 9e95ede7fe..6f5f3f8cd0 100644
+index 3a57315da9..c87304d477 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -620,7 +620,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -45,7 +45,7 @@ index 850569f6b7..f958bd5bac 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index cbdd2431fd..9e24b77ad1 100644
+index 8b87146885..601d4c62d4 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -37,7 +37,7 @@ public final class SpawnerCreature {
@@ -58,7 +58,7 @@ index cbdd2431fd..9e24b77ad1 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6a72cfe14e..5dfa0fdec3 100644
+index 9251e0c83c..739e19bb14 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -34,6 +34,7 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData;
@@ -79,10 +79,10 @@ index 6a72cfe14e..5dfa0fdec3 100644
  
                  if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b8bdcb6b74..91e585048a 100644
+index b5afd5d1c7..47da00948b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1628,7 +1628,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1633,7 +1633,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
@@ -103,5 +103,5 @@ index b8bdcb6b74..91e585048a 100644
      @Override
      public void updateCommands() {
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0029-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
index ceb123762..a55f59408 100644
--- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From dd6c5ececa6159d0c741ed1d5070ba1c65ce9303 Mon Sep 17 00:00:00 2001
+From 41ab545f015675893214f7a9d3649abbc8b78963 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -20,7 +20,7 @@ index 8f6f0288be..5aee23dceb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 09e2859c4a..95ab3d2cda 100644
+index e0215bcdb8..cdf89cfed3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -32,7 +32,7 @@ index 09e2859c4a..95ab3d2cda 100644
      private final RecipeBookServer cy;
      private Vec3D cz;
      private int cA;
-@@ -648,6 +648,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -649,6 +649,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.world.kill(this);
              if (!this.viewingCredits) {
                  this.viewingCredits = true;
@@ -41,5 +41,5 @@ index 09e2859c4a..95ab3d2cda 100644
                  this.cx = true;
              }
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
index 47526e846..0bfbb32cc 100644
--- a/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
@@ -1,14 +1,14 @@
-From fd5b90921efcc1fcbdf8390c356af04e3bda7190 Mon Sep 17 00:00:00 2001
+From baf90d1a6d61697bf6b0d2ad89a714ef689d5ef1 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 89f3d17f2..6c4c19244 100644
+index 6b58f632bd..d245502286 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -75,6 +75,15 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -74,6 +74,15 @@ public abstract class EntityHuman extends EntityLiving {
      // Paper start
      public boolean affectsSpawning = true;
      // Paper end
@@ -25,7 +25,7 @@ index 89f3d17f2..6c4c19244 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 70c9b1f50..0ea639228 100644
+index 70c9b1f50c..0ea6392284 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -200,6 +200,7 @@ public class EntityTracker {
@@ -37,7 +37,7 @@ index 70c9b1f50..0ea639228 100644
          Iterator iterator = this.c.iterator();
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 8478a81f5..5dbd493f4 100644
+index 8478a81f5c..5dbd493f41 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -435,7 +435,7 @@ public class EntityTrackerEntry {
@@ -50,7 +50,7 @@ index 8478a81f5..5dbd493f4 100644
          return d0 >= (double) (-i) && d0 <= (double) i && d1 >= (double) (-i) && d1 <= (double) i && this.tracker.a(entityplayer);
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index d975c2ccf..fb593529e 100644
+index 12a8fec29a..7ca85a56ca 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -35,7 +35,7 @@ public class PlayerChunkMap {
@@ -221,7 +221,7 @@ index d975c2ccf..fb593529e 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 9e24b77ad..50b1175cc 100644
+index 601d4c62d4..b919226bbf 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -44,7 +44,7 @@ public final class SpawnerCreature {
@@ -234,10 +234,10 @@ index 9e24b77ad..50b1175cc 100644
  
                      for (int i1 = -b0; i1 <= b0; ++i1) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8ecef3ff9..3cc16b692 100644
+index 6635f1a4a3..d2ff18cf77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1641,6 +1641,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1646,6 +1646,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
@@ -255,7 +255,7 @@ index 8ecef3ff9..3cc16b692 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1aade75f3..f52de1023 100644
+index a95f93eb76..09df00e94b 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -108,13 +108,13 @@ public class ActivationRange
@@ -276,5 +276,5 @@ index 1aade75f3..f52de1023 100644
              animalBB = player.getBoundingBox().grow( animalActivationRange, 256, animalActivationRange );
              monsterBB = player.getBoundingBox().grow( monsterActivationRange, 256, monsterActivationRange );
 -- 
-2.18.0.windows.1
+2.19.1
 
diff --git a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
index 7d33956a4..6cd24fd72 100644
--- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From ad5a57826bb72f193f38d159b7370ce59a6c7d67 Mon Sep 17 00:00:00 2001
+From 63f74cee412e46e59e862a07cffb35317117d9a2 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -19,7 +19,7 @@ index 40766d81c7..71af3fcfed 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 95ab3d2cda..a279bf9383 100644
+index cdf89cfed3..1f98be261a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -71,6 +71,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -30,7 +30,7 @@ index 95ab3d2cda..a279bf9383 100644
  
      // CraftBukkit start
      public String displayName;
-@@ -334,7 +335,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -335,7 +336,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              --this.noDamageTicks;
          }
  
@@ -45,5 +45,5 @@ index 95ab3d2cda..a279bf9383 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
index 2b9d8de34..95b3d59a1 100644
--- a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From ee25e56e59c6e8eacfd71d261bb54413bf996248 Mon Sep 17 00:00:00 2001
+From 69af610fd6461aa22cadd707614ac16141df6712 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
@@ -22,7 +22,7 @@ index f2e7762d30..e79ab51d29 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 49ea29eecc..031b30e3e3 100644
+index 0c35c94b33..73abc95e41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -128,6 +128,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -36,7 +36,7 @@ index 49ea29eecc..031b30e3e3 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1752,6 +1756,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1757,6 +1761,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          getHandle().server.getCommandDispatcher().a(getHandle());
      }
  
diff --git a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
index 3f4b7a0d0..9d73e9e2d 100644
--- a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From 383d8db44e3749821a3542ef8077f2ae8dd8c639 Mon Sep 17 00:00:00 2001
+From 6a11b70d209501a07255f7ea6dccc1d2d1960bd6 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a279bf9383..a9fbb20f73 100644
+index 1f98be261a..1cafad6bb6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -36,7 +36,7 @@ import org.bukkit.inventory.MainHand;
@@ -17,7 +17,7 @@ index a279bf9383..a9fbb20f73 100644
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
-@@ -1250,12 +1250,19 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1251,13 +1251,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }
@@ -26,6 +26,7 @@ index a279bf9383..a9fbb20f73 100644
              PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(getBukkitEntity(), packetplayinsettings.b());
              this.server.server.getPluginManager().callEvent(event);
          }
+         this.clientViewDistance = packetplayinsettings.b;
          // CraftBukkit end
 +        // Paper start - add PlayerLocaleChangeEvent
 +        // Since the field is initialized to null, this event should always fire the first time the packet is received
@@ -39,10 +40,10 @@ index a279bf9383..a9fbb20f73 100644
          this.ct = packetplayinsettings.e();
          this.getDataWatcher().set(EntityPlayer.bx, Byte.valueOf((byte) packetplayinsettings.f()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3337d8c8e4..7c1444dff2 100644
+index 1b2e7ed72b..1f21e54ab4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1736,8 +1736,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1741,8 +1741,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
@@ -55,7 +56,7 @@ index 3337d8c8e4..7c1444dff2 100644
      }
  
      // Paper start
-@@ -1826,7 +1828,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1831,7 +1833,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
@@ -65,5 +66,5 @@ index 3337d8c8e4..7c1444dff2 100644
  
          @Override
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 000c88ad4..6986f6883 100644
--- a/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From c4f943b3f3ed9320caa7473400e429366e4d468f Mon Sep 17 00:00:00 2001
+From d415127904d0188d028f30b361d7f5312c5532ca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -13,10 +13,10 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 6c4c192446..ad9e7f7b54 100644
+index d245502286..816854dc2f 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -619,6 +619,12 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -618,6 +618,12 @@ public abstract class EntityHuman extends EntityLiving {
                  return null;
              }
              // CraftBukkit end
@@ -30,7 +30,7 @@ index 6c4c192446..ad9e7f7b54 100644
              ItemStack itemstack1 = this.a(entityitem);
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index a049b8d68e..69d3b4f8e4 100644
+index c5bfe6630d..4f2d7db378 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -97,7 +97,7 @@ public class EntityTrackerEntry {
@@ -43,7 +43,7 @@ index a049b8d68e..69d3b4f8e4 100644
              ItemStack itemstack = entityitemframe.getItem();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 261ae87fb8..785f020652 100644
+index 264dc740cb..8aa4138a2e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1122,6 +1122,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -55,7 +55,7 @@ index 261ae87fb8..785f020652 100644
                              }
                          }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index aa58e34c6f..f26b91b407 100644
+index bf7963b421..338d753500 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -30,6 +30,7 @@ public class WorldMap extends PersistentBase {
diff --git a/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch
index 1680518f0..279d60846 100644
--- a/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch
@@ -1,14 +1,14 @@
-From c8a0ffe71fcbaa237aaeeaea6fbedf39bd7c2edf Mon Sep 17 00:00:00 2001
+From 3b30ec48c1e132f5af6ecde10b350a8deb9fb504 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a9fbb20f73..3d83900298 100644
+index 1cafad6bb6..de452e23ca 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -751,6 +751,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -752,6 +752,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (entity1 != entity && this.playerConnection != null) {
              this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
          }
@@ -23,5 +23,5 @@ index a9fbb20f73..3d83900298 100644
      }
  
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch
index 7a0398091..598c6ad60 100644
--- a/Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 8cbc2d5c894b2051dd706642b2aaf11be1b97603 Mon Sep 17 00:00:00 2001
+From d732d572fb35769908c123d0f61f0fc0d37db712 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,10 +6,10 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 690cff8828..d9ea222c2b 100644
+index 8f4a1626a1..c33c6f480c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -189,6 +189,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -190,6 +190,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void a(NBTTagCompound nbttagcompound) {
          super.a(nbttagcompound);
@@ -18,5 +18,5 @@ index 690cff8828..d9ea222c2b 100644
              if (this.bK().getForceGamemode()) {
                  this.playerInteractManager.setGameMode(this.bK().getGamemode());
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch
index e86558db6..1d3e5a450 100644
--- a/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From bbbfb1d1d20ec895f22ede5b5709a915b1f4ba5a Mon Sep 17 00:00:00 2001
+From 68f216feefc87cad63d09fd0df7d2cbdb74bba20 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -48,10 +48,10 @@ index 5e52349064..8195412806 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7e0441e64e..e0716a6085 100644
+index 5ff75877a7..323e4002fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -730,6 +730,14 @@ public class CraftEventFactory {
+@@ -770,6 +770,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0147-Optimise-removeQueue.patch b/Spigot-Server-Patches/0147-Optimise-removeQueue.patch
index 04667a48a..42c1026f8 100644
--- a/Spigot-Server-Patches/0147-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0147-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From feba81e8881b93a60a312a9e37516b0434a55fe6 Mon Sep 17 00:00:00 2001
+From 223a15ae2ff86485b0fbe27045dce04f08176b14 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d9ea222c2b..e3ac9eb7d5 100644
+index c33c6f480c..891b804a6e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -5,8 +5,10 @@ import com.mojang.authlib.GameProfile;
@@ -28,7 +28,7 @@ index d9ea222c2b..e3ac9eb7d5 100644
      private final AdvancementDataPlayer cf;
      private final ServerStatisticManager cg;
      private float ch = Float.MIN_VALUE;
-@@ -351,13 +353,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -352,13 +354,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          while (!this.removeQueue.isEmpty()) {
              int i = Math.min(this.removeQueue.size(), Integer.MAX_VALUE);
              int[] aint = new int[i];
@@ -51,7 +51,7 @@ index d9ea222c2b..e3ac9eb7d5 100644
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -1137,7 +1146,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1138,7 +1147,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.lastHealthSent = -1.0F;
          this.co = -1;
          // this.cy.a((RecipeBook) entityplayer.cy); // CraftBukkit
@@ -68,5 +68,5 @@ index d9ea222c2b..e3ac9eb7d5 100644
          this.cC = entityplayer.cC;
          this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch
index ee18e60cd..520f279ee 100644
--- a/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From 3ee3f95161eaed8a82c83206f39072a5871a0b89 Mon Sep 17 00:00:00 2001
+From cad681c39d0d0453c3b773fbe7c98507a15843af Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -18,7 +18,7 @@ index 3155ed9487..1e25ade7cf 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e0716a6085..47ccf36ed1 100644
+index 323e4002fb..c225c9e352 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -50,6 +50,7 @@ import org.bukkit.entity.Player;
@@ -28,8 +28,8 @@ index e0716a6085..47ccf36ed1 100644
 +import org.bukkit.entity.ExperienceOrb; // Paper
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
- import org.bukkit.event.block.*;
-@@ -699,6 +700,17 @@ public class CraftEventFactory {
+ import org.bukkit.event.Event.Result;
+@@ -739,6 +740,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch
index 75d4ba208..9ef562af2 100644
--- a/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From c1e74c7dd9fc42821e7b1a77cd6004dde99e63e4 Mon Sep 17 00:00:00 2001
+From be0245f09cbeffaa9e636950ad38f6fb747872b5 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@@ -87,10 +87,10 @@ index ee402d4140..fc8c0cab55 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.NETHER_PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 47ccf36ed1..d0fa9a4dd8 100644
+index c225c9e352..cbf3356985 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -834,6 +834,16 @@ public class CraftEventFactory {
+@@ -874,6 +874,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
index 480c94991..3cb39a583 100644
--- a/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From f8621a1a15d2b596adcbeb66fbf572b256531b98 Mon Sep 17 00:00:00 2001
+From 0fcfb27e50a61e2c1be28fbef4784dd66019c85c Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 49cf680b8e..77bdb1db77 100644
+index 891b804a6e..edef46ac31 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1550,7 +1550,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1552,7 +1552,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      protected boolean isFrozen() {
diff --git a/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 6bab2d92c..2faf4f915 100644
--- a/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 93ba4596484722bd10c1bc3d91bc25698415794d Mon Sep 17 00:00:00 2001
+From c237475d62521c78a025e9b6d825149d665fb433 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -26,10 +26,10 @@ index 02d99aec43..3507997fc3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 09d2cd5716..b7a55b4d64 100644
+index 816854dc2f..64a8c6308c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -469,7 +469,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -468,7 +468,7 @@ public abstract class EntityHuman extends EntityLiving {
          this.j(this.getShoulderEntityLeft());
          this.j(this.getShoulderEntityRight());
          if (!this.world.isClientSide && (this.fallDistance > 0.5F || this.isInWater() || this.isPassenger()) || this.abilities.isFlying) {
diff --git a/Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
index ab50ce272..af5dba096 100644
--- a/Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
@@ -1,14 +1,14 @@
-From 018559a084e608f3bd6fb7e2c30bf7bbd525f8e1 Mon Sep 17 00:00:00 2001
+From 6f67577f6bcf7a345ffc759efdef3b02b66639de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0f00eecead..504c9ad473 100644
+index 64a8c6308c..9614348157 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1824,21 +1824,48 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1829,21 +1829,48 @@ public abstract class EntityHuman extends EntityLiving {
          }
          // CraftBukkit end
      }
@@ -62,7 +62,7 @@ index 0f00eecead..504c9ad473 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 497783d4f3..99705b1344 100644
+index be00d79e85..755d288ed5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -460,6 +460,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -99,5 +99,5 @@ index 497783d4f3..99705b1344 100644
      public boolean discoverRecipe(NamespacedKey recipe) {
          return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
index eb7a6586b..adf7f5b79 100644
--- a/Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
@@ -1,14 +1,14 @@
-From 37fc69d96efb51fcf33bdd3bc8923e0d60ccb36a Mon Sep 17 00:00:00 2001
+From 292b6bb1583fa684c7438958fcc58b3aa0f95117 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 504c9ad473..4ac310bae1 100644
+index 9614348157..b357cb2077 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1476,6 +1476,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1481,6 +1481,7 @@ public abstract class EntityHuman extends EntityLiving {
          return 0;
      }
  
@@ -17,7 +17,7 @@ index 504c9ad473..4ac310bae1 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f34613fb25..c12487b024 100644
+index 3289ba3ffd..b54da4eb79 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -59,6 +59,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -66,5 +66,5 @@ index f34613fb25..c12487b024 100644
  
                              this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index dc0b109f5..07287307a 100644
--- a/Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From d0a4697ca78a1a3dc06eec3e819e9e4d7dc639c5 Mon Sep 17 00:00:00 2001
+From 152da465104aea25904a9cb90ed2b5e159c5ef36 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,10 +6,10 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4ac310bae1..1b7adbf4ba 100644
+index b357cb2077..b047e8e8b1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -996,6 +996,15 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -995,6 +995,15 @@ public abstract class EntityHuman extends EntityLiving {
          this.k = 0;
      }
  
@@ -25,7 +25,7 @@ index 4ac310bae1..1b7adbf4ba 100644
      public void attack(Entity entity) {
          if (entity.bk()) {
              if (!entity.t(this)) {
-@@ -1020,7 +1029,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1019,7 +1028,7 @@ public abstract class EntityHuman extends EntityLiving {
                      int i = b0 + EnchantmentManager.b((EntityLiving) this);
  
                      if (this.isSprinting() && flag) {
@@ -34,7 +34,7 @@ index 4ac310bae1..1b7adbf4ba 100644
                          ++i;
                          flag1 = true;
                      }
-@@ -1098,7 +1107,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1097,7 +1106,7 @@ public abstract class EntityHuman extends EntityLiving {
                                  }
                              }
  
@@ -43,7 +43,7 @@ index 4ac310bae1..1b7adbf4ba 100644
                              this.dl();
                          }
  
-@@ -1128,15 +1137,15 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1127,15 +1136,15 @@ public abstract class EntityHuman extends EntityLiving {
                          }
  
                          if (flag2) {
@@ -62,7 +62,7 @@ index 4ac310bae1..1b7adbf4ba 100644
                              }
                          }
  
-@@ -1192,7 +1201,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1191,7 +1200,7 @@ public abstract class EntityHuman extends EntityLiving {
  
                          this.applyExhaustion(world.spigotConfig.combatExhaustion); // Spigot - Change to use configurable value
                      } else {
@@ -72,7 +72,7 @@ index 4ac310bae1..1b7adbf4ba 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b17215edf4..7712ee9db0 100644
+index 686b356f0d..225ecce71a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -954,6 +954,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -89,5 +89,5 @@ index b17215edf4..7712ee9db0 100644
          for (int i = 0; i < this.v.size(); ++i) {
              ((IWorldAccess) this.v.get(i)).a(entityhuman, soundeffect, soundcategory, d0, d1, d2, f, f1);
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index a566f45ed..4f36908b3 100644
--- a/Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,4 +1,4 @@
-From b5fe5cfedb0892d65579588e47cd426c64b85dae Mon Sep 17 00:00:00 2001
+From 00bb5cf018de0f3d75abc87b211b2f1b0401adaa Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
@@ -21,10 +21,10 @@ index 67b4d576a9..02c52958c8 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1b7adbf4ba..a728507c54 100644
+index b047e8e8b1..b9e6a18293 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1036,6 +1036,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1035,6 +1035,7 @@ public abstract class EntityHuman extends EntityLiving {
  
                      boolean flag2 = flag && this.fallDistance > 0.0F && !this.onGround && !this.z_() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && entity instanceof EntityLiving;
  
@@ -33,5 +33,5 @@ index 1b7adbf4ba..a728507c54 100644
                      if (flag2) {
                          f *= 1.5F;
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
index 3db4813ea..405ca003d 100644
--- a/Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From aa252e29df89602af7e487e33e63fb46ff9a77a0 Mon Sep 17 00:00:00 2001
+From a347b25b7293f1b2eb1740a18840d7ae893bcd18 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index a728507c54..5975578b38 100644
+index b9e6a18293..73998e5a75 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -67,7 +67,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving {
      protected int bZ;
      protected float ca = 0.02F;
      private int g;
@@ -48,7 +48,7 @@ index ab85fd9a6e..5778a5201d 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1c40f17ce9..ae28723ef2 100644
+index 45f7a4143f..b1cba904e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -139,5 +139,5 @@ index 1c40f17ce9..ae28723ef2 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
index 9d4f9cebc..94c94f632 100644
--- a/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From ab27cd2f822ead83bcbb5e058b2dd23b2d0942d1 Mon Sep 17 00:00:00 2001
+From 6cfc9f17e0b11859dd5255f1d21a3050a7fef30c Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -20,10 +20,10 @@ index 02c52958c8..fe56f01035 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5975578b38..5e13cb0640 100644
+index 73998e5a75..1d97a5442c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1088,7 +1088,11 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1087,7 +1087,11 @@ public abstract class EntityHuman extends EntityLiving {
  
                              this.motX *= 0.6D;
                              this.motZ *= 0.6D;
@@ -37,5 +37,5 @@ index 5975578b38..5e13cb0640 100644
  
                          if (flag3) {
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 21aaa59c4..d91b5dc58 100644
--- a/Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From ed598cfdc8b7e336c28cac7fb5cc9f22dda94b9f Mon Sep 17 00:00:00 2001
+From 20386d12c045710997309c429716729ecba9fb8c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -58,10 +58,10 @@ index b0f7649b82..152b179ce1 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d0fa9a4dd8..d769a913d2 100644
+index cbf3356985..65544c1bb2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -264,7 +264,7 @@ public class CraftEventFactory {
+@@ -304,7 +304,7 @@ public class CraftEventFactory {
      /**
       * EntityShootBowEvent
       */
@@ -70,7 +70,7 @@ index d0fa9a4dd8..d769a913d2 100644
          LivingEntity shooter = (LivingEntity) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
          Arrow arrow = (Arrow) entityArrow.getBukkitEntity();
-@@ -273,7 +273,7 @@ public class CraftEventFactory {
+@@ -313,7 +313,7 @@ public class CraftEventFactory {
              itemInHand = null;
          }
  
diff --git a/Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index 751171842..847382841 100644
--- a/Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From bfa18c1f7a973739c5cf1fd896da3edf405e92aa Mon Sep 17 00:00:00 2001
+From bd67d12c59ebdc3c413e0720f60be09cee775342 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:39 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
@@ -6,10 +6,10 @@ Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d769a913d2..bc175d4c51 100644
+index 65544c1bb2..2e39a988bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -858,7 +858,7 @@ public class CraftEventFactory {
+@@ -898,7 +898,7 @@ public class CraftEventFactory {
              hitBlock = entity.getBukkitEntity().getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
          }
  
diff --git a/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
index 141ba7b26..ce2802145 100644
--- a/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 821283c8c5aae41af68928e9508781ffefc04170 Mon Sep 17 00:00:00 2001
+From eea9dc9ae3dbf89daf49cfe290eec61f955b3b5c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -29,10 +29,10 @@ index 44f37f50a7..864691f873 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 09064fa05d..125b8ef340 100644
+index 1d97a5442c..d510ef63d1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -162,7 +162,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -161,7 +161,7 @@ public abstract class EntityHuman extends EntityLiving {
          this.dg();
          super.tick();
          if (!this.world.isClientSide && this.activeContainer != null && !this.activeContainer.canUse(this)) {
@@ -41,7 +41,7 @@ index 09064fa05d..125b8ef340 100644
              this.activeContainer = this.defaultContainer;
          }
  
-@@ -364,6 +364,13 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -363,6 +363,13 @@ public abstract class EntityHuman extends EntityLiving {
          return this.getHealth() <= 0.0F || this.isSleeping();
      }
  
@@ -56,10 +56,10 @@ index 09064fa05d..125b8ef340 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 77bdb1db77..8901ea8e46 100644
+index edef46ac31..9dcf29609a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -346,7 +346,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -347,7 +347,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // Paper end
          if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
@@ -68,7 +68,7 @@ index 77bdb1db77..8901ea8e46 100644
              this.activeContainer = this.defaultContainer;
          }
  
-@@ -552,7 +552,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -553,7 +553,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.inventory.clear();
          }
  
@@ -77,7 +77,7 @@ index 77bdb1db77..8901ea8e46 100644
          this.setSpectatorTarget(this); // Remove spectated target
          // CraftBukkit end
  
-@@ -864,7 +864,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -865,7 +865,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.a((new ChatMessage("container.spectatorCantOpen", new Object[0])).a(EnumChatFormat.RED), true);
          } else {
              if (this.activeContainer != this.defaultContainer) {
@@ -86,7 +86,7 @@ index 77bdb1db77..8901ea8e46 100644
              }
  
              if (iinventory instanceof ITileInventory) {
-@@ -930,7 +930,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -931,7 +931,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // CraftBukkit end
          if (this.activeContainer != this.defaultContainer) {
@@ -95,7 +95,7 @@ index 77bdb1db77..8901ea8e46 100644
          }
  
          this.nextContainerCounter();
-@@ -995,7 +995,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -996,7 +996,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      public void closeInventory() {
@@ -155,7 +155,7 @@ index 7070917547..c9cbf69798 100644
      public boolean isBlocking() {
          return getHandle().isBlocking();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5443000bdf..a0c0c96a28 100644
+index 8699cc72f1..0f1d700c73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -740,7 +740,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,10 +168,10 @@ index 5443000bdf..a0c0c96a28 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bc175d4c51..402574f559 100644
+index 2e39a988bc..265b266325 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -948,8 +948,19 @@ public class CraftEventFactory {
+@@ -988,8 +988,19 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
index fcf8dd8b3..689042799 100644
--- a/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 8eb4fdbb9a85ee002833fb2317b9ae125b5b1816 Mon Sep 17 00:00:00 2001
+From 1084db77a35a4bcf6539b823e3c2fc0dcc531ad9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -30,13 +30,13 @@ index 85296e48db..deb0d4f053 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 4f97ff6f18..230c05ff07 100644
+index 2ba61fd81f..c58e7259f4 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
-@@ -166,6 +166,52 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
+@@ -187,6 +187,52 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
      @Nullable
      public static BlockPosition a(IBlockAccess iblockaccess, BlockPosition blockposition, int i) {
-         EnumDirection enumdirection = (EnumDirection)iblockaccess.getType(blockposition).get(FACING);
+         EnumDirection enumdirection = (EnumDirection) iblockaccess.getType(blockposition).get(BlockBed.FACING);
 +        // Paper - replace whole method
 +        World world = (World) iblockaccess;
 +        int radius = world.paperConfig.bedSearchRadius;
@@ -86,7 +86,7 @@ index 4f97ff6f18..230c05ff07 100644
          int j = blockposition.getX();
          int k = blockposition.getY();
          int l = blockposition.getZ();
-@@ -190,9 +236,12 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
+@@ -212,9 +258,12 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
              }
          }
  
@@ -101,5 +101,5 @@ index 4f97ff6f18..230c05ff07 100644
          return iblockaccess.getType(blockposition.down()).q() && !iblockaccess.getType(blockposition).getMaterial().isBuildable() && !iblockaccess.getType(blockposition.up()).getMaterial().isBuildable();
      }
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
index d78913276..9e31ad195 100644
--- a/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 5eb8fc0bc3e1d7351cec7484dfadcb53b2d28cd4 Mon Sep 17 00:00:00 2001
+From add993d4185e2c2d86cf87815920d20878a795fa Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
@@ -86,10 +86,10 @@ index fa94e41f0f..ad1011a22a 100644
          if (voxelshape.isEmpty()) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 402574f559..de04bd6dfe 100644
+index 265b266325..f5fa6b13e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -839,6 +839,14 @@ public class CraftEventFactory {
+@@ -879,6 +879,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.entity.getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch
index 3b7fdc994..29eb3e8fa 100644
--- a/Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 9ad5361888bd9985dd45a222e569a890e940549f Mon Sep 17 00:00:00 2001
+From 8267ebfcf1993dcff3c0e19bc3552724230d7873 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
@@ -67,10 +67,10 @@ index b63da71512..b0dd30dd12 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          // TODO: inventory not updated
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index de04bd6dfe..f2dc2d9f5d 100644
+index f5fa6b13e1..396a37f69b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -188,6 +188,20 @@ public class CraftEventFactory {
+@@ -228,6 +228,20 @@ public class CraftEventFactory {
      }
  
      private static PlayerEvent getPlayerBucketEvent(boolean isFilling, EntityHuman who, int clickedX, int clickedY, int clickedZ, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {
@@ -91,7 +91,7 @@ index de04bd6dfe..f2dc2d9f5d 100644
          Player player = (who == null) ? null : (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item);
          Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem());
-@@ -200,10 +214,10 @@ public class CraftEventFactory {
+@@ -240,10 +254,10 @@ public class CraftEventFactory {
  
          PlayerEvent event = null;
          if (isFilling) {
diff --git a/Spigot-Server-Patches/0352-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0352-Expose-attack-cooldown-methods-for-Player.patch
index 6d8b99ac8..3a7a832f1 100644
--- a/Spigot-Server-Patches/0352-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0352-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,14 +1,14 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 9035d279e96983979992cf4965fefa63b11e48a6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index d510ef63d1..2870015585 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -2054,14 +2054,17 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2059,14 +2059,17 @@ public abstract class EntityHuman extends EntityLiving {
          this.datawatcher.set(EntityHuman.bA, nbttagcompound);
      }
  
@@ -27,10 +27,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          this.aH = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 0a0ea301d9..8be0a47bae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1912,6 +1912,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1917,6 +1917,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.resourcePackStatus = status;
      }
  
diff --git a/Spigot-Server-Patches/0355-Improve-death-events.patch b/Spigot-Server-Patches/0355-Improve-death-events.patch
index 3abcd6f17..2fc6e142b 100644
--- a/Spigot-Server-Patches/0355-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0355-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 3237acd9a43b9f26b64bcfa1a18a51ac319ec8e5 Mon Sep 17 00:00:00 2001
+From e3311a5221d039ca87f85192018cc4949b9e1f33 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -207,7 +207,7 @@ index 3a70fa381f..c27807ea2a 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8901ea8e46..cfc9c8224d 100644
+index 9dcf29609a..720eb9184f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -221,7 +221,7 @@ index 8901ea8e46..cfc9c8224d 100644
  
      // CraftBukkit start
      public String displayName;
-@@ -508,6 +512,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -509,6 +513,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          String deathmessage = defaultMessage.getString();
          org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
@@ -237,7 +237,7 @@ index 8901ea8e46..cfc9c8224d 100644
  
          String deathMessage = event.getDeathMessage();
  
-@@ -635,8 +648,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -636,8 +649,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                          }
                      }
                  }
@@ -285,7 +285,7 @@ index 17fab031b4..ee8219e3ba 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 905feb0cb9..a5c4781743 100644
+index 8be0a47bae..f56ef6f710 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1711,7 +1711,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -306,10 +306,10 @@ index 905feb0cb9..a5c4781743 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f2dc2d9f5d..65f133bc1d 100644
+index 396a37f69b..11ff21fcf0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -445,9 +445,16 @@ public class CraftEventFactory {
+@@ -485,9 +485,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -326,7 +326,7 @@ index f2dc2d9f5d..65f133bc1d 100644
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -463,8 +470,15 @@ public class CraftEventFactory {
+@@ -503,8 +510,15 @@ public class CraftEventFactory {
          CraftPlayer entity = victim.getBukkitEntity();
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
          event.setKeepInventory(keepInventory);
@@ -342,7 +342,7 @@ index f2dc2d9f5d..65f133bc1d 100644
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -485,6 +499,31 @@ public class CraftEventFactory {
+@@ -525,6 +539,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch
index 3e79d5607..094e737e4 100644
--- a/Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch
@@ -1,4 +1,4 @@
-From 7f80524406fbc47888a8909fb32ea6e0545bc294 Mon Sep 17 00:00:00 2001
+From b224cfd87e0c3056aad5899c80a7caa90e1c2360 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@@ -43,7 +43,7 @@ reading or writing to the chunk will be safe, so plugins still
 should not be touching chunks asynchronously!
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b703e0848..77d35ac99 100644
+index b703e08486..77d35ac99d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -385,4 +385,57 @@ public class PaperConfig {
@@ -106,7 +106,7 @@ index b703e0848..77d35ac99 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
 new file mode 100644
-index 000000000..e589aa356
+index 0000000000..e589aa356c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
 @@ -0,0 +1,298 @@
@@ -409,7 +409,7 @@ index 000000000..e589aa356
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 479a84a25..340b756bb 100644
+index 479a84a250..340b756bb4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -184,6 +184,7 @@ public class Chunk implements IChunkAccess {
@@ -421,7 +421,7 @@ index 479a84a25..340b756bb 100644
  
          Iterator iterator = protochunk.s().iterator();
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 39ac032b0..1662e4eba 100644
+index 39ac032b0b..1662e4eba5 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,9 +14,17 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -527,7 +527,7 @@ index 39ac032b0..1662e4eba 100644
  
      public Chunk remove(Object object) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index e64cb8051..7a1f84886 100644
+index e64cb80514..7a1f848863 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -35,12 +35,12 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -677,7 +677,7 @@ index e64cb8051..7a1f84886 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 9b4bc3ff6..4c22f6d75 100644
+index 9b4bc3ff68..4c22f6d756 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -120,7 +120,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -704,7 +704,7 @@ index 9b4bc3ff6..4c22f6d75 100644
                  completion = new Supplier<NBTTagCompound>() {
                      public NBTTagCompound get() {
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index bdfc7d81f..a5c4564d6 100644
+index bdfc7d81ff..a5c4564d60 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -24,7 +24,17 @@ public class ChunkSection {
@@ -726,7 +726,7 @@ index bdfc7d81f..a5c4564d6 100644
      public IBlockData getType(int i, int j, int k) {
          return this.blockIds.a(i, j, k);
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 34019bd1b..fc9091c80 100644
+index 34019bd1b3..fc9091c801 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -20,13 +20,14 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@@ -797,7 +797,7 @@ index 34019bd1b..fc9091c80 100644
  
      protected ProtoChunk a(ChunkCoordIntPair chunkcoordintpair, ChunkStatus chunkstatus, Map<ChunkCoordIntPair, ProtoChunk> map) {
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 71a3636be..ff0fe2541 100644
+index 71a3636be6..ff0fe25417 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
@@ -882,7 +882,7 @@ index 71a3636be..ff0fe2541 100644
  
      // Paper start - Anti-Xray - Support default methods
 diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
-index 271dc41d4..bd15534c2 100644
+index 271dc41d45..bd15534c23 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
 @@ -19,7 +19,7 @@ import org.apache.logging.log4j.Logger;
@@ -895,7 +895,7 @@ index 271dc41d4..bd15534c2 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 13c0c7ee8..552be8cd8 100644
+index 13c0c7ee89..552be8cd88 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -209,7 +209,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -908,7 +908,7 @@ index 13c0c7ee8..552be8cd8 100644
          this.aJ = Sets.newHashSet();
          this.aL = new double[] { 0.0D, 0.0D, 0.0D};
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 4698ee99f..dfb45cc4e 100644
+index 4698ee99f8..dfb45cc4ea 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -6,6 +6,8 @@ import javax.annotation.Nullable;
@@ -921,7 +921,7 @@ index 4698ee99f..dfb45cc4e 100644
      Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException;
  
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 49fba0979..9ad646f8d 100644
+index 49fba0979e..9ad646f8d4 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -142,6 +142,7 @@ public class MathHelper {
@@ -933,7 +933,7 @@ index 49fba0979..9ad646f8d 100644
          fx = fx % 360.0F;
          if (fx >= 180.0F) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 763130b03..67722440f 100644
+index 763130b036..67722440fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -503,6 +503,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -1031,7 +1031,7 @@ index 763130b03..67722440f 100644
  
 diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
 new file mode 100644
-index 000000000..c334462f2
+index 0000000000..c334462f20
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
 @@ -0,0 +1,619 @@
@@ -1655,7 +1655,7 @@ index 000000000..c334462f2
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 2c7c8adf7..62c524ef3 100644
+index 2c7c8adf7c..62c524ef35 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -29,16 +29,59 @@ public class PlayerChunk {
@@ -1757,7 +1757,7 @@ index 2c7c8adf7..62c524ef3 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 95baa1dc8..9f6028586 100644
+index 95baa1dc8b..9f60285868 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -27,10 +27,10 @@ public class PlayerChunkMap {
@@ -1817,7 +1817,7 @@ index 95baa1dc8..9f6028586 100644
  
      private void e() {
 diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
-index 9c34319b6..7149b1472 100644
+index 9c34319b6e..7149b1472b 100644
 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 @@ -35,7 +35,7 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
@@ -1830,7 +1830,7 @@ index 9c34319b6..7149b1472 100644
          this.m = world.getChunkProvider().getChunkGenerator().getSettings();
          this.i = world.getSeaLevel();
 diff --git a/src/main/java/net/minecraft/server/SchedulerBatch.java b/src/main/java/net/minecraft/server/SchedulerBatch.java
-index d868149d1..0d45d933e 100644
+index d868149d1a..0d45d933ee 100644
 --- a/src/main/java/net/minecraft/server/SchedulerBatch.java
 +++ b/src/main/java/net/minecraft/server/SchedulerBatch.java
 @@ -9,6 +9,7 @@ public class SchedulerBatch<K, T extends SchedulerTask<K, T>, R> {
@@ -1885,7 +1885,7 @@ index d868149d1..0d45d933e 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
-index a5cf017da..def8730b8 100644
+index a5cf017da1..def8730b86 100644
 --- a/src/main/java/net/minecraft/server/StructurePiece.java
 +++ b/src/main/java/net/minecraft/server/StructurePiece.java
 @@ -14,7 +14,7 @@ public abstract class StructurePiece {
@@ -1912,7 +1912,7 @@ index a5cf017da..def8730b8 100644
          return null;
      }
 diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
-index 1926c902a..1117e4ae2 100644
+index 1926c902ad..1117e4ae27 100644
 --- a/src/main/java/net/minecraft/server/StructureStart.java
 +++ b/src/main/java/net/minecraft/server/StructureStart.java
 @@ -6,7 +6,7 @@ import java.util.List;
@@ -1961,7 +1961,7 @@ index 1926c902a..1117e4ae2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 016d50d3c..f1495d30c 100644
+index 016d50d3cb..f1495d30cb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -46,7 +46,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -2058,7 +2058,7 @@ index 016d50d3c..f1495d30c 100644
          if (entity == null) return false;
          if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index fa99fe014..4f49786aa 100644
+index fa99fe0146..4f49786aa3 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -9,24 +9,29 @@ import java.util.Random;
@@ -2205,7 +2205,7 @@ index fa99fe014..4f49786aa 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6e54b71e8..a54ea5a69 100644
+index 6e54b71e88..a54ea5a69c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -731,7 +731,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -2218,7 +2218,7 @@ index 6e54b71e8..a54ea5a69 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6d72db7bd..32bf4e589 100644
+index 6d72db7bd3..32bf4e589c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1014,8 +1014,12 @@ public final class CraftServer implements Server {
@@ -2246,7 +2246,7 @@ index 6d72db7bd..32bf4e589 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9c266b450..f3a9649ef 100644
+index 9c266b4502..f3a9649ef6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -162,6 +162,16 @@ public class CraftWorld implements World {
@@ -2284,10 +2284,10 @@ index 9c266b450..f3a9649ef 100644
                      if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
                          unloadChunk(chunkCoordX + x, chunkCoordZ + z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 439bf2c24..12e6a4ea3 100644
+index 11ff21fcf0..9d0d4d42b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -78,6 +78,7 @@ public class CraftEventFactory {
+@@ -80,6 +80,7 @@ public class CraftEventFactory {
      public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC);
      public static org.bukkit.block.Block blockDamage; // For use in EntityDamageByBlockEvent
      public static Entity entityDamage; // For use in EntityDamageByEntityEvent
@@ -2295,7 +2295,7 @@ index 439bf2c24..12e6a4ea3 100644
  
      // helper methods
      private static boolean canBuild(CraftWorld world, Player player, int x, int z) {
-@@ -319,6 +320,7 @@ public class CraftEventFactory {
+@@ -359,6 +360,7 @@ public class CraftEventFactory {
          CraftServer craftServer = (CraftServer) entity.getServer();
  
          CreatureSpawnEvent event = new CreatureSpawnEvent(entity, spawnReason);
@@ -2303,7 +2303,7 @@ index 439bf2c24..12e6a4ea3 100644
          craftServer.getPluginManager().callEvent(event);
          return event;
      }
-@@ -966,6 +968,7 @@ public class CraftEventFactory {
+@@ -1006,6 +1008,7 @@ public class CraftEventFactory {
          }
  
          BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(block.getX(), block.getY(), block.getZ()), cause, igniter);
@@ -2311,7 +2311,7 @@ index 439bf2c24..12e6a4ea3 100644
          world.getServer().getPluginManager().callEvent(event);
          return event;
      }
-@@ -990,6 +993,7 @@ public class CraftEventFactory {
+@@ -1030,6 +1033,7 @@ public class CraftEventFactory {
          }
  
          BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), cause, bukkitIgniter);
@@ -2319,7 +2319,7 @@ index 439bf2c24..12e6a4ea3 100644
          world.getServer().getPluginManager().callEvent(event);
          return event;
      }
-@@ -1197,7 +1201,8 @@ public class CraftEventFactory {
+@@ -1237,7 +1241,8 @@ public class CraftEventFactory {
      public static BlockPhysicsEvent callBlockPhysicsEvent(GeneratorAccess world, BlockPosition blockposition) {
          org.bukkit.block.Block block = CraftBlock.at(world, blockposition);
          BlockPhysicsEvent event = new BlockPhysicsEvent(block, block.getBlockData());
@@ -2329,7 +2329,7 @@ index 439bf2c24..12e6a4ea3 100644
          return event;
      }
  
-@@ -1233,6 +1238,7 @@ public class CraftEventFactory {
+@@ -1273,6 +1278,7 @@ public class CraftEventFactory {
          }
  
          EntityPotionEffectEvent event = new EntityPotionEffectEvent((LivingEntity) entity.getBukkitEntity(), bukkitOldEffect, bukkitNewEffect, cause, action, willOverride);
@@ -2337,7 +2337,7 @@ index 439bf2c24..12e6a4ea3 100644
          Bukkit.getPluginManager().callEvent(event);
  
          return event;
-@@ -1251,6 +1257,7 @@ public class CraftEventFactory {
+@@ -1291,6 +1297,7 @@ public class CraftEventFactory {
          blockState.setData(block);
  
          BlockFormEvent event = (entity == null) ? new BlockFormEvent(blockState.getBlock(), blockState) : new EntityBlockFormEvent(entity.getBukkitEntity(), blockState.getBlock(), blockState);
@@ -2346,7 +2346,7 @@ index 439bf2c24..12e6a4ea3 100644
  
          if (!event.isCancelled()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 9c2adb235..62c197b80 100644
+index 9c2adb2351..62c197b80d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -21,6 +21,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
diff --git a/Spigot-Server-Patches/0391-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0391-Call-player-spectator-target-events.patch
index 8545b28d5..bad9546f4 100644
--- a/Spigot-Server-Patches/0391-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0391-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From b94b61cf628b8659d485330e8c7c9e27978e7cab Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 720eb9184f..7bbcaba053 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -62,7 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public boolean worldChangeInvuln;
      private boolean cx; private void setHasSeenCredits(boolean has) { this.cx = has; } // Paper - OBFHELPER
      private final RecipeBookServer cy;
-@@ -1373,15 +1373,36 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1375,15 +1375,36 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (Entity) (this.cv == null ? this : this.cv);
      }
  
diff --git a/Spigot-Server-Patches/0397-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0397-Reset-players-airTicks-on-respawn.patch
index b257e83aa..8b07f3441 100644
--- a/Spigot-Server-Patches/0397-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0397-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From f5e154fd54294d6b6a9d97dd7492bd2fcddfb725 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index d60dab95f3..32b90f30d9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2335,7 +2335,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,10 +18,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 7bbcaba053..4490b63258 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1617,6 +1617,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1619,6 +1619,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.setHealth(this.getMaxHealth());
diff --git a/work/Bukkit b/work/Bukkit
index 98d3f031c..9d0221aa2 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 98d3f031c31269cf6997d3c4a92bb36620ad4731
+Subproject commit 9d0221aa2959e79a315d7f87edd9d82e3ee7ce43
diff --git a/work/CraftBukkit b/work/CraftBukkit
index aed3aecba..96c461b3a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit aed3aecbafff223bb8c48ace7cb18f8a7dd0b6d5
+Subproject commit 96c461b3a528611ab4d4e22d71c63e10f9a1d034
diff --git a/work/Spigot b/work/Spigot
index e4d0c66f9..117d4f7e2 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit e4d0c66f9eefadb5f9f39a102f457daaeb05374c
+Subproject commit 117d4f7e219c6aecf6c56980f6c6926792e431ef