diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index 2aab825b5..65b6da01f 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From ca6ed8efa01a2413602e10e9d81b8187aee6013a Mon Sep 17 00:00:00 2001
+From 5d5dc477a6998af553a15def100d0ef1407b6dba 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
@@ -3488,10 +3488,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 8af5f849..f4eff6b7 100644
+index 965f4207..2c7a17df 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
+@@ -1543,6 +1543,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
 -    }
  }
 -- 
-2.14.3
+2.15.0
 
diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
index b5531fb6d..1ec1e51fa 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 a4b6a1c41d153da1b0abb5c370ba6bac5ad62b86 Mon Sep 17 00:00:00 2001
+From 257154fddcfc4106bb12364b1f54b18f09beb062 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 d2a78f56..e429e701 100644
+index 2c7a17df..313dde80 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1415,6 +1415,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1438,6 +1438,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public String getLocale();
  
@@ -30,5 +30,5 @@ index d2a78f56..e429e701 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
-2.13.0.windows.1
+2.15.0
 
diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
index 787ef8e10..505d25ade 100644
--- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
@@ -1,14 +1,14 @@
-From 50f65fe293c945c2cdfb52ca3bdf07c422f54423 Mon Sep 17 00:00:00 2001
+From 7c0c42257e29ed95c6de268ff1c754d7b233c844 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 e429e701..7fcc7aea 100644
+index 313dde80..5a02b2e8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1429,6 +1429,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1452,6 +1452,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void setAffectsSpawning(boolean affects);
  
@@ -30,5 +30,5 @@ index e429e701..7fcc7aea 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
-2.13.0.windows.1
+2.15.0
 
diff --git a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 277424a2a..4850fcd9e 100644
--- a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From d80dbb15c8d5511bb0a05fb63f58ef9818bcf5f0 Mon Sep 17 00:00:00 2001
+From 9dd9b637954219c83778c62a4b4eb58dc8e05ae6 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 5147cbda..9af61bad 100644
+index 39523ea7..73157ff9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -278,6 +278,26 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index 5147cbda..9af61bad 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 ed3a7197..a5750304 100644
+index 28ea20ef..18549ce0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -226,6 +226,26 @@ public interface Server extends PluginMessageRecipient {
@@ -68,10 +68,10 @@ index ed3a7197..a5750304 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 dd9a6b2b..7e3e3b7f 100644
+index 5a02b2e8..52e11da5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -393,6 +393,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -394,6 +394,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void sendMap(MapView map);
  
@@ -109,5 +109,5 @@ index dd9a6b2b..7e3e3b7f 100644
       * Forces an update of the player's entire inventory.
       *
 -- 
-2.11.0
+2.15.0
 
diff --git a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
index b909d4431..9a7237bab 100644
--- a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 2a34bc238c64b2b4729d088b3f937949e2a3857a Mon Sep 17 00:00:00 2001
+From e73a0072c224fe5f288fc7e8fdc11945c339e1cd 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 00000000..3c2b63db
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index dc593801..993abc13 100644
+index 52e11da5..1a172aa1 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 dc593801..993abc13 100644
  import org.bukkit.Achievement;
  import org.bukkit.ChatColor;
  import org.bukkit.Effect;
-@@ -421,6 +422,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -422,6 +423,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      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 dc593801..993abc13 100644
  
      /**
 -- 
-2.13.0.windows.1
+2.15.0
 
diff --git a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 6f97e03b2..0808110a4 100644
--- a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@@ -1,4 +1,4 @@
-From c90eb35aed8c00523955820c86367fbbe5e39b0c Mon Sep 17 00:00:00 2001
+From dde946c97f9cdee15d021fbc985506491d8970e2 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 abf68a2c..fcb03b83 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 34a9d696..78f877d9 100644
+index 1a172aa1..32b495fd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -400,6 +400,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -401,6 +401,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *
       * @param component the components to send
       */
@@ -51,7 +51,7 @@ index 34a9d696..78f877d9 100644
      public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
          spigot().sendMessage(component);
      }
-@@ -409,6 +410,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -410,6 +411,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *
       * @param components the components to send
       */
@@ -60,5 +60,5 @@ index 34a9d696..78f877d9 100644
          spigot().sendMessage(components);
      }
 -- 
-2.13.0
+2.15.0
 
diff --git a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
index c00905fbb..6a34e769a 100644
--- a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 30c7e1eb9b2001b9dbe9ee911896660c67b63eda Mon Sep 17 00:00:00 2001
+From bb7bbe6c985fed6e6923c89acf68ded7fa53ba93 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 1fc83b57..f04e2541 100644
+index 32b495fd..5ca1a7b2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1185,7 +1185,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1208,7 +1208,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @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 1fc83b57..f04e2541 100644
      public void setResourcePack(String url);
  
      /**
-@@ -1586,6 +1588,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1609,6 +1611,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void setViewDistance(int viewDistance);
  
@@ -110,5 +110,5 @@ index 4c498016..4c838519 100644
       * Gets the status of this pack.
       *
 -- 
-2.13.0.windows.1
+2.15.0
 
diff --git a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
index 8a538fa2d..c7afc62bc 100644
--- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
@@ -1,14 +1,14 @@
-From c1f59bafd368616b4cbf133847cb243aeedafe46 Mon Sep 17 00:00:00 2001
+From 2f60a21de6c259e424793e74209695f7e036852c 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 f04e2541..72c85452 100644
+index 5ca1a7b2..4478d84d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -395,6 +395,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -396,6 +396,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      public void sendMap(MapView map);
  
      // Paper start
@@ -35,7 +35,7 @@ index f04e2541..72c85452 100644
      /**
       * Sends the component to the player
       *
-@@ -418,9 +438,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -419,9 +439,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
@@ -47,7 +47,7 @@ index f04e2541..72c85452 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1728,9 +1750,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1751,9 +1773,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index f04e2541..72c85452 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.");
          }
-@@ -1738,9 +1762,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1761,9 +1785,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
@@ -72,5 +72,5 @@ index f04e2541..72c85452 100644
              throw new UnsupportedOperationException("Not supported yet.");
          }
 -- 
-2.13.0.windows.1
+2.15.0
 
diff --git a/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch
index c2d44bbdb..1db3ab1ec 100644
--- a/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -1,4 +1,4 @@
-From c951f10585428331ded76330d1363aef859b66b5 Mon Sep 17 00:00:00 2001
+From a1287cf6e3c7863a7d815a7951b355c2b7bfa58a 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
@@ -21,10 +21,10 @@ index 9597a9d8..478f2c3c 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 68388416..c69619da 100644
+index 8d29dcbd..0bc47dd6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1405,6 +1405,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1407,6 +1407,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @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()}
@@ -32,7 +32,7 @@ index 68388416..c69619da 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1420,6 +1421,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1422,6 +1423,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @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()}
@@ -40,7 +40,7 @@ index 68388416..c69619da 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1469,6 +1471,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1471,6 +1473,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @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()}
@@ -48,7 +48,7 @@ index 68388416..c69619da 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1488,6 +1491,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1490,6 +1493,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @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()}
@@ -56,7 +56,7 @@ index 68388416..c69619da 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1543,6 +1547,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1545,6 +1549,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -64,7 +64,7 @@ index 68388416..c69619da 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1564,6 +1569,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1566,6 +1571,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -112,10 +112,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 a80b4599..0c3eb03f 100644
+index 4478d84d..39684300 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -410,7 +410,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -411,7 +411,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -124,7 +124,7 @@ index a80b4599..0c3eb03f 100644
       * @param message The message to send
       */
      public void sendActionBar(char alternateChar, String message);
-@@ -477,6 +477,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -478,6 +478,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -132,7 +132,7 @@ index a80b4599..0c3eb03f 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -485,6 +486,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -486,6 +487,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -140,7 +140,7 @@ index a80b4599..0c3eb03f 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -493,6 +495,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -494,6 +496,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -148,7 +148,7 @@ index a80b4599..0c3eb03f 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -501,6 +504,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -502,6 +505,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -156,7 +156,7 @@ index a80b4599..0c3eb03f 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -1399,6 +1403,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1422,6 +1426,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @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()}
@@ -164,7 +164,7 @@ index a80b4599..0c3eb03f 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1414,6 +1419,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1437,6 +1442,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @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()}
@@ -172,7 +172,7 @@ index a80b4599..0c3eb03f 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1463,6 +1469,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1486,6 +1492,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @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()}
@@ -180,7 +180,7 @@ index a80b4599..0c3eb03f 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1482,6 +1489,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1505,6 +1512,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @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()}
@@ -188,7 +188,7 @@ index a80b4599..0c3eb03f 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1537,6 +1545,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1560,6 +1568,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -196,7 +196,7 @@ index a80b4599..0c3eb03f 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1558,6 +1567,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1581,6 +1590,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
diff --git a/Spigot-API-Patches/0071-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0071-Expose-client-protocol-version-and-virtual-host.patch
index c070e535c..5ccdc6f59 100644
--- a/Spigot-API-Patches/0071-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0071-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From a5fb4cfb4fb3e299ad9d232c9fc6b815f56544d5 Mon Sep 17 00:00:00 2001
+From 2d0f0d8b881b61178c0b87ce0f71c9855c79be60 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
@@ -55,10 +55,10 @@ index 00000000..9072e384
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0c3eb03f..611a5be2 100644
+index 39684300..23cc8b5e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -29,7 +29,7 @@ import org.bukkit.scoreboard.Scoreboard;
+@@ -30,7 +30,7 @@ import org.bukkit.scoreboard.Scoreboard;
  /**
   * Represents a player, connected or not
   */
@@ -68,5 +68,5 @@ index 0c3eb03f..611a5be2 100644
      /**
       * Gets the "friendly" name to display of this player. This may include
 -- 
-2.14.2
+2.15.0
 
diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index aa7c0796b..190623a67 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,4 +1,4 @@
-From a3d4b5574fd08f8f3ddeb6a99e82af21cecd175a Mon Sep 17 00:00:00 2001
+From 19d2f5bbd5d683721b54525da8cd8aa6591689ee 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
@@ -1648,10 +1648,10 @@ index 3a95b4465..b5efb9c3f 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 945a2d271..4ad58c034 100644
+index 328a81dcf..f387b623d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -38,7 +38,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
+@@ -41,7 +41,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
  import org.bukkit.conversations.Conversation;
  import org.bukkit.conversations.ConversationAbandonedEvent;
  import org.bukkit.conversations.ManuallyAbandonedConversationCanceller;
@@ -1660,7 +1660,7 @@ index 945a2d271..4ad58c034 100644
  import org.bukkit.craftbukkit.block.CraftSign;
  import org.bukkit.craftbukkit.conversations.ConversationTracker;
  import org.bukkit.craftbukkit.CraftEffect;
-@@ -1624,6 +1624,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1679,6 +1679,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
index a368b3cb6..2cfce16e6 100644
--- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
@@ -1,11 +1,11 @@
-From d08e91be47f7936e38a46397b196dcdb8e5fdf7c Mon Sep 17 00:00:00 2001
+From e4318dc2a3a2974522740ce1aec6e299ebf26cb6 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 9643181fe..fa431b8e2 100644
+index c374efd79..467c5bf1a 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -70,10 +70,10 @@ index eb27d080c..a35f714eb 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 4ad58c034..af225feef 100644
+index f387b623d..fa91ecbef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1487,6 +1487,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1542,6 +1542,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
diff --git a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
index b4d9d7d42..c28344e4f 100644
--- a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
@@ -1,14 +1,14 @@
-From 0ca1499a6e2f0595817058a6e72134d24298ed3a Mon Sep 17 00:00:00 2001
+From df2f6f2f9147373fdf3905ae725faae4050e70aa Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 939233ef7..b7203df1b 100644
+index fa91ecbef..d911a8a08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1190,12 +1190,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1245,12 +1245,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index 939233ef7..b7203df1b 100644
  
      @Override
 -- 
-2.13.3.windows.1
+2.15.0
 
diff --git a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
index cc4c7fc6a..d850b8401 100644
--- a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
@@ -1,4 +1,4 @@
-From fad221dfcc2fc3b1537d43146fab2e3a31ab06d3 Mon Sep 17 00:00:00 2001
+From 499e727e164124868aab6b4af116148f141cbcdf 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
@@ -203,10 +203,10 @@ index e4ed2e991..9627a9be0 100644
 +    // 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 b178fe9aa..a3e2e7fb7 100644
+index d911a8a08..81f005177 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1500,6 +1500,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1555,6 +1555,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().affectsSpawning;
      }
  
@@ -224,5 +224,5 @@ index b178fe9aa..a3e2e7fb7 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.15.0.windows.1
+2.15.0
 
diff --git a/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch
index 08cfdf9a4..327f4684e 100644
--- a/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 58fc9099d5c386c8fe598eccbccbbd4df1da0e38 Mon Sep 17 00:00:00 2001
+From b8ef081c643c1d3128c8fd5d1ad6a2fdd1923caa Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -78,7 +78,7 @@ index 7bcafa8bb..4f6c1c2e7 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3c39751a0..fe40c51a4 100644
+index 81f005177..3a30728e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -88,7 +88,7 @@ index 3c39751a0..fe40c51a4 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -165,6 +166,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -172,6 +173,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -175,5 +175,5 @@ index 3c39751a0..fe40c51a4 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.13.0.windows.1
+2.15.0
 
diff --git a/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch
index 80c5990cf..2e436c89b 100644
--- a/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From afe4ec1115ea71e3dfd24727f188cf06a71aec92 Mon Sep 17 00:00:00 2001
+From 6a7fbc75f38face85e1305be4cc74c608971b302 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -25,10 +25,10 @@ index 4cc74cd65..fa49397ea 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b54da3211..7e95ec70f 100644
+index 3a30728e8..aa5165f65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -616,7 +616,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -623,7 +623,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {
@@ -39,5 +39,5 @@ index b54da3211..7e95ec70f 100644
          return true;
      }
 -- 
-2.13.3.windows.1
+2.15.0
 
diff --git a/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
index b9ef5b59f..f5f6b17a8 100644
--- a/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From 9eea87bda0275ee6c528a2bb2f174a5d8eb1b4b1 Mon Sep 17 00:00:00 2001
+From 38beacf452129cb95545832bc38121498c02b9ee 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
@@ -23,10 +23,10 @@ index 5348c0cbc..5cc5dbcd7 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 357236035..dc9b17350 100644
+index aa5165f65..219daa59b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -81,6 +81,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -88,6 +88,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double health = 20;
      private boolean scaledHealth = false;
      private double healthScale = 20;
@@ -37,7 +37,7 @@ index 357236035..dc9b17350 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1591,6 +1595,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1646,6 +1650,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
      }
  
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 c3e0b970b..51ba41743 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,4 +1,4 @@
-From 0d9dbdceb594ba77df16b245c3d6e76d91f197ee Mon Sep 17 00:00:00 2001
+From 963710f477c9ccd12871c3fdc6e1da211c98bb36 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
@@ -44,10 +44,10 @@ index 4c632bb68..296c05480 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d5c53032a..350881752 100644
+index 219daa59b..7a5866682 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1414,6 +1414,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1469,6 +1469,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
@@ -56,5 +56,5 @@ index d5c53032a..350881752 100644
      }
  
 -- 
-2.14.3
+2.15.0
 
diff --git a/Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch
index cf9766301..3c402b4a4 100644
--- a/Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From a52709629d04ad6a8b18b71154bbcf162fa549d2 Mon Sep 17 00:00:00 2001
+From c9be2323773b315e94239f237592a8f5673f3021 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 350881752..17a14fdc0 100644
+index 7a5866682..5dae65eeb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -626,6 +626,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -633,6 +633,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
@@ -28,5 +28,5 @@ index 350881752..17a14fdc0 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.13.3.windows.1
+2.15.0
 
diff --git a/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
index a81b49c3a..cdb8ab446 100644
--- a/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From d63f6e2ea9bb8f02ea2bf2290fe0492c2e65067f Mon Sep 17 00:00:00 2001
+From 31c05ff06dee6777c80552d785a5d4ba3bc3e80c 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
@@ -45,10 +45,10 @@ index e48121b4a..24d3b29a5 100644
          this.cm = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7c20ef1b0..7776b09d5 100644
+index 5dae65eeb..2fb268c97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1584,8 +1584,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1639,8 +1639,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
@@ -61,7 +61,7 @@ index 7c20ef1b0..7776b09d5 100644
      }
  
      public void setAffectsSpawning(boolean affects) {
-@@ -1722,7 +1724,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1777,7 +1779,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
diff --git a/Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch
index 64454b88c..29494a5b2 100644
--- a/Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch
@@ -1,4 +1,4 @@
-From 2a73ea267a6aa2b91a27fc0974decf7c14cca8e8 Mon Sep 17 00:00:00 2001
+From ba9c71ced4565a513307c6d2a4035ceb6f291065 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
@@ -62,10 +62,10 @@ index 1159eea1a..38359517c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 41330c2a2..f30613672 100644
+index 2fb268c97..89f61026a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -171,6 +171,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -178,6 +178,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
@@ -85,5 +85,5 @@ index 41330c2a2..f30613672 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
          PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
 -- 
-2.14.2
+2.15.0
 
diff --git a/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch
index db09bc044..14539759e 100644
--- a/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From 7f9d61d370211a778162cdd1826cf0dc54c3437f Mon Sep 17 00:00:00 2001
+From dbfc2520f87a5c123b606d7612ef803f733a1682 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,10 +11,10 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 5d971f07b..6a7d10344 100644
+index 6fab8cd17..d8684eed4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-@@ -37,6 +37,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -40,6 +40,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
      static final int MAX_PAGES = 50;
      static final int MAX_PAGE_LENGTH = 320; // 256 limit + 64 characters to allow for psuedo colour codes
      static final int MAX_TITLE_LENGTH = 32;
@@ -22,7 +22,7 @@ index 5d971f07b..6a7d10344 100644
  
      protected String title;
      protected String author;
-@@ -193,7 +194,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -196,7 +197,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
          if (title == null) {
              this.title = null;
              return true;
@@ -31,7 +31,7 @@ index 5d971f07b..6a7d10344 100644
              return false;
          }
  
-@@ -229,7 +230,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -232,7 +233,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
              throw new IllegalArgumentException("Invalid page number " + page + "/" + pages.size());
          }
  
@@ -40,7 +40,7 @@ index 5d971f07b..6a7d10344 100644
          pages.set(page - 1, CraftChatMessage.fromString(newText, true)[0]);
      }
  
-@@ -241,13 +242,13 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -244,13 +245,13 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
  
      public void addPage(final String... pages) {
          for (String page : pages) {
@@ -57,5 +57,5 @@ index 5d971f07b..6a7d10344 100644
              }
  
 -- 
-2.14.2
+2.15.0
 
diff --git a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
index 8e05856bb..8e79ff335 100644
--- a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
@@ -1,14 +1,14 @@
-From bcf1547ff23132599a6a275ded14ae88c49823a6 Mon Sep 17 00:00:00 2001
+From d820d3d50ee4146153086b1026780632e078a60b 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 a8f5117bc..e9f48ecad 100644
+index 9cda8a177..deb0f4a9c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1717,21 +1717,48 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1721,21 +1721,48 @@ public abstract class EntityHuman extends EntityLiving {
          }
          // CraftBukkit end
      }
diff --git a/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
index c9cd18381..33891acd9 100644
--- a/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From fb399ba3c219d0d63174c445afce0cbd4da3475c Mon Sep 17 00:00:00 2001
+From d8d1ff170050ae54c4aebf6eef44034f36344a47 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -26,10 +26,10 @@ index 175753c5a..16ec67569 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f30613672..6642001e7 100644
+index 89f61026a..00bf55f4b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1282,6 +1282,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1337,6 +1337,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (container.getBukkitView().getType() != prop.getType()) {
              return false;
          }
@@ -42,5 +42,5 @@ index f30613672..6642001e7 100644
          return true;
      }
 -- 
-2.14.2
+2.15.0
 
diff --git a/Spigot-Server-Patches/0245-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0245-Expose-client-protocol-version-and-virtual-host.patch
index 9a1dcc342..6f3c7d457 100644
--- a/Spigot-Server-Patches/0245-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0245-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From e05a60bfd0fc59eff42a4ef78d2c2889019c0cd5 Mon Sep 17 00:00:00 2001
+From 8f3d98f7e8848fd6f31d7443b7bb6e59aec262f9 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -111,10 +111,10 @@ index aececa39d..1d4ba3b3d 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6642001e7..4f28d75f5 100644
+index 00bf55f4b..eeab46333 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -129,6 +129,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -136,6 +136,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -136,5 +136,5 @@ index 6642001e7..4f28d75f5 100644
      public double getEyeHeight() {
          return getEyeHeight(false);
 -- 
-2.14.2
+2.15.0
 
diff --git a/work/Bukkit b/work/Bukkit
index 78ce389df..d41ccca23 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 78ce389df2c5e37b943a112949a7af604eb5f38f
+Subproject commit d41ccca23deb0a9d2ae4f151ab4f8be87b17797c
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f46ccd763..558c5a348 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f46ccd7637430f00b4fa7c742a859e3d4b6a5f03
+Subproject commit 558c5a348ca73d6ba8c13d2b68a7df85ed02fafa
diff --git a/work/Spigot b/work/Spigot
index 3d850ecdf..00128b530 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 3d850ecdfb011d0315b6d0d506e4149c6da8233d
+Subproject commit 00128b53078dd6096a8687bceabaf879e449eb64