diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index 3ac8b29307..6d0c962f6a 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 678d7b0f1eb35e8840a18bad357dd56f9357baa8 Mon Sep 17 00:00:00 2001
+From 15f8a51dda512997d8ae210163f07dc807455333 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
@@ -3507,10 +3507,10 @@ index bba914d7..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5054276f..0993f31b 100644
+index 71fe947b..75f21146 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1575,6 +1575,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1551,6 +1551,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
index 2fa916f860..cc8d945593 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 08ca43a01ec41fc1f62acc5ee776299736289727 Mon Sep 17 00:00:00 2001
+From 7ca40bb76fccf892bb8ead4ba9433e5914e8d693 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 0993f31b1..a631529df 100644
+index 75f21146..694254f1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1468,6 +1468,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1444,6 +1444,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public String getLocale();
  
@@ -32,5 +32,5 @@ index 0993f31b1..a631529df 100644
       * Update the list of commands sent to the client.
       * <br>
 -- 
-2.19.1
+2.20.1
 
diff --git a/Spigot-API-Patches/0009-Add-player-view-distance-API.patch b/Spigot-API-Patches/0009-Add-player-view-distance-API.patch
index 7c0829906c..2215a91864 100644
--- a/Spigot-API-Patches/0009-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0009-Add-player-view-distance-API.patch
@@ -1,14 +1,14 @@
-From 34e2633d0c24e40216010eaa456af3b549302069 Mon Sep 17 00:00:00 2001
+From 5909d262fd56ae7bbc35af5e26f109f8c60a17a1 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 a631529d..4208b0d2 100644
+index 694254f1..d72a7e3d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1492,6 +1492,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1468,6 +1468,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void updateCommands();
  
diff --git a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
index b36065e685..7ee943d62c 100644
--- a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From c9dd0e23a824050ebaecbfc09332e663b89d438e Mon Sep 17 00:00:00 2001
+From bb7b7a5e39dd260604c73a219f275c3982f012a3 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 2096656ee..a9163a5f6 100644
+index 5109a0c3..96d97bf3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1228,7 +1228,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1204,7 +1204,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 2096656ee..a9163a5f6 100644
      public void setResourcePack(String url);
  
      /**
-@@ -1649,6 +1651,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1625,6 +1627,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setViewDistance(int viewDistance);
  
@@ -80,7 +80,7 @@ index 2096656ee..a9163a5f6 100644
      public class Spigot extends Entity.Spigot
      {
 diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-index 4c498016f..aa18a7667 100644
+index 4c498016..aa18a766 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 @@ -10,13 +10,32 @@ import org.bukkit.event.HandlerList;
@@ -117,5 +117,5 @@ index 4c498016f..aa18a7667 100644
       * Gets the status of this pack.
       *
 -- 
-2.19.1
+2.20.1
 
diff --git a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
index 41aa10dc66..dcb8e03acc 100644
--- a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From a8cbfca459051cee3f377582c8d5057c70a96d30 Mon Sep 17 00:00:00 2001
+From 38f50835d8432bd0552c5fbeb5d53b3aa9aa42f6 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 a9163a5f6..d10e3f99d 100644
+index 96d97bf3..d9965ddc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -416,6 +416,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -47,7 +47,7 @@ index a9163a5f6..d10e3f99d 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1788,9 +1810,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1764,9 +1786,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index a9163a5f6..d10e3f99d 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.");
          }
-@@ -1798,9 +1822,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1774,9 +1798,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
@@ -72,5 +72,5 @@ index a9163a5f6..d10e3f99d 100644
              throw new UnsupportedOperationException("Not supported yet.");
          }
 -- 
-2.19.1
+2.20.1
 
diff --git a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
index 222f54d8a9..7811d546c4 100644
--- a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -1,4 +1,4 @@
-From 06cac40ce638d8f3f57fdb32b3e2a6d377800ac4 Mon Sep 17 00:00:00 2001
+From d68ce4cd3ab1df5186f60a74440b14b396b82d40 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
@@ -140,7 +140,7 @@ 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 d10e3f99..49de086e 100644
+index d9965ddc..bf284f2c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -431,7 +431,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -184,7 +184,7 @@ index d10e3f99..49de086e 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -1442,6 +1446,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1418,6 +1422,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -192,7 +192,7 @@ index d10e3f99..49de086e 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1457,6 +1462,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1433,6 +1438,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -200,7 +200,7 @@ index d10e3f99..49de086e 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1506,6 +1512,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1482,6 +1488,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -208,7 +208,7 @@ index d10e3f99..49de086e 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1525,6 +1532,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1501,6 +1508,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -216,7 +216,7 @@ index d10e3f99..49de086e 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1580,6 +1588,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1556,6 +1564,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -224,7 +224,7 @@ index d10e3f99..49de086e 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1601,6 +1610,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1577,6 +1586,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
diff --git a/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
index a9e04486ce..58eab74a69 100644
--- a/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
@@ -1,14 +1,14 @@
-From 6375ebed57681517bbb310753cd556cecb82843a Mon Sep 17 00:00:00 2001
+From 7ef5a54b38b32977873fa0b50998a9425549967d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:04:51 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 71e52b486..36a8e8906 100644
+index 8fc5c83c..040562eb 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -257,6 +257,24 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -312,6 +312,24 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getExpToLevel();
  
@@ -34,5 +34,5 @@ index 71e52b486..36a8e8906 100644
       * Discover a recipe for this player such that it has not already been
       * discovered. This method will add the key's associated recipe to the
 -- 
-2.19.1
+2.20.1
 
diff --git a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
index 1b1066ecb0..a95feb484b 100644
--- a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From af0861873204100e974bd6b187f72c398de472c9 Mon Sep 17 00:00:00 2001
+From c06616f07f969d2090db6ea62443e683748d7f73 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5f3e085e..1e349066 100644
+index c273b9dc..5dc04f47 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index 5f3e085e..1e349066 100644
  import org.bukkit.Achievement;
  import org.bukkit.ChatColor;
  import org.bukkit.Effect;
-@@ -1756,6 +1757,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1732,6 +1733,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
diff --git a/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
index 69b75bf351..6786b3185e 100644
--- a/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
@@ -1,14 +1,14 @@
-From c0769b04ea413231d16ba24c0c274854a5050851 Mon Sep 17 00:00:00 2001
+From c00df0fb555cd5271eec8c911fb1899020bc1a2a Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:28:43 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 36a8e8906..ca789867d 100644
+index 040562eb..b5ed8447 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -387,4 +387,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -442,4 +442,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      @Deprecated
      public void setShoulderEntityRight(Entity entity);
@@ -23,5 +23,5 @@ index 36a8e8906..ca789867d 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.20.1
 
diff --git a/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch
index 8f9701b397..79be6bc9b0 100644
--- a/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,14 +1,14 @@
-From 288d6642d635afea38e19dfd087b11ddd00224c5 Mon Sep 17 00:00:00 2001
+From 36702ab9217feee7fb8138631226888469ca70d2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c9f027f9..7f6ae5d1 100644
+index ddf226a4..db6bcae5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1907,6 +1907,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1883,6 +1883,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(PlayerProfile profile);
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index f498064e29..a1ceac7080 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 7d6ad95befec8dab636401c55bce7bba66ec4c34 Mon Sep 17 00:00:00 2001
+From a4ca9171fc5e2f0aca33ad73661a89e621796f78 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..66d02e048
+index 0000000000..66d02e048b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,132 @@
@@ -144,7 +144,7 @@ index 000000000..66d02e048
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 000000000..145cb274b
+index 0000000000..145cb274b0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,104 @@
@@ -253,7 +253,7 @@ index 000000000..145cb274b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 255b8bed0..fe148495b 100644
+index 255b8bed0a..fe148495bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -297,7 +297,7 @@ index 255b8bed0..fe148495b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index c09961be9..dbf1089ba 100644
+index c09961be9b..dbf1089bac 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -22,6 +22,15 @@ public class Block implements IMaterial {
@@ -317,7 +317,7 @@ index c09961be9..dbf1089ba 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 23dee9b56..eca1284cc 100644
+index 23dee9b563..eca1284cc3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -854,6 +854,7 @@ public class Chunk implements IChunkAccess {
@@ -337,7 +337,7 @@ index 23dee9b56..eca1284cc 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index df2711a5f..732c8793e 100644
+index df2711a5f8..732c8793e5 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -357,7 +357,7 @@ index df2711a5f..732c8793e 100644
  
          return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 0397ce610..44c1dfe92 100644
+index 0397ce610d..44c1dfe926 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -88,7 +88,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -398,7 +398,7 @@ index 0397ce610..44c1dfe92 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index e7ed23453..63533d237 100644
+index e7ed234537..63533d2379 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -445,7 +445,7 @@ index e7ed23453..63533d237 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index 65574eb2e..bc87cfc4b 100644
+index 65574eb2e5..bc87cfc4b6 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -12,12 +12,22 @@ public class CustomFunction {
@@ -472,7 +472,7 @@ index 65574eb2e..bc87cfc4b 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index f28f4f3cd..6b417be1d 100644
+index f28f4f3cd3..6b417be1dd 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -100,7 +100,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@@ -485,7 +485,7 @@ index f28f4f3cd..6b417be1d 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 197d116c6..0ebada490 100644
+index 197d116c68..0ebada4902 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
@@ -538,7 +538,7 @@ index 197d116c6..0ebada490 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 48ec5e047..f36ab639f 100644
+index 48ec5e0471..f36ab639f8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -27,7 +27,8 @@ import org.bukkit.command.CommandSender;
@@ -577,7 +577,7 @@ index 48ec5e047..f36ab639f 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ed859ccf9..31bbbbd96 100644
+index ed859ccf95..31bbbbd969 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -653,7 +653,7 @@ index ed859ccf9..31bbbbd96 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index cd462f7df..45ab33d1a 100644
+index cd462f7dfc..45ab33d1ae 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -168,7 +168,7 @@ public class EntityTracker {
@@ -684,7 +684,7 @@ index cd462f7df..45ab33d1a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 963c7e777..edb1748fd 100644
+index 963c7e777c..edb1748fd8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -837,7 +837,7 @@ index 963c7e777..edb1748fd 100644
          this.methodProfiler.exit();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index c24f4a8fe..e01222ad2 100644
+index c24f4a8fea..e01222ad2b 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -929,7 +929,7 @@ index c24f4a8fe..e01222ad2 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f0e87416e..723fce204 100644
+index f0e87416ec..723fce2049 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -984,7 +984,7 @@ index f0e87416e..723fce204 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index 6c88d0c86..8bf94c1b9 100644
+index 6c88d0c86a..8bf94c1b96 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,11 +1,17 @@
@@ -1006,7 +1006,7 @@ index 6c88d0c86..8bf94c1b9 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8d90b674a..aab49bf68 100644
+index 54e44cba35..3a83819d56 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1030,7 +1030,7 @@ index 8d90b674a..aab49bf68 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index 0da57948a..6571fc595 100644
+index 0da57948a3..6571fc5952 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
@@ -1084,7 +1084,7 @@ index 0da57948a..6571fc595 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index c69209497..68ac014aa 100644
+index c69209497b..68ac014aab 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1104,7 +1104,7 @@ index c69209497..68ac014aa 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5531f5205..209091a9c 100644
+index 5531f5205e..209091a9cb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1212,7 +1212,7 @@ index 5531f5205..209091a9c 100644
  
      public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0a32a767e..60939cc33 100644
+index 0a32a767e6..60939cc338 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1314,7 +1314,7 @@ index 0a32a767e..60939cc33 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a3c07fbac..da57751f7 100644
+index a3c07fbacc..da57751f73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1945,12 +1945,31 @@ public final class CraftServer implements Server {
@@ -1351,7 +1351,7 @@ index a3c07fbac..da57751f7 100644
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 2ab4b11a8..000000000
+index 2ab4b11a8d..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1529,7 +1529,7 @@ index 2ab4b11a8..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 413dd35f0..52a8c48fa 100644
+index 413dd35f06..52a8c48fa4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1565,10 +1565,10 @@ index 413dd35f0..52a8c48fa 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ab944fc67..7993581c2 100644
+index 51f7cc31c9..704acf7386 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1726,6 +1726,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -1584,7 +1584,7 @@ index ab944fc67..7993581c2 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 2f5d7a2a6..311c4f5ca 100644
+index 2f5d7a2a63..311c4f5ca6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -15,6 +15,7 @@ import java.util.concurrent.atomic.AtomicReference;
@@ -1651,7 +1651,7 @@ index 2f5d7a2a6..311c4f5ca 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 3f55381c1..f32e66010 100644
+index 3f55381c15..f32e660107 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.scheduler;
@@ -1733,7 +1733,7 @@ index 3f55381c1..f32e66010 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b7..3d90b3426 100644
+index e52ef47b78..3d90b34268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1745,7 +1745,7 @@ index e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c1071c92e..a99c0cea0 100644
+index c1071c92ee..a99c0cea0f 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
diff --git a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
index 968e71ce3a..971d297770 100644
--- a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
@@ -1,11 +1,11 @@
-From c2d0e15e8095c773c163ea2a5f62ae6dcb8d56c5 Mon Sep 17 00:00:00 2001
+From d5920c305d62be813e80e2ae43c96785de171b62 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 4308269d4..70d5a69f8 100644
+index 8b842a85be..de3a70a07d 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -68,6 +68,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 4308269d4..70d5a69f8 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 42a073d70..4809af8f0 100644
+index 42a073d707..4809af8f00 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -620,7 +620,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -32,7 +32,7 @@ index 42a073d70..4809af8f0 100644
                  double d1 = entityhuman.locY - this.locY;
                  double d2 = entityhuman.locZ - this.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 3c566ebd0..ba40e03fc 100644
+index 3c566ebd0e..ba40e03fcc 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -96,7 +96,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -45,7 +45,7 @@ index 3c566ebd0..ba40e03fc 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 6ca0e19cb..4eaa5d93b 100644
+index 6ca0e19cb9..4eaa5d93b4 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -37,7 +37,7 @@ public final class SpawnerCreature {
@@ -58,7 +58,7 @@ index 6ca0e19cb..4eaa5d93b 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ed227d8e8..dab1be9b6 100644
+index ed227d8e80..dab1be9b61 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,6 +30,7 @@ import org.bukkit.craftbukkit.CraftWorld;
@@ -79,10 +79,10 @@ index ed227d8e8..dab1be9b6 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 7993581c2..4a30435a0 100644
+index 704acf7386..fb24f6019f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1639,7 +1639,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1608,7 +1608,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
diff --git a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
index 2e8c389022..236440396e 100644
--- a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
@@ -1,14 +1,14 @@
-From ffc37bf8c1916af803806e619e2c6ecdbe93cd5e Mon Sep 17 00:00:00 2001
+From 12aca1822c8ab8b773da6665131e058b40aa01ce 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 fa35a75f3..5c1eb0c84 100644
+index fb24f6019f..96de3b7735 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1328,12 +1328,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1297,12 +1297,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index fa35a75f3..5c1eb0c84 100644
  
      @Override
 -- 
-2.18.0
+2.20.1
 
diff --git a/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
index 7de1d17fa4..94ed8a8163 100644
--- a/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
@@ -1,11 +1,11 @@
-From 34ef67b5834b8d47cc7f8947ff4148c6f679fa9b Mon Sep 17 00:00:00 2001
+From 374dda8ac8faa5c882633d55de2b203ef0b92225 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 70d5a69f8..f28ca6bb4 100644
+index de3a70a07d..266ab673e6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -71,6 +71,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -25,7 +25,7 @@ index 70d5a69f8..f28ca6bb4 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 45ab33d1a..3854ae976 100644
+index 45ab33d1ae..3854ae9769 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -200,6 +200,7 @@ public class EntityTracker {
@@ -37,7 +37,7 @@ index 45ab33d1a..3854ae976 100644
          Iterator iterator = this.c.iterator();
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index d00401ce1..dd6c84b4a 100644
+index d00401ce14..dd6c84b4a2 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -435,7 +435,7 @@ public class EntityTrackerEntry {
@@ -50,7 +50,7 @@ index d00401ce1..dd6c84b4a 100644
          return d0 >= (double) (-i) && d0 <= (double) i && d1 >= (double) (-i) && d1 <= (double) i && this.tracker.a(entityplayer);
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e01222ad2..55161af9c 100644
+index e01222ad2b..55161af9c9 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -33,7 +33,7 @@ public class PlayerChunkMap {
@@ -221,7 +221,7 @@ index e01222ad2..55161af9c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 4eaa5d93b..6720a9648 100644
+index 4eaa5d93b4..6720a9648e 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -44,7 +44,7 @@ public final class SpawnerCreature {
@@ -234,10 +234,10 @@ index 4eaa5d93b..6720a9648 100644
  
                      for (int i1 = -b0; i1 <= b0; ++i1) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 31140ed18..1a4527f30 100644
+index 96de3b7735..cbfc84182b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1652,6 +1652,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1621,6 +1621,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
@@ -255,7 +255,7 @@ index 31140ed18..1a4527f30 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a95f93eb7..09df00e94 100644
+index a95f93eb76..09df00e94b 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -108,13 +108,13 @@ public class ActivationRange
diff --git a/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch
index f737480515..1dc8f4f1ec 100644
--- a/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch
@@ -1,11 +1,11 @@
-From a2acd0e3e5d9721b99457509426f39da2ea7c469 Mon Sep 17 00:00:00 2001
+From 3cfda1e5d4c4a1625fbbb8448dbd6f8e0b7215a7 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
 
 
 diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-index 62fba42c3..48fecffdf 100644
+index 62fba42c37..48fecffdfe 100644
 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
 +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
 @@ -398,6 +398,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
@@ -17,7 +17,7 @@ index 62fba42c3..48fecffdf 100644
          public static IChatBaseComponent a(String s) {
              return (IChatBaseComponent) ChatDeserializer.a(IChatBaseComponent.ChatSerializer.a, s, IChatBaseComponent.class, false);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-index 7b18c1640..15d62cf06 100644
+index 7b18c16402..15d62cf066 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 @@ -42,11 +42,28 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
@@ -51,7 +51,7 @@ index 7b18c1640..15d62cf06 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 1a4527f30..512019db4 100644
+index cbfc84182b..3627b7dc6b 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 @@
@@ -61,7 +61,7 @@ index 1a4527f30..512019db4 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -203,6 +204,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -201,6 +202,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
index a9e5dae111..1af9e9096e 100644
--- a/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
@@ -1,4 +1,4 @@
-From e2c17e451f8f9e556faa6e431910468d7bfcbd8e Mon Sep 17 00:00:00 2001
+From 69e1067db568725a4f133c51e832000eeb0c24a3 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9db394d4f..50837d767 100644
+index 9db394d4ff..50837d767f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -190,4 +190,9 @@ public class PaperWorldConfig {
@@ -30,10 +30,10 @@ index 9db394d4f..50837d767 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9de5d0c69..0c35c94b3 100644
+index 3627b7dc6b..8f8f03977c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -714,7 +714,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -712,7 +712,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {
@@ -44,5 +44,5 @@ index 9de5d0c69..0c35c94b3 100644
          return true;
      }
 -- 
-2.19.1
+2.20.1
 
diff --git a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
index a5bb5c402b..bc3afb2246 100644
--- a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
@@ -1,11 +1,11 @@
-From 4d44bf0818687383719df45c13d77915bfa185b4 Mon Sep 17 00:00:00 2001
+From 9b28a61c8f4582b4f8b024e877b09194a42429de 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f543532f8..91eb73b73 100644
+index f543532f89..91eb73b734 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1317,7 +1317,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -22,10 +22,10 @@ index f543532f8..91eb73b73 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 976760e54..991787392 100644
+index 8f8f03977c..43824f9633 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -128,6 +128,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -126,6 +126,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double health = 20;
      private boolean scaledHealth = false;
      private double healthScale = 20;
@@ -36,7 +36,7 @@ index 976760e54..991787392 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1763,6 +1767,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1732,6 +1736,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          getHandle().server.getCommandDispatcher().a(getHandle());
      }
  
diff --git a/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 0c2bc42c14..be00c574b0 100644
--- a/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,11 +1,11 @@
-From 862126880b6fd21227532d383e8e741b7b6aa39e Mon Sep 17 00:00:00 2001
+From e57ce470c534ef83164235eeefc0d6544195a018 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 6d05cc244..55e88a23f 100644
+index 6598612230..bc3a69c513 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -499,7 +499,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,10 +44,10 @@ index 6d05cc244..55e88a23f 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 73abc95e4..4e93e1b6c 100644
+index 43824f9633..1bc8db5e00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1563,6 +1563,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1532,6 +1532,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
@@ -56,5 +56,5 @@ index 73abc95e4..4e93e1b6c 100644
      }
  
 -- 
-2.19.2
+2.20.1
 
diff --git a/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
index 5202495aca..8113f37ab4 100644
--- a/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From b13e3ba091cb6b577876dc9e7ee44ab7b96081b1 Mon Sep 17 00:00:00 2001
+From b8e4918177e37c6148b4801761ae267791154a1f 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 c575fb933c..3337d8c8e4 100644
+index 1bc8db5e00..bf4fd64b93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -724,6 +724,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -722,6 +722,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
@@ -28,5 +28,5 @@ index c575fb933c..3337d8c8e4 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.19.0
+2.20.1
 
diff --git a/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
index 3bc5261589..fddc282424 100644
--- a/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
@@ -1,11 +1,11 @@
-From b2e2e4d12a4f1389e539a0823fec418b05ca6c7b Mon Sep 17 00:00:00 2001
+From 719b9b1643a33cf1def7c539971a09b602bd81e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0778f53e2..30fcf4a72 100644
+index 0778f53e2a..30fcf4a728 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -233,4 +233,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 0778f53e2..30fcf4a72 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c21ebd466..862c5d66b 100644
+index c21ebd4668..862c5d66b7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -420,6 +420,19 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -43,7 +43,7 @@ index c21ebd466..862c5d66b 100644
  
      protected void a(File file, WorldData worlddata) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index a6aed2531..575e3762b 100644
+index a6aed2531f..575e3762b2 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -94,7 +94,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -56,7 +56,7 @@ index a6aed2531..575e3762b 100644
              packetdataserializer.a(this.c);
              packetdataserializer.a(this.d);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 194149eb6..8f376c20d 100644
+index 5236948990..79641a73a8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -73,6 +73,7 @@ public abstract class PlayerList {
@@ -98,7 +98,7 @@ index 194149eb6..8f376c20d 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getRootVehicle();
-@@ -1305,7 +1323,13 @@ public abstract class PlayerList {
+@@ -1309,7 +1327,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end
diff --git a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
index 6bcf907187..94541b0673 100644
--- a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From 58a1b09c393ddac6921607da61d06d946e8df60f Mon Sep 17 00:00:00 2001
+From 16bf1fbf7ec3a0a4b65600c0508ab582cba394c3 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 98a8ce962..aad5a3527 100644
+index 98a8ce9623..aad5a35271 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -33,7 +33,7 @@ import org.bukkit.inventory.MainHand;
@@ -40,10 +40,10 @@ index 98a8ce962..aad5a3527 100644
          this.ct = packetplayinsettings.e();
          this.getDataWatcher().set(EntityPlayer.bx, (byte) packetplayinsettings.f());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a12c30857..cceaba875 100644
+index bf4fd64b93..ecef2a6ad6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1747,8 +1747,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1716,8 +1716,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
@@ -56,7 +56,7 @@ index a12c30857..cceaba875 100644
      }
  
      // Paper start
-@@ -1837,7 +1839,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1806,7 +1808,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
diff --git a/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
index 9aef101891..0619d65f28 100644
--- a/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 0d984d092d2501eb061c821b72120350a3e77d7c Mon Sep 17 00:00:00 2001
+From aa230590808b0776260e52ea7018c88bb1462324 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
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index c97e116aa..e1af5c488 100644
+index c97e116aaf..e1af5c4885 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,10 +42,10 @@ index c97e116aa..e1af5c488 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1f21e54ab..05070285b 100644
+index ecef2a6ad6..35eb4279ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -209,6 +209,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -207,6 +207,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
@@ -65,5 +65,5 @@ index 1f21e54ab..05070285b 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.20.0
+2.20.1
 
diff --git a/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
index 9cadd9630a..49a01ec7f6 100644
--- a/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From b2776d5425d6c74a71d747af2e7714c8ed573402 Mon Sep 17 00:00:00 2001
+From 8ee9cf07c510a72ea8e005a9d38df4724ea36b95 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f09d358e2..f2c172ff1 100644
+index f09d358e29..f2c172ff18 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -85,6 +85,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -68,10 +68,10 @@ index f09d358e2..f2c172ff1 100644
      private boolean canSleepForTick() {
          return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0bc27d914..128fcaf25 100644
+index 9570a8800b..9d44dcb3b2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1332,10 +1332,15 @@ public abstract class PlayerList {
+@@ -1336,10 +1336,15 @@ public abstract class PlayerList {
          entityplayer.playerInteractManager.b(generatoraccess.getWorldData().getGameType());
      }
  
@@ -88,7 +88,7 @@ index 0bc27d914..128fcaf25 100644
          }
          // CraftBukkit end
          // Paper start - Remove collideRule team if it exists
-@@ -1346,6 +1351,7 @@ public abstract class PlayerList {
+@@ -1350,6 +1355,7 @@ public abstract class PlayerList {
          }
          // Paper end
      }
@@ -97,7 +97,7 @@ index 0bc27d914..128fcaf25 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 944151d14..061cbe7fc 100644
+index 944151d140..061cbe7fcf 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,86 +46,123 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
index 33f5a5be4b..472898cee1 100644
--- a/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
@@ -1,14 +1,14 @@
-From 5453e0ce51d21305e13c653786e92a6d324354be Mon Sep 17 00:00:00 2001
+From db0638e9bb0ec9b8e16480de4ddc1cc01c3691f6 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 651133eb9..ca6b9063b 100644
+index 7f05017949..e4d2c4fcf2 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1823,21 +1823,48 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1827,21 +1827,48 @@ public abstract class EntityHuman extends EntityLiving {
          }
          // CraftBukkit end
      }
@@ -62,10 +62,10 @@ index 651133eb9..ca6b9063b 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index be00d79e8..755d288ed 100644
+index e5f782e6f1..af51b3def5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -460,6 +460,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -556,6 +556,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          getHandle().getCooldownTracker().a(CraftMagicNumbers.getItem(material), ticks);
      }
  
diff --git a/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
index f35135f9df..a96948232f 100644
--- a/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From b78600496783d86fb9eae76f64adbaa0b7a05fd7 Mon Sep 17 00:00:00 2001
+From 37a62cfb23664f1077c3edf77bb3e2193c0b0b90 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
@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index a6ac51614..1560dd382 100644
+index a6ac516147..1560dd382a 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -375,9 +375,9 @@ public class ContainerAnvil extends Container {
@@ -26,10 +26,10 @@ index a6ac51614..1560dd382 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 0575e31f6..d6fa84a72 100644
+index 35eb4279ec..b03c62bf2d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1431,6 +1431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1400,6 +1400,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (container.getBukkitView().getType() != prop.getType()) {
              return false;
          }
diff --git a/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
index e96ca630f1..09ef9d3250 100644
--- a/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
@@ -1,14 +1,14 @@
-From 18e19dd85f511e0d940ef1ceffd5a6c5698cc11c Mon Sep 17 00:00:00 2001
+From 9648a3f9d323da9bf5f811180338f2de075a4af9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index ca6b9063b..7343eb25c 100644
+index e4d2c4fcf2..3acd9cdba5 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1475,6 +1475,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1479,6 +1479,7 @@ public abstract class EntityHuman extends EntityLiving {
          return 0;
      }
  
@@ -17,7 +17,7 @@ index ca6b9063b..7343eb25c 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 691c16271..067de3b5f 100644
+index 877598a543..8cd898a946 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
index 9673bdab7a..1eaef32464 100644
--- a/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From f350e382a24cf186d3b9797c1aab1b7c9004960f Mon Sep 17 00:00:00 2001
+From eebb68cff0c614203e44d7be9c04af9c7378a0c1 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 000000000..5caca6439
+index 0000000000..5caca6439d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 000000000..5caca6439
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 93ca93b64..e732d55f9 100644
+index 93ca93b640..e732d55f9f 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index 93ca93b64..e732d55f9 100644
  
      public void a(IChatBaseComponent ichatbasecomponent) {}
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e2fc41d6d..2ff2549d0 100644
+index e2fc41d6d1..2ff2549d0e 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,6 +62,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index e2fc41d6d..2ff2549d0 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 7acdac55e..f1a3be69d 100644
+index 7acdac55e5..f1a3be69d0 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -33,6 +33,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,10 +111,10 @@ index 7acdac55e..f1a3be69d 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 d6fa84a72..eb0330ee1 100644
+index b03c62bf2d..5ea54cb910 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -176,6 +176,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -174,6 +174,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
index 9941f616ac..dbd619bb21 100644
--- a/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From ac4b5a6cfef69ce824ffac274175e930cbce739e Mon Sep 17 00:00:00 2001
+From 4c3b28ba3d9f79371d4233a6866480ac600f359d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 108ec49aa..72f0bec4e 100644
+index 108ec49aa5..72f0bec4e1 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -242,6 +242,7 @@ public class EnchantmentManager {
@@ -22,7 +22,7 @@ index 108ec49aa..72f0bec4e 100644
          List<ItemStack> list = enchantment.a(entityliving);
  
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 4bcae2c21..09d85764b 100644
+index 4bcae2c21b..09d85764b0 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -246,10 +246,12 @@ public class EntityExperienceOrb extends Entity {
@@ -39,10 +39,10 @@ index 4bcae2c21..09d85764b 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eb0330ee1..5a01466e2 100644
+index 5ea54cb910..9a0bab5da0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1023,8 +1023,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1021,8 +1021,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
      }
  
diff --git a/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
index 73635e7a95..5d6e91d4d5 100644
--- a/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 0f2b7a3412a884f55e3589c9d892c9d76d4026cb Mon Sep 17 00:00:00 2001
+From 9b9b51f4a1e80586fd1cff1815e9bba49c8f2272 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 149731353..cae5d323e 100644
+index d8b884e32d..5d5e08ad5e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -63,7 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 149731353..cae5d323e 100644
      private final ItemCooldown ce;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index da5a7b3e9..c5801122d 100644
+index da5a7b3e92..c5801122dd 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -48,7 +48,7 @@ index da5a7b3e9..c5801122d 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5a01466e2..5945089fb 100644
+index 9a0bab5da0..4f849ab1a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -60,7 +60,7 @@ index 5a01466e2..5945089fb 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -1192,8 +1194,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1161,8 +1163,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
  
          // Remove this player from the hidden player's EntityTrackerEntry
@@ -76,7 +76,7 @@ index 5a01466e2..5945089fb 100644
          EntityTrackerEntry entry = tracker.trackedEntities.get(other.getId());
          if (entry != null) {
              entry.clear(getHandle());
-@@ -1234,8 +1242,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1203,8 +1211,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          hiddenPlayers.remove(player.getUniqueId());
  
@@ -91,7 +91,7 @@ index 5a01466e2..5945089fb 100644
  
          getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
  
-@@ -1244,6 +1257,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1213,6 +1226,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entry.updatePlayer(getHandle());
          }
      }
diff --git a/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
index bb1fcd83c8..86faad6ecd 100644
--- a/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 44a509258a75062d27fa7527eba1ee8641088fe3 Mon Sep 17 00:00:00 2001
+From 787d4f401e6ff2e55413dcf8920b14c49ca3586c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,10 +9,10 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b1cba904e..8699cc72f 100644
+index 4f849ab1a1..412ac16dcb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -133,6 +133,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -131,6 +131,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
@@ -20,7 +20,7 @@ index b1cba904e..8699cc72f 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1459,7 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1428,7 +1429,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {
@@ -30,5 +30,5 @@ index b1cba904e..8699cc72f 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.20.0
+2.20.1
 
diff --git a/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
index b4ee17de7b..a546a82e37 100644
--- a/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
@@ -1,14 +1,14 @@
-From 605d907e273d4f15dfee8305b18a4e959e108a6b Mon Sep 17 00:00:00 2001
+From 95cec79483b836faea4891a9aff576091bf11136 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 755d288ed..707091754 100644
+index af51b3def5..b82aa903ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -559,4 +559,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -655,4 +655,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
              entity.remove();
          }
      }
@@ -27,5 +27,5 @@ index 755d288ed..707091754 100644
 +    // Paper end
  }
 -- 
-2.20.0
+2.20.1
 
diff --git a/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch
index 080eb733fa..4753e134cf 100644
--- a/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From a4ed51d175388603e513944bf0bb3c68139ce9e6 Mon Sep 17 00:00:00 2001
+From c12ce1eba38dd8d3e267c2ef474428a7bff54d41 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 6150b56e0..3ca579e38 100644
+index 6150b56e0e..3ca579e381 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -943,7 +943,7 @@ public class Chunk implements IChunkAccess {
@@ -29,7 +29,7 @@ index 6150b56e0..3ca579e38 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 260478166..9b8833fed 100644
+index d9ee36faf3..cdf5eb62e7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -158,7 +158,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -56,7 +56,7 @@ index 260478166..9b8833fed 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cd488d37f..1054367d0 100644
+index cd488d37f2..1054367d0e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -344,7 +344,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -110,7 +110,7 @@ index cd488d37f..1054367d0 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dfd64d1f5..3c9cfad9c 100644
+index dfd64d1f58..3c9cfad9c5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2019,7 +2019,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -123,7 +123,7 @@ index dfd64d1f5..3c9cfad9c 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8131ad08f..fac8f83af 100644
+index 96eff10ffa..ddaa73e83d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -422,7 +422,7 @@ public abstract class PlayerList {
@@ -136,10 +136,10 @@ index 8131ad08f..fac8f83af 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 707091754..c9cbf6979 100644
+index b82aa903ca..a2bf6b0460 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -417,8 +417,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -513,8 +513,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
      }
  
      public void closeInventory() {
@@ -155,10 +155,10 @@ index 707091754..c9cbf6979 100644
      public boolean isBlocking() {
          return getHandle().isBlocking();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1ddb6f99f..5792a7538 100644
+index 412ac16dcb..261bc223e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -740,7 +740,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -738,7 +738,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (getHandle().activeContainer != getHandle().defaultContainer) {
@@ -168,7 +168,7 @@ index 1ddb6f99f..5792a7538 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6c105ef74..83f7116f4 100644
+index 6c105ef742..83f7116f4a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1099,8 +1099,19 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0346-fix-newlines-in-spigot-tab-list-API.patch b/Spigot-Server-Patches/0346-fix-newlines-in-spigot-tab-list-API.patch
index e9b4857941..c8241d83ee 100644
--- a/Spigot-Server-Patches/0346-fix-newlines-in-spigot-tab-list-API.patch
+++ b/Spigot-Server-Patches/0346-fix-newlines-in-spigot-tab-list-API.patch
@@ -1,4 +1,4 @@
-From 1d4327cdfa6929aa07cd81540ad6bebd9c408211 Mon Sep 17 00:00:00 2001
+From ea8c24ad4a4e79738faa19e59cbe7c21ac10b4ef Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 1 Sep 2018 11:29:52 +0100
 Subject: [PATCH] fix newlines in spigot tab list API
@@ -7,10 +7,10 @@ Spigots implementation around the header/footer strips newlines from the
 header/footer, this patch allows the tab list header/footer to retain newlines.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5792a7538..c4b00acfb 100644
+index 261bc223e1..b9dbc78848 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -370,20 +370,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -368,20 +368,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setPlayerListHeader(String header) {
@@ -36,7 +36,7 @@ index 5792a7538..c4b00acfb 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index a067e39d5..5e20a9a61 100644
+index a067e39d54..5e20a9a619 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 @@ -143,7 +143,13 @@ public final class CraftChatMessage {
diff --git a/Spigot-Server-Patches/0349-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0349-Expose-attack-cooldown-methods-for-Player.patch
index 7e1ea47ee5..5cdee6edd9 100644
--- a/Spigot-Server-Patches/0349-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0349-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,14 +1,14 @@
-From 6ffdd619ce3d2edf45cc552d0f89403d8162c186 Mon Sep 17 00:00:00 2001
+From 6f24254031e4e750ab23011d3f06ed6f391dac1f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 9b8833fed..7d096efa2 100644
+index cdf5eb62e7..74110f90f8 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -2053,14 +2053,17 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2057,14 +2057,17 @@ public abstract class EntityHuman extends EntityLiving {
          this.datawatcher.set(EntityHuman.bA, nbttagcompound);
      }
  
@@ -27,10 +27,10 @@ index 9b8833fed..7d096efa2 100644
          this.aH = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c4b00acfb..611833592 100644
+index b9dbc78848..0503d7cf47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1923,6 +1923,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1892,6 +1892,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.resourcePackStatus = status;
      }
  
diff --git a/Spigot-Server-Patches/0351-Improve-death-events.patch b/Spigot-Server-Patches/0351-Improve-death-events.patch
index 2875348ea7..0fcd6147b7 100644
--- a/Spigot-Server-Patches/0351-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0351-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 4e2300fef2e63bd4dcefb50372e99c4220346967 Mon Sep 17 00:00:00 2001
+From 5487350de6114e69b63b7eb168525c884f3a805e Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index bbd5e2b2a..19750ceed 100644
+index bbd5e2b2a8..19750ceed1 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index bbd5e2b2a..19750ceed 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2e2d14d93..e068f19ad 100644
+index 2e2d14d932..e068f19ade 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1537,6 +1537,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -55,7 +55,7 @@ index 2e2d14d93..e068f19ad 100644
          return SoundCategory.NEUTRAL;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 2c54e3e34..a5cc5e284 100644
+index 2c54e3e34a..a5cc5e2842 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -659,7 +659,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -69,7 +69,7 @@ index 2c54e3e34..a5cc5e284 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b4dcdda0c..60aaf0547 100644
+index b4dcdda0cc..60aaf05475 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -76,14 +76,14 @@ public abstract class EntityLiving extends Entity {
@@ -206,7 +206,7 @@ index b4dcdda0c..60aaf0547 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1054367d0..00c2072d7 100644
+index 1054367d0e..00c2072d70 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -72,6 +72,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -257,7 +257,7 @@ index 1054367d0..00c2072d7 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 17fab031b..ee8219e3b 100644
+index 17fab031b4..ee8219e3ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -674,6 +674,22 @@ public enum CraftSound {
@@ -284,10 +284,10 @@ index 17fab031b..ee8219e3b 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 611833592..1c9cc1250 100644
+index 0503d7cf47..5e3f30f52f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1717,7 +1717,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1686,7 +1686,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void sendHealthUpdate() {
@@ -305,7 +305,7 @@ index 611833592..1c9cc1250 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a2841ee53..fdab6734f 100644
+index a2841ee535..fdab6734f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -595,9 +595,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0414-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0414-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index d14a5de40a..21b634b9df 100644
--- a/Spigot-Server-Patches/0414-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0414-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 5c60a4f213a6d16a66551b60c147fb46b86d1b95 Mon Sep 17 00:00:00 2001
+From 06889ceca87d5076316d608d9a8c6e2f2eae8394 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1c90f2f8..32557caf 100644
+index 1c90f2f85a..32557caf2b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index 1c90f2f8..32557caf 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f3234025..61724808 100644
+index ec760325ba..135d25abd2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -95,6 +95,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index f3234025..61724808 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.a(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index fbdb2df2..e1973c5d 100644
+index fbdb2df27d..e1973c5d67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -245,6 +245,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,10 +106,10 @@ index fbdb2df2..e1973c5d 100644
          NBTTagCompound data = getData();
          if (data == null) return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1c9cc125..e05867ed 100644
+index 5e3f30f52f..7fb7aa5c37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -134,6 +134,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
@@ -117,7 +117,7 @@ index 1c9cc125..e05867ed 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1363,6 +1364,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1332,6 +1333,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index 1c9cc125..e05867ed 100644
      public void readExtraData(NBTTagCompound nbttagcompound) {
          hasPlayedBefore = true;
          if (nbttagcompound.hasKey("bukkit")) {
-@@ -1385,6 +1398,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1354,6 +1367,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(NBTTagCompound nbttagcompound) {
@@ -145,7 +145,7 @@ index 1c9cc125..e05867ed 100644
          if (!nbttagcompound.hasKey("bukkit")) {
              nbttagcompound.set("bukkit", new NBTTagCompound());
          }
-@@ -1399,6 +1414,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1368,6 +1383,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.setLong("firstPlayed", getFirstPlayed());
          data.setLong("lastPlayed", System.currentTimeMillis());
          data.setString("lastKnownName", handle.getName());
diff --git a/work/Bukkit b/work/Bukkit
index 7fca5fd456..6ffe5a68d1 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 7fca5fd456b36db811d10990ff1fe9a532f8c5dd
+Subproject commit 6ffe5a68d1cddf647e11344bc4fabad0f20757c0
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c4a67eed99..917411fd80 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c4a67eed9964aebb7add1686b044277cad42dbd4
+Subproject commit 917411fd80bb82d61b09965d87a878d58ca0b3a5