diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index 03f3c01d4..2aab825b5 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 98b1fecba12a6cdde5a5c08d9dc2a84851a7669b Mon Sep 17 00:00:00 2001
+From ca6ed8efa01a2413602e10e9d81b8187aee6013a 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
@@ -3062,10 +3062,10 @@ index 08a9739f..347d2189 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index 3f07d7f4..f89ad075 100644
+index 50257883..9c80f464 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-@@ -14,6 +14,7 @@ public class FormattedCommandAlias extends Command {
+@@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
  
      public FormattedCommandAlias(String alias, String[] formatStrings) {
          super(alias);
@@ -3073,7 +3073,7 @@ index 3f07d7f4..f89ad075 100644
          this.formatStrings = formatStrings;
      }
  
-@@ -118,6 +119,9 @@ public class FormattedCommandAlias extends Command {
+@@ -113,6 +114,9 @@ public class FormattedCommandAlias extends Command {
          return formatString;
      }
  
@@ -3195,7 +3195,7 @@ index 00000000..5527e7c8
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 71709126..b886cd82 100644
+index 1b5b37bf..bdc0de8c 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -3488,7 +3488,7 @@ 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 bd2cc354..d2a78f56 100644
+index 8af5f849..f4eff6b7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1520,6 +1520,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -3504,10 +3504,10 @@ index bd2cc354..d2a78f56 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index b3bcda52..041a4cd7 100644
+index 8b130abb..80c152ba 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -293,7 +293,6 @@ public final class SimplePluginManager implements PluginManager {
              }
          }
  
@@ -3515,7 +3515,7 @@ index b3bcda52..041a4cd7 100644
          return result.toArray(new Plugin[result.size()]);
      }
  
-@@ -329,7 +328,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -330,7 +329,7 @@ public final class SimplePluginManager implements PluginManager {
  
          if (result != null) {
              plugins.add(result);
@@ -3524,7 +3524,7 @@ index b3bcda52..041a4cd7 100644
          }
  
          return result;
-@@ -355,7 +354,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -356,7 +355,7 @@ public final class SimplePluginManager implements PluginManager {
       * @return Plugin if it exists, otherwise null
       */
      public synchronized Plugin getPlugin(String name) {
@@ -3533,7 +3533,7 @@ index b3bcda52..041a4cd7 100644
      }
  
      public synchronized Plugin[] getPlugins() {
-@@ -553,7 +552,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -554,7 +553,8 @@ public final class SimplePluginManager implements PluginManager {
              throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
          }
  
@@ -3543,7 +3543,7 @@ index b3bcda52..041a4cd7 100644
              getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
          } else {
              getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -729,7 +729,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -730,7 +730,7 @@ public final class SimplePluginManager implements PluginManager {
      }
  
      public boolean useTimings() {
@@ -3552,7 +3552,7 @@ index b3bcda52..041a4cd7 100644
      }
  
      /**
-@@ -738,6 +738,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -739,6 +739,6 @@ public final class SimplePluginManager implements PluginManager {
       * @param use True if per event timing code should be used
       */
      public void useTimings(boolean use) {
@@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
 -    }
  }
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch
index d10dbeda8..2623061a1 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From 5992f37d03b1b4cf413785d1b9e716a1b48de5da Mon Sep 17 00:00:00 2001
+From 31343663dd75e733ce5d1112dabc76dae04f3ec1 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 e454e70a..c86c1c5f 100644
+index 219ec25f..69fbdb3c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -495,4 +495,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -497,4 +497,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
      @Override
      Spigot spigot();
      // Spigot end
@@ -65,5 +65,5 @@ index fcd0a9b2..2abef57c 100644
 +    }
  }
 -- 
-2.13.0.windows.1
+2.14.3
 
diff --git a/Spigot-API-Patches/0018-Add-exception-reporting-event.patch b/Spigot-API-Patches/0018-Add-exception-reporting-event.patch
index d2f569519..7b3d2c6a0 100644
--- a/Spigot-API-Patches/0018-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0018-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 04898a9642c98cc38ace2c8862794f1710081a7d Mon Sep 17 00:00:00 2001
+From 95df32df8d98c5ca8434f09312bade707628c21c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@@ -458,7 +458,7 @@ index 00000000..5582999f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index b886cd82..f1e9f200 100644
+index bdc0de8c..762eb1d2 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -10,6 +10,9 @@ import java.util.List;
@@ -494,7 +494,7 @@ index b886cd82..f1e9f200 100644
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 041a4cd7..68dd3332 100644
+index 80c152ba..b88f31ca 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;
@@ -507,7 +507,7 @@ index 041a4cd7..68dd3332 100644
  import org.apache.commons.lang.Validate;
  import org.bukkit.Server;
  import org.bukkit.command.Command;
-@@ -400,7 +403,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -401,7 +404,8 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().enablePlugin(plugin);
              } catch (Throwable ex) {
@@ -517,7 +517,7 @@ index 041a4cd7..68dd3332 100644
              }
  
              HandlerList.bakeAll();
-@@ -419,36 +423,48 @@ public final class SimplePluginManager implements PluginManager {
+@@ -420,36 +424,48 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().disablePlugin(plugin);
              } catch (Throwable ex) {
@@ -571,7 +571,7 @@ index 041a4cd7..68dd3332 100644
      public void clearPlugins() {
          synchronized (this) {
              disablePlugins();
-@@ -510,7 +526,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -511,7 +527,13 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {
@@ -587,5 +587,5 @@ index 041a4cd7..68dd3332 100644
          }
      }
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
index 940e9ffcd..379d03f7b 100644
--- a/Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
+++ b/Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
@@ -1,4 +1,4 @@
-From 3f129e5794812a7a026249ae923b9acfa2849511 Mon Sep 17 00:00:00 2001
+From dc7ba2b869b5b5eefdac16a147446461bb40538f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 22 Jul 2015 18:50:41 -0400
 Subject: [PATCH] Add sender name to commands.yml replacement
@@ -7,19 +7,20 @@ This allows you to use $sender in commands.yml definitions to make
 commands that auto target self.
 
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index f89ad07..a3e9c63 100644
+index 9c80f464..631be1cb 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-@@ -2,6 +2,8 @@ package org.bukkit.command;
+@@ -1,6 +1,9 @@
+ package org.bukkit.command;
  
  import java.util.ArrayList;
- import java.util.logging.Level;
++import java.util.logging.Level;
 +import java.util.regex.Matcher;
 +import java.util.regex.Pattern;
  
  import org.bukkit.Bukkit;
- import org.bukkit.entity.Player;
-@@ -24,7 +26,7 @@ public class FormattedCommandAlias extends Command {
+ 
+@@ -19,7 +22,7 @@ public class FormattedCommandAlias extends Command {
          ArrayList<String> commands = new ArrayList<String>();
          for (String formatString : formatStrings) {
              try {
@@ -28,7 +29,7 @@ index f89ad07..a3e9c63 100644
              } catch (Throwable throwable) {
                  if (throwable instanceof IllegalArgumentException) {
                      sender.sendMessage(throwable.getMessage());
-@@ -42,7 +44,10 @@ public class FormattedCommandAlias extends Command {
+@@ -37,7 +40,10 @@ public class FormattedCommandAlias extends Command {
          return result;
      }
  
@@ -37,9 +38,9 @@ index f89ad07..a3e9c63 100644
 +        if (formatString.contains("$sender")) { // Paper
 +            formatString = formatString.replaceAll(Pattern.quote("$sender"), Matcher.quoteReplacement(sender.getName())); // Paper
 +        } // Paper
-         int index = formatString.indexOf("$");
+         int index = formatString.indexOf('$');
          while (index != -1) {
              int start = index;
 -- 
-2.9.2.windows.1
+2.14.3
 
diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
index 19b9d34dd..adc863e34 100644
--- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From bac0e244d24ae13f16066fb8c866fea62ea88ad3 Mon Sep 17 00:00:00 2001
+From a7bb808c73465c11139f17b0d498acd2b3a3cb58 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 970d651b..4a725d79 100644
+index 73157ff9..fd423664 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1190,6 +1190,13 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 970d651b..4a725d79 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 9de7693a..3c550d06 100644
+index 18549ce0..032d6211 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1028,4 +1028,6 @@ public interface Server extends PluginMessageRecipient {
@@ -87,10 +87,10 @@ index c70d5129..040509c1 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 9d7bdeef..21f898bf 100644
+index b88f31ca..bd0588a2 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -762,4 +762,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -763,4 +763,13 @@ public final class SimplePluginManager implements PluginManager {
      public void useTimings(boolean use) {
          co.aikar.timings.Timings.setTimingsEnabled(use); // Spigot
      }
@@ -105,5 +105,5 @@ index 9d7bdeef..21f898bf 100644
 +
  }
 -- 
-2.13.2
+2.14.3
 
diff --git a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
index 210896a0b..47dd2c553 100644
--- a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From f7bf3b52cb8544319a06bd35ffd803c7e488a6c2 Mon Sep 17 00:00:00 2001
+From 65b664ebccc15a537ec64b3a777ba6481259dde4 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 4a725d79..498dfd33 100644
+index fd423664..5431b17b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1197,6 +1197,15 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 4a725d79..498dfd33 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 3c550d06..4f077b7c 100644
+index 032d6211..83b370e5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1030,4 +1030,6 @@ public interface Server extends PluginMessageRecipient {
@@ -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 f1e9f200..c6613c0a 100644
+index 762eb1d2..23d08336 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 {
+@@ -281,4 +281,10 @@ public class SimpleCommandMap implements CommandMap {
              }
          }
      }
@@ -97,5 +97,5 @@ index 040509c1..0069bcc0 100644
                  confirmed = true;
              } else {
 -- 
-2.13.2
+2.14.3
 
diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
index 245ac9e0f..19df1ce40 100644
--- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
@@ -1,14 +1,14 @@
-From e7f452ae1e545a3dfa9adf5c634a3f17a8c0b791 Mon Sep 17 00:00:00 2001
+From a8aa41de68178cdcd147a3380b5c4bd10f3afd85 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c86c1c5f..57f62ae4 100644
+index 69fbdb3c..6fc00fdf 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -505,5 +505,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -507,5 +507,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       * @return Location where entity originates or null if not yet added
       */
      Location getOrigin();
@@ -22,5 +22,5 @@ index c86c1c5f..57f62ae4 100644
      // Paper end
  }
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0005-MC-Utils.patch b/Spigot-Server-Patches/0005-MC-Utils.patch
index 93465ae6f..bec0b6b66 100644
--- a/Spigot-Server-Patches/0005-MC-Utils.patch
+++ b/Spigot-Server-Patches/0005-MC-Utils.patch
@@ -1,4 +1,4 @@
-From f3d56b8ac9188096f2ada41c09f03d05f57f490f Mon Sep 17 00:00:00 2001
+From 512e126bf403f6ed82dcf54491fe3357a8430464 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -274,7 +274,7 @@ index e0cb6aa6e..bc6383669 100644
  
      public NBTTagList() {}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aa9d024fa..516673c0e 100644
+index 8cede938a..cd2d58bfb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -65,9 +65,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -290,7 +290,7 @@ index aa9d024fa..516673c0e 100644
      // CraftBukkit start - multithreaded fields
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
-@@ -2153,6 +2153,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2158,6 +2158,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      }
  
@@ -299,5 +299,5 @@ index aa9d024fa..516673c0e 100644
          return System.nanoTime() / 1000000L;
      }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index 35ab8156c..fff715ad5 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 5fb416e7d1eb7201ddd177b1bae94cd7c64f4ad5 Mon Sep 17 00:00:00 2001
+From e610c7b15e2671e15ed2c59c617dfe5240fb9c13 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
@@ -596,7 +596,7 @@ index e1cb96a88..8f2afcc32 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 8181ab2f2..f54c654fb 100644
+index 40f06c5bc..4c794a098 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@@ -609,16 +609,16 @@ index 8181ab2f2..f54c654fb 100644
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
-@@ -146,7 +147,7 @@ public abstract class Entity implements ICommandListener {
-     public boolean valid; // CraftBukkit
-     public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
-     public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
+@@ -147,7 +148,7 @@ public abstract class Entity implements ICommandListener {
+     public boolean valid;
+     public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
+     public boolean forceExplosionKnockback; // SPIGOT-949
 -    public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
 +    public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -525,7 +526,6 @@ public abstract class Entity implements ICommandListener {
+@@ -531,7 +532,6 @@ public abstract class Entity implements ICommandListener {
      }
  
      public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
@@ -626,7 +626,7 @@ index 8181ab2f2..f54c654fb 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().d(d0, d1, d2));
              this.recalcPosition();
-@@ -919,7 +919,6 @@ public abstract class Entity implements ICommandListener {
+@@ -925,7 +925,6 @@ public abstract class Entity implements ICommandListener {
  
              this.world.methodProfiler.b();
          }
@@ -635,7 +635,7 @@ index 8181ab2f2..f54c654fb 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 27580a938..35812d561 100644
+index ee2d1f9a9..e8401bba7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -647,7 +647,7 @@ index 27580a938..35812d561 100644
  
  public abstract class EntityLiving extends Entity {
  
-@@ -1862,7 +1862,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1867,7 +1867,6 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void B_() {
@@ -655,7 +655,7 @@ index 27580a938..35812d561 100644
          super.B_();
          this.cI();
          if (!this.world.isClientSide) {
-@@ -1935,9 +1934,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1940,9 +1939,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -665,7 +665,7 @@ index 27580a938..35812d561 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -2013,8 +2010,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2018,8 +2015,6 @@ public abstract class EntityLiving extends Entity {
          } else {
              this.bq = 0;
          }
@@ -674,7 +674,7 @@ index 27580a938..35812d561 100644
      }
  
      protected float g(float f, float f1) {
-@@ -2079,7 +2074,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2084,7 +2079,6 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -682,7 +682,7 @@ index 27580a938..35812d561 100644
          if (this.isFrozen()) {
              this.bd = false;
              this.be = 0.0F;
-@@ -2090,7 +2084,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2095,7 +2089,6 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.b();
          }
@@ -690,7 +690,7 @@ index 27580a938..35812d561 100644
  
          this.world.methodProfiler.b();
          this.world.methodProfiler.a("jump");
-@@ -2113,14 +2106,10 @@ public abstract class EntityLiving extends Entity {
+@@ -2118,14 +2111,10 @@ public abstract class EntityLiving extends Entity {
          this.bg *= 0.98F;
          this.bh *= 0.9F;
          this.r();
@@ -984,7 +984,7 @@ index eeac34998..e4ed2e991 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 516673c0e..8cb7486ba 100644
+index cd2d58bfb..da25a8bea 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -995,7 +995,7 @@ index 516673c0e..8cb7486ba 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1373,7 +1374,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1378,7 +1379,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -1004,7 +1004,7 @@ index 516673c0e..8cb7486ba 100644
         // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1384,22 +1385,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1389,22 +1390,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1906,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644
      }
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index d1559ce61..95a718c8f 100644
--- a/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,4 +1,4 @@
-From 289d49cb724c7f24f635dfb88410a2b490a80629 Mon Sep 17 00:00:00 2001
+From ff154bbf35dc82b964857cdc0ae1a2ab09a5c05a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -24,10 +24,10 @@ index 7ac6a5f1f..8cdeb34d4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c6b7d6c22..bbbd1689e 100644
+index 4c794a098..90be49189 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1745,6 +1745,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1751,6 +1751,7 @@ public abstract class Entity implements ICommandListener {
          return this.a(new ItemStack(item, i, 0), f);
      }
  
@@ -36,7 +36,7 @@ index c6b7d6c22..bbbd1689e 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 3c7488965..0fd29b17e 100644
+index 579e51a0a..2ba5d51a5 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -84,6 +84,17 @@ public class EntityFallingBlock extends Entity {
@@ -76,5 +76,5 @@ index 44b2d4735..0d70dd1d2 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index a0b0d3bc4..92960294b 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,22 +1,22 @@
-From 0a357cb9c574fa7812c4b90a4b59cc2c8082bdcd Mon Sep 17 00:00:00 2001
+From 7a10da3fb20eb14e2662924c5a7d4b94809777cf Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 86c946119..acadeae93 100644
+index 90be49189..00487dd5f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -148,6 +148,7 @@ public abstract class Entity implements ICommandListener {
-     public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
-     public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
+@@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener {
+     public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
+     public boolean forceExplosionKnockback; // SPIGOT-949
      public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
 +    public Location origin; // Paper
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1539,6 +1540,11 @@ public abstract class Entity implements ICommandListener {
+@@ -1545,6 +1546,11 @@ public abstract class Entity implements ICommandListener {
                  }
              }
  
@@ -28,7 +28,7 @@ index 86c946119..acadeae93 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1683,6 +1689,13 @@ public abstract class Entity implements ICommandListener {
+@@ -1689,6 +1695,13 @@ public abstract class Entity implements ICommandListener {
              }
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index 86c946119..acadeae93 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1707,6 +1720,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1713,6 +1726,7 @@ public abstract class Entity implements ICommandListener {
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -101,7 +101,7 @@ index bc6383669..ca9eb2f3b 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 27f428efa..3298cbe6b 100644
+index a35f714eb..957e0101e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1025,6 +1025,12 @@ public abstract class World implements IBlockAccess {
@@ -118,10 +118,10 @@ index 27f428efa..3298cbe6b 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 30641581a..9ee7593b2 100644
+index 51cc15e79..fa2bdabc6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -749,4 +749,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -754,4 +754,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -135,5 +135,5 @@ index 30641581a..9ee7593b2 100644
 +    // Paper end
  }
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
index 857caf88d..65b695c3e 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From 145fbb067892a319be146f8d65e5b89de7f1abb2 Mon Sep 17 00:00:00 2001
+From 1cbc8e2e11753a3b5ca6dd8f1f66efcf629a4bba Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -20,10 +20,10 @@ index 62e6830aa..e524a464f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3dff98596..e712ab370 100644
+index 00487dd5f..9ee8c40a5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -444,9 +444,15 @@ public abstract class Entity implements ICommandListener {
+@@ -450,9 +450,15 @@ public abstract class Entity implements ICommandListener {
              this.fallDistance *= 0.5F;
          }
  
@@ -39,7 +39,7 @@ index 3dff98596..e712ab370 100644
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -456,6 +462,18 @@ public abstract class Entity implements ICommandListener {
+@@ -462,6 +468,18 @@ public abstract class Entity implements ICommandListener {
          this.world.methodProfiler.b();
      }
  
@@ -58,7 +58,7 @@ index 3dff98596..e712ab370 100644
      protected void I() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -512,6 +530,7 @@ public abstract class Entity implements ICommandListener {
+@@ -518,6 +536,7 @@ public abstract class Entity implements ICommandListener {
          this.fireTicks = 0;
      }
  
@@ -67,7 +67,7 @@ index 3dff98596..e712ab370 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index f4ad25dae..4b1c7ad99 100644
+index 82795ee87..f8da1887d 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -204,9 +204,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@@ -87,5 +87,5 @@ index f4ad25dae..4b1c7ad99 100644
          int i;
  
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
index f03f61033..01adf3400 100644
--- a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
@@ -1,4 +1,4 @@
-From f2e3d1efa08111d4321edd7f215ea33c2a3e488d Mon Sep 17 00:00:00 2001
+From 4222ad3d72e67eaf41b1e57ff7d0ba4c45bd6c80 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
@@ -19,10 +19,10 @@ index a197af84f..2217f680c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 35812d561..d99413337 100644
+index e8401bba7..5a6b33981 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -901,6 +901,7 @@ public abstract class EntityLiving extends Entity {
+@@ -906,6 +906,7 @@ public abstract class EntityLiving extends Entity {
                      }
                  }
  
@@ -30,7 +30,7 @@ index 35812d561..d99413337 100644
                  if (flag1) {
                      if (flag) {
                          this.world.broadcastEntityEffect(this, (byte) 29);
-@@ -917,6 +918,7 @@ public abstract class EntityLiving extends Entity {
+@@ -922,6 +923,7 @@ public abstract class EntityLiving extends Entity {
                              b0 = 2;
                          }
  
@@ -38,7 +38,7 @@ index 35812d561..d99413337 100644
                          this.world.broadcastEntityEffect(this, b0);
                      }
  
-@@ -940,6 +942,8 @@ public abstract class EntityLiving extends Entity {
+@@ -945,6 +947,8 @@ public abstract class EntityLiving extends Entity {
                      }
                  }
  
@@ -70,5 +70,5 @@ index e7f0e84d4..e148901e5 100644
                              }
                          }
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
index 22993155e..3fb97f785 100644
--- a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From bf5295b5f9c835c10c679c60f87df9eb14436ca4 Mon Sep 17 00:00:00 2001
+From f9c8c46b3ae377cf61f8102d5e85cd52469efc6a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c291e2605..5ebd3c78f 100644
+index da25a8bea..5348c0cbc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1306,6 +1306,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1311,6 +1311,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -82,5 +82,5 @@ index 80e175e59..7762cb432 100644
              return true;
          }
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
index fc7137c48..89238af03 100644
--- a/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From d6447f966a098b3fc6e8d537225d43e98069cd34 Mon Sep 17 00:00:00 2001
+From 31db3d39b5c57788978d813548990b7baeebc5a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -37,10 +37,10 @@ index ec9a87239..b08274d93 100644
  
                          if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b4f42a71d..e78b3789f 100644
+index 438624dd7..9a1cac844 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2074,6 +2074,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2080,6 +2080,7 @@ public abstract class Entity implements ICommandListener {
  
      @Nullable
      public ScoreboardTeamBase aY() {
@@ -49,5 +49,5 @@ index b4f42a71d..e78b3789f 100644
      }
  
 -- 
-2.13.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
index 6ba67042a..e308b6973 100644
--- a/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
@@ -1,14 +1,14 @@
-From a6c9a8ea8103132cf67dbd2973e5a0f868eda957 Mon Sep 17 00:00:00 2001
+From 829f8ecf34a2f9572199f5378dcec701cc7bc844 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d99413337..83c55dff6 100644
+index 5a6b33981..4c632bb68 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2370,12 +2370,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2375,12 +2375,13 @@ public abstract class EntityLiving extends Entity {
  
      protected void v() {
          if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@@ -23,7 +23,7 @@ index d99413337..83c55dff6 100644
                  world.getServer().getPluginManager().callEvent(event);
  
                  if (event.isCancelled()) {
-@@ -2390,9 +2391,21 @@ public abstract class EntityLiving extends Entity {
+@@ -2395,9 +2396,21 @@ public abstract class EntityLiving extends Entity {
                  itemstack = this.activeItem.a(this.world, this);
              }
  
@@ -46,5 +46,5 @@ index d99413337..83c55dff6 100644
  
      }
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index c65874ebb..c3e0b970b 100644
--- a/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,14 +1,14 @@
-From 111fec9a616acae288907d783fc78ace63ed49ae Mon Sep 17 00:00:00 2001
+From 0d9dbdceb594ba77df16b245c3d6e76d91f197ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 83c55dff6..e9552ff21 100644
+index 4c632bb68..296c05480 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -483,7 +483,13 @@ public abstract class EntityLiving extends Entity {
+@@ -488,7 +488,13 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void a(NBTTagCompound nbttagcompound) {
@@ -23,7 +23,7 @@ index 83c55dff6..e9552ff21 100644
          if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) {
              GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10));
          }
-@@ -786,6 +792,10 @@ public abstract class EntityLiving extends Entity {
+@@ -791,6 +797,10 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setHealth(float f) {
@@ -34,7 +34,7 @@ index 83c55dff6..e9552ff21 100644
          // CraftBukkit start - Handle scaled health
          if (this instanceof EntityPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2258,7 +2268,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2263,7 +2273,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setAbsorptionHearts(float f) {
@@ -56,5 +56,5 @@ index d5c53032a..350881752 100644
      }
  
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch
index 9019fd0da..dbb01f26b 100644
--- a/Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 19fdfda935458294c463662d6fe7826d4a3dbe36 Mon Sep 17 00:00:00 2001
+From c14cbce13cf440eff56cd38c718423c3fbd38cd5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f26a438af..8aba80c07 100644
+index 9a1cac844..05d764fa2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,7 +17,7 @@ index f26a438af..8aba80c07 100644
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -165,7 +166,7 @@ public abstract class Entity implements ICommandListener {
+@@ -171,7 +172,7 @@ public abstract class Entity implements ICommandListener {
          this.length = 1.8F;
          this.ax = 1;
          this.ay = 1.0F;
@@ -27,5 +27,5 @@ index f26a438af..8aba80c07 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.13.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch
index 2d6bb3d62..7dcb010b5 100644
--- a/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 95cd6fa26664fc8b84bf9eeab47e59d53ef5c627 Mon Sep 17 00:00:00 2001
+From d1970bfea52ebbad7919b325fee197544aed4e13 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7e9dbf1a1..7912d05d9 100644
+index 05d764fa2..a6d472139 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2350,7 +2350,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2356,7 +2356,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      public Entity teleportTo(Location exit, boolean portal) {
@@ -20,5 +20,5 @@ index 7e9dbf1a1..7912d05d9 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.13.4
+2.14.3
 
diff --git a/Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
index bb2a732a4..a8f0e9dc9 100644
--- a/Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From c2f58a2ac9c540c526780ff1af9fb6ae849276b3 Mon Sep 17 00:00:00 2001
+From 79f3d91dc543274a2178db9afdc35eb51a49da4b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index c67cb54a3..521f46262 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7a721ffc6..4830dd581 100644
+index 5cc5dbcd7..70fb4f6b0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1652,6 +1652,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1657,6 +1657,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index 7a721ffc6..4830dd581 100644
      }
  
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index c36887797..45e648549 100644
--- a/Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 8d5e21769c3bd1a416a1cb073dd63af77a317ac5 Mon Sep 17 00:00:00 2001
+From 8d9dbd8a595e6f850385054bf6b0c78a067a5b9b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -19,10 +19,10 @@ index 3a942c763..3bd29650c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7912d05d9..e04a7d942 100644
+index a6d472139..1d31bcde8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2073,6 +2073,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2079,6 +2079,7 @@ public abstract class Entity implements ICommandListener {
          return this.getFlag(5);
      }
  
@@ -31,10 +31,10 @@ index 7912d05d9..e04a7d942 100644
      public ScoreboardTeamBase aY() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4830dd581..506eab20d 100644
+index 70fb4f6b0..187e59a08 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1385,7 +1385,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1390,7 +1390,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
@@ -51,5 +51,5 @@ index 4830dd581..506eab20d 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch
index 3393b3303..76fa3ca95 100644
--- a/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From ebfa499c5bd1e3ae80c5a66e9ed471d75e845ed4 Mon Sep 17 00:00:00 2001
+From 96e62684c8419c93831025be82f13947d404a4e9 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
@@ -6,10 +6,10 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e9552ff21..f5b04ca48 100644
+index 296c05480..a09d8964f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -768,10 +768,16 @@ public abstract class EntityLiving extends Entity {
+@@ -773,10 +773,16 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) {
@@ -41,5 +41,5 @@ index d42db9b45..c715138ee 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch
index 666eeba21..9de7667ca 100644
--- a/Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch
@@ -1,11 +1,11 @@
-From ae45b53b34e464b6ea2954ba36e6f460480c90e1 Mon Sep 17 00:00:00 2001
+From c658b95b741b8d95897cc9a261e22eeddb450ace Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0d92e604..b10f670a 100644
+index 1d31bcde8..06857c483 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,7 +17,7 @@ index 0d92e604..b10f670a 100644
      public boolean attachedToPlayer;
      public World world;
      public double lastX;
-@@ -1955,6 +1955,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1961,6 +1961,7 @@ public abstract class Entity implements ICommandListener {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
              // CraftBukkit start
@@ -25,7 +25,7 @@ index 0d92e604..b10f670a 100644
              CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
              Entity orig = craft == null ? null : craft.getHandle();
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
-@@ -1970,7 +1971,13 @@ public abstract class Entity implements ICommandListener {
+@@ -1976,7 +1977,13 @@ public abstract class Entity implements ICommandListener {
                  }
              }
              // CraftBukkit end
@@ -41,5 +41,5 @@ index 0d92e604..b10f670a 100644
              entity.j = 60;
          }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch
index 96c267719..7330858a9 100644
--- a/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,4 +1,4 @@
-From 986ee69978fd3299dd886c2b1c048c903732356c Mon Sep 17 00:00:00 2001
+From c2625c5993c914f71a2ca5b58e02a0185d493b41 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
@@ -32,10 +32,10 @@ index fbe769eb3..d2a542354 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 25641bafd..47872bf32 100644
+index ef096ef65..d46fb1d76 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1108,6 +1108,11 @@ public abstract class Entity implements ICommandListener {
+@@ -1114,6 +1114,11 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean aq() {
@@ -47,7 +47,7 @@ index 25641bafd..47872bf32 100644
          if (this.bJ() instanceof EntityBoat) {
              this.inWater = false;
          } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) {
-@@ -2538,6 +2543,11 @@ public abstract class Entity implements ICommandListener {
+@@ -2544,6 +2549,11 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean bo() {
@@ -114,5 +114,5 @@ index bb0904f86..50811852a 100644
 +    // Paper end
  }
 -- 
-2.13.4
+2.14.3
 
diff --git a/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch
index 81064cbb7..903d391da 100644
--- a/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From bd6532cf43d9fa4c84e78f1e543b3c9927a476b5 Mon Sep 17 00:00:00 2001
+From 3ffa66e7e06aefe0e78de8e9016c593a69a99e40 Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -21,10 +21,10 @@ index ef60c15bd..cec9ea74c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f5b04ca48..3086a36f9 100644
+index a09d8964f..20aac1f38 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1732,6 +1732,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1737,6 +1737,7 @@ public abstract class EntityLiving extends Entity {
                      this.motY = 0.30000001192092896D;
                  }
              } else if (this.cP()) {
@@ -32,7 +32,7 @@ index f5b04ca48..3086a36f9 100644
                  if (this.motY > -0.5D) {
                      this.fallDistance = 1.0F;
                  }
-@@ -1781,6 +1782,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1786,6 +1787,7 @@ public abstract class EntityLiving extends Entity {
                          this.damageEntity(DamageSource.FLY_INTO_WALL, f8);
                      }
                  }
@@ -41,5 +41,5 @@ index f5b04ca48..3086a36f9 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
index f1a3395d6..743ce33eb 100644
--- a/Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,14 +1,14 @@
-From 357ea95e0730fc6d0e78bd65ffd06f1a2721c9e2 Mon Sep 17 00:00:00 2001
+From 95af615122ca9c50035f194d03a16fe5b6626026 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d6c9bfc5d..b8601ae87 100644
+index 98cb84409..5e0e5a3c1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1844,7 +1844,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1849,7 +1849,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.c() == 2) {
                              click = ClickType.MIDDLE;
@@ -18,5 +18,5 @@ index d6c9bfc5d..b8601ae87 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 432bdd50c..f34a9aaa1 100644
--- a/Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From fcb63753987197c3522f2bfe8ea9edc55992e26f Mon Sep 17 00:00:00 2001
+From 584380c58236f4645fe51b24a4dde72986121136 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 94b1602a4..f95b2c573 100644
+index c9054fc91..ee3d37a71 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -17,9 +17,9 @@ index 94b1602a4..f95b2c573 100644
      public EntityArmorStand(World world) {
          super(world);
 @@ -770,4 +771,13 @@ public class EntityArmorStand extends EntityLiving {
-         return this.yaw;
+     public boolean cS() {
+         return false;
      }
-     // CraftBukkit end
 +
 +    // Paper start
 +    @Override
@@ -50,5 +50,5 @@ index 2b66a08ad..8a06cb165 100644
 +    }
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0184-IllegalPacketEvent.patch b/Spigot-Server-Patches/0184-IllegalPacketEvent.patch
index 852beb99c..991d0bee4 100644
--- a/Spigot-Server-Patches/0184-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0184-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 0182b294be4001dd1821f7900ee729adc6bdaca7 Mon Sep 17 00:00:00 2001
+From 3588a36647d6eebbdd3f2e6ea692d0007215d250 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9f05c7da2..a04df7d88 100644
+index 0191a9af2..45a50602b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index 9f05c7da2..a04df7d88 100644
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -2283,8 +2284,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2288,8 +2289,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
                  }
              } catch (Exception exception) {
@@ -27,7 +27,7 @@ index 9f05c7da2..a04df7d88 100644
              }
          } else {
              String s1;
-@@ -2333,8 +2333,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2338,8 +2338,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
                      }
                  } catch (Exception exception1) {
@@ -37,7 +37,7 @@ index 9f05c7da2..a04df7d88 100644
                  }
              } else if ("MC|TrSel".equals(s)) {
                  try {
-@@ -2345,8 +2344,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2350,8 +2349,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          ((ContainerMerchant) container).d(j);
                      }
                  } catch (Exception exception2) {
@@ -47,7 +47,7 @@ index 9f05c7da2..a04df7d88 100644
                  }
              } else {
                  TileEntity tileentity;
-@@ -2487,8 +2485,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2492,8 +2490,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                                      iinventory.update();
                                  }
                              } catch (Exception exception5) {
@@ -57,7 +57,7 @@ index 9f05c7da2..a04df7d88 100644
                              }
                          }
                      } else if ("MC|ItemName".equals(s)) {
-@@ -2587,8 +2584,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2592,8 +2589,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                              this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k)));
                              this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
                          } catch (Exception exception7) {
@@ -68,5 +68,5 @@ index 9f05c7da2..a04df7d88 100644
                      }
                      // CraftBukkit start
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch
index ac15a38d8..5ebd8c1b5 100644
--- a/Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From abaa022c2bdabf7f90dba095f049b34d509858b6 Mon Sep 17 00:00:00 2001
+From d96fca7123fdc2ea33a1e91893c12457104ae42e 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
@@ -19,10 +19,10 @@ index 53147c6e2..5fbb99b7e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a04df7d88..22ead6533 100644
+index 45a50602b..33ae76415 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2627,6 +2627,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2632,6 +2632,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start - Add "isDisconnected" method
      public final boolean isDisconnected() {
@@ -31,5 +31,5 @@ index a04df7d88..22ead6533 100644
      }
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch
index 28cc440d1..a2e46ca55 100644
--- a/Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,14 +1,14 @@
-From 5871fd4ac3a324964d168dbd7803bb6370b9eda0 Mon Sep 17 00:00:00 2001
+From e0cbd06aea1632f171a4cecbf548f1b6c70070ac Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e0ae1f7dd..b4318e4f7 100644
+index 9080006e5..a6ffe144f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1932,6 +1932,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1938,6 +1938,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      protected void o(Entity entity) {
@@ -17,5 +17,5 @@ index e0ae1f7dd..b4318e4f7 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch
index d420b3cf0..e4ca4faff 100644
--- a/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From e94fb300d55b5e6c5fc12301b1d9833c1251a593 Mon Sep 17 00:00:00 2001
+From 1f140e2550084cf0b59a7ee8f8807cda7b3d3917 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -27,10 +27,10 @@ index 70af657f5..af953dda4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b4318e4f7..d744477c9 100644
+index a6ffe144f..f08f4ae56 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -169,6 +169,7 @@ public abstract class Entity implements ICommandListener {
+@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener {
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
      public boolean fromMobSpawner;
@@ -39,10 +39,10 @@ index b4318e4f7..d744477c9 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b437ebf26..35e473a26 100644
+index 650e549b1..341108472 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2183,8 +2183,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2188,8 +2188,11 @@ public abstract class EntityLiving extends Entity {
                  }
              }
  
@@ -56,5 +56,5 @@ index b437ebf26..35e473a26 100644
                  this.C(entity);
              }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch
index 813e9ec35..e693c2164 100644
--- a/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 89a90d5503d97cca00fcd9d1c63e76e72755082a Mon Sep 17 00:00:00 2001
+From aedc767de58a551751ed17db6b5f7cb304013f7a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index f95b2c573..798711d2d 100644
+index ee3d37a71..df0d66ad0 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -779,5 +779,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,10 +20,10 @@ index f95b2c573..798711d2d 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 35e473a26..66b82bbfb 100644
+index 341108472..135a9c0e2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -190,6 +190,7 @@ public abstract class EntityLiving extends Entity {
+@@ -195,6 +195,7 @@ public abstract class EntityLiving extends Entity {
          super.a(d0, flag, iblockdata, blockposition);
      }
  
@@ -31,7 +31,7 @@ index 35e473a26..66b82bbfb 100644
      public boolean bN() {
          return false;
      }
-@@ -224,7 +225,7 @@ public abstract class EntityLiving extends Entity {
+@@ -229,7 +230,7 @@ public abstract class EntityLiving extends Entity {
  
          if (this.isAlive()) {
              if (this.a(Material.WATER)) {
@@ -41,5 +41,5 @@ index 35e473a26..66b82bbfb 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index eae53d3f0..e3c5ea78e 100644
--- a/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 7355a71bfae09f95306314f6191a65c0be0a71d0 Mon Sep 17 00:00:00 2001
+From a3afde5dc2846398d8f989e3ba7796b39ba2d8fe 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
@@ -39,10 +39,10 @@ index 3cc13bdc4..a8f5117bc 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 751989f5a..2b11f68f4 100644
+index 2367ff1f0..9c8828ebd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1509,6 +1509,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1514,6 +1514,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          switch (packetplayinentityaction.b()) {
          case START_SNEAKING:
              this.player.setSneaking(true);
@@ -57,5 +57,5 @@ index 751989f5a..2b11f68f4 100644
  
          case STOP_SNEAKING:
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
index 2ebf8a05e..a3311a55d 100644
--- a/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
@@ -1,14 +1,14 @@
-From f18fa9055375d8a2c362a4a0f41ac414fe424279 Mon Sep 17 00:00:00 2001
+From d63fbf4c1dd23ae430d83aa428fab25e008fc2f1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d744477c9..18eee4944 100644
+index f08f4ae56..1f3aabd01 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -169,6 +169,7 @@ public abstract class Entity implements ICommandListener {
+@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener {
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
      public boolean fromMobSpawner;
@@ -16,7 +16,7 @@ index d744477c9..18eee4944 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1584,6 +1585,10 @@ public abstract class Entity implements ICommandListener {
+@@ -1590,6 +1591,10 @@ public abstract class Entity implements ICommandListener {
              if (origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index d744477c9..18eee4944 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1734,6 +1739,8 @@ public abstract class Entity implements ICommandListener {
+@@ -1740,6 +1745,8 @@ public abstract class Entity implements ICommandListener {
              if (!originTag.isEmpty()) {
                  origin = new Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
              }
@@ -49,10 +49,10 @@ index 0562c6e34..06b064a78 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9429ae1ab..248477661 100644
+index 3ce4fbdbd..58a8f5a78 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -788,5 +788,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -793,5 +793,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          Location origin = getHandle().origin;
          return origin == null ? null : origin.clone();
      }
@@ -64,5 +64,5 @@ index 9429ae1ab..248477661 100644
      // Paper end
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch
index 2a361f890..b732676b8 100644
--- a/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 38a1ad0ace2a044aae7d2b04e679d74b6c7d5a42 Mon Sep 17 00:00:00 2001
+From 77b65abbc5253aa92805413c310b3069b381589c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a07904143..26fbb30f9 100644
+index cc58a4a93..a92bf8967 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2225,14 +2225,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2230,14 +2230,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -42,5 +42,5 @@ index a07904143..26fbb30f9 100644
  
      }
 -- 
-2.14.2
+2.14.3
 
diff --git a/work/Bukkit b/work/Bukkit
index cef79e551..100ab9f2d 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit cef79e55153e438d9ef4b87f4de45cd59233f01e
+Subproject commit 100ab9f2dc90cb717ab9a8c61e555a6618eccdb8
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 53fccdf95..305df9035 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 53fccdf958fe3e10cb9bdb0f396a454e9ac6ead9
+Subproject commit 305df9035faeda09b14f923dc44bdd550d9c9000
diff --git a/work/Spigot b/work/Spigot
index 5695bca2d..95dd09703 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 5695bca2df7302a6a911e8591591925e8852e0e9
+Subproject commit 95dd09703307e923ccd31aeb1e5744c01df2a1b7