diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch
index 2cb7c64738..ab704c01a4 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From c59a5c4c7d44ac1e718fb648531bdba8132dbe23 Mon Sep 17 00:00:00 2001
+From f58b39ec3dd2e77e684740b2ea13bc7d1aaecef8 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 19dc1e6a8..69307e252 100644
+index 9f12a1920..b4df9b779 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -580,4 +580,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -593,4 +593,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
index 6b4ac293bc..68b46f29e3 100644
--- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
@@ -1,14 +1,14 @@
-From c98cd92d19f14a732e1ac7e3e3922047e4dbf817 Mon Sep 17 00:00:00 2001
+From 8a669ab697d0c15360d7618826c81c89ca2cb3c8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 69307e252..373204d37 100644
+index b4df9b779..6dd0623bf 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -591,5 +591,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -604,5 +604,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       */
      @Nullable
      Location getOrigin();
diff --git a/Spigot-API-Patches/0119-Entity-getChunk-API.patch b/Spigot-API-Patches/0119-Entity-getChunk-API.patch
index 684593e5b1..83bf01b179 100644
--- a/Spigot-API-Patches/0119-Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/0119-Entity-getChunk-API.patch
@@ -1,4 +1,4 @@
-From dc0c46f1dc30775f7790fca15bfcf4ec99f40fc2 Mon Sep 17 00:00:00 2001
+From ab777ae0adb9a8e9eaaef3e76bb9b531b0cb4d64 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 373204d37..a7f81d17d 100644
+index 6dd0623bf..81d92145e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1,5 +1,7 @@
@@ -17,7 +17,7 @@ index 373204d37..a7f81d17d 100644
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Nameable;
-@@ -598,5 +600,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -611,5 +613,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       * @return True if entity spawned from a mob spawner
       */
      boolean fromMobSpawner();
diff --git a/Spigot-API-Patches/0134-Async-Chunks-API.patch b/Spigot-API-Patches/0134-Async-Chunks-API.patch
index 94f6c723b3..a9a4784cd9 100644
--- a/Spigot-API-Patches/0134-Async-Chunks-API.patch
+++ b/Spigot-API-Patches/0134-Async-Chunks-API.patch
@@ -1,4 +1,4 @@
-From e0bd691e726a2082f30e462d6afb9e3004c1bc56 Mon Sep 17 00:00:00 2001
+From 3f7142e984cbde2cfa7e547152ddad58da19d150 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
@@ -371,10 +371,10 @@ index c5da4d387..1b0744ed9 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a7f81d17d..73b75ffda 100644
+index 81d92145e..373ee2235 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -145,6 +145,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -158,6 +158,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       */
      public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause);
  
diff --git a/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
index 1fc25f2422..8006111c19 100644
--- a/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
+++ b/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 66901f19f7ae0d30e59cbd768611e943d004ce98 Mon Sep 17 00:00:00 2001
+From be2fc371c8aab2bf2560c8d9d79b76d97d8bb818 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:21:23 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 73b75ffd..16151864 100644
+index 373ee2235..148c7b1fd 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -632,5 +632,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -645,5 +645,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       */
      @NotNull
      Chunk getChunk();
@@ -26,5 +26,5 @@ index 73b75ffd..16151864 100644
      // Paper end
  }
 -- 
-2.17.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
index 0ca8cb608b..f5d8d1e709 100644
--- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
+++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -1,4 +1,4 @@
-From 2fae759524a8a56cb30d347edcaa0e1c77d52aac Mon Sep 17 00:00:00 2001
+From 3da86d2abcd148f2ceed99d9ebafd5ea70e9f9d9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 417c015e56..b728a44f5f 100644
+index 417c015e5..b728a44f5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -36,7 +36,7 @@ public class Chunk implements IChunkAccess {
@@ -94,7 +94,7 @@ index 417c015e56..b728a44f5f 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c87d11da5b..faf4d0c0db 100644
+index d9c9748ce..3b8d09953 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -132,7 +132,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -147,7 +147,7 @@ index c87d11da5b..faf4d0c0db 100644
      private String entityKeyString;
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 7390061bf0..c69209497b 100644
+index 7390061bf..c69209497 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -167,7 +167,7 @@ index 7390061bf0..c69209497b 100644
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a3435c11ed..8fb0ecf525 100644
+index 9cdd0331f..7edbbb106 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -9,6 +9,7 @@ import java.util.UUID;
@@ -178,7 +178,7 @@ index a3435c11ed..8fb0ecf525 100644
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Server;
-@@ -43,6 +44,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -44,6 +45,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entity = entity;
      }
  
@@ -192,5 +192,5 @@ index a3435c11ed..8fb0ecf525 100644
          /**
           * Order is *EXTREMELY* important -- keep it right! =D
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 7dbc9ee064..4818228aa3 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From b2b00bd52cd8c46f44492517c2455e3e5ea22e43 Mon Sep 17 00:00:00 2001
+From a633d98c7eded4f7345616985fe256159d9c1ae1 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
@@ -1567,10 +1567,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 6a9957325..5b89da26c 100644
+index 7f0465ec4..99f99148d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1700,6 +1700,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
diff --git a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
index f9817e3029..e8820ec921 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 448e99a666ff2e2d3ff53a03bd499bfeffc8b5bd Mon Sep 17 00:00:00 2001
+From 7d7c425eb85ecf76e8fb6c580c39789e2dc1e6b3 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 5a90376fe..8b826c083 100644
+index 050f21efa..58e037e13 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 {
@@ -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 51df93b18..10c8ece94 100644
+index f24ee385c..106ad00dc 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 51df93b18..10c8ece94 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 ca3393ef8..6f832b331 100644
+index 99f99148d..15c2e1dee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1608,7 +1608,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1613,7 +1613,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
@@ -103,5 +103,5 @@ index ca3393ef8..6f832b331 100644
      @Override
      public void updateCommands() {
 -- 
-2.20.1
+2.21.0
 
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 236440396e..24c394bf98 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 12aca1822c8ab8b773da6665131e058b40aa01ce Mon Sep 17 00:00:00 2001
+From c049f55ba4784e3ac7875678b626a32b51e8fc2c 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 fb24f6019f..96de3b7735 100644
+index 15c2e1dee..0ee063bcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1297,12 +1297,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1302,12 +1302,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index fb24f6019f..96de3b7735 100644
  
      @Override
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index 43170881f8..c86ee68c81 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From fdc2c170dee0be99fab8d71daf0777a1ced71a5f Mon Sep 17 00:00:00 2001
+From ea910af0ba9f49a09f896d853da4893c29bdd0a5 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2b4a784e4..22f757756 100644
+index 6150eb1fc..bff44d535 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -160,6 +160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -101,7 +101,7 @@ index 27debcfca..22027321b 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 73014cd35..da29880db 100644
+index 106ad00dc..470f40622 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -918,6 +918,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -118,10 +118,10 @@ index 73014cd35..da29880db 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 8fb0ecf52..9a5bb0222 100644
+index 7edbbb106..660e59ba1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -800,4 +800,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -816,4 +816,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
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 94ed8a8163..1f7eb0a01f 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 374dda8ac8faa5c882633d55de2b203ef0b92225 Mon Sep 17 00:00:00 2001
+From b17663fbf677eecd6fbf6267217415c338faf4f2 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 de3a70a07d..266ab673e6 100644
+index 58e037e13..e97bb2305 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 de3a70a07d..266ab673e6 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 45ab33d1ae..3854ae9769 100644
+index 45ab33d1a..3854ae976 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 45ab33d1ae..3854ae9769 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 d00401ce14..dd6c84b4a2 100644
+index d00401ce1..dd6c84b4a 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 d00401ce14..dd6c84b4a2 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 e01222ad2b..55161af9c9 100644
+index e01222ad2..55161af9c 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 e01222ad2b..55161af9c9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 4eaa5d93b4..6720a9648e 100644
+index 4eaa5d93b..6720a9648 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 4eaa5d93b4..6720a9648e 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 96de3b7735..cbfc84182b 100644
+index 0ee063bcd..5496fae40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1621,6 +1621,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1626,6 +1626,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
@@ -255,7 +255,7 @@ index 96de3b7735..cbfc84182b 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a95f93eb76..09df00e94b 100644
+index a95f93eb7..09df00e94 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -108,13 +108,13 @@ public class ActivationRange
@@ -276,5 +276,5 @@ index a95f93eb76..09df00e94b 100644
              animalBB = player.getBoundingBox().grow( animalActivationRange, 256, animalActivationRange );
              monsterBB = player.getBoundingBox().grow( monsterActivationRange, 256, monsterActivationRange );
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0054-Add-velocity-warnings.patch b/Spigot-Server-Patches/0054-Add-velocity-warnings.patch
index e979f8fe11..039339dba3 100644
--- a/Spigot-Server-Patches/0054-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0054-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From dc6b34ee4cda4103a48869e9f2900c304aacf0f7 Mon Sep 17 00:00:00 2001
+From 1fed3dbe8acea82704388f970d3636db9e67234f Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4bce56ef..5dc92cb20 100644
+index a92546478..e723ba414 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -201,6 +201,7 @@ public final class CraftServer implements Server {
@@ -17,10 +17,10 @@ index f4bce56ef..5dc92cb20 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9a5bb0222..a82717f5c 100644
+index 660e59ba1..466750f77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -265,12 +265,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -266,12 +266,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public void setVelocity(Vector velocity) {
          Preconditions.checkArgument(velocity != null, "velocity");
          velocity.checkFinite();
@@ -91,5 +91,5 @@ index 8e32c4e2c..c080a6118 100644
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
                  dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
 -- 
-2.20.1
+2.21.0
 
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 1af9e9096e..5e3c88a423 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 69e1067db568725a4f133c51e832000eeb0c24a3 Mon Sep 17 00:00:00 2001
+From 787f106b9e19dbff7d5063e7b864b9915d6f4c30 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 9db394d4ff..50837d767f 100644
+index 9db394d4f..50837d767 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 9db394d4ff..50837d767f 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3627b7dc6b..8f8f03977c 100644
+index b8400876e..237210cc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -712,7 +712,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -717,7 +717,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {
@@ -44,5 +44,5 @@ index 3627b7dc6b..8f8f03977c 100644
          return true;
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
index 8d8d7d1295..45667f8a9e 100644
--- a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From b2e44e33ca2732e58ad8b3a8e0d9e0d7e1608f74 Mon Sep 17 00:00:00 2001
+From 2e1c82ecd4f7f25aeba48a3070d804a3de739dc7 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
@@ -22,7 +22,7 @@ index b57f48035..f944eff87 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 94770aaf7..a3e521cb9 100644
+index 237210cc8..5b9f2dd4a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -126,6 +126,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -36,7 +36,7 @@ index 94770aaf7..a3e521cb9 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1732,6 +1736,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1737,6 +1741,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 5bb1466bf3..9162b7c973 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 0a43ff4f2dc9135098b7e6eb36effc893f1f4546 Mon Sep 17 00:00:00 2001
+From d5f356741088cf998212fb5f162161fd49a60ce8 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 2357cfbd6..69961bbfb 100644
+index a12cc1e92..2454083b2 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 2357cfbd6..69961bbfb 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f10174524..1e2ea437c 100644
+index 5b9f2dd4a..d0f8ad0b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1532,6 +1532,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1537,6 +1537,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
@@ -56,5 +56,5 @@ index f10174524..1e2ea437c 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
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 8113f37ab4..b612a76f0c 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 b8e4918177e37c6148b4801761ae267791154a1f Mon Sep 17 00:00:00 2001
+From 61bdfa719486008ab22f8a9efa127db9fa5dbc76 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 1bc8db5e00..bf4fd64b93 100644
+index d0f8ad0b6..ff9c2c04f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -722,6 +722,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -727,6 +727,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
@@ -28,5 +28,5 @@ index 1bc8db5e00..bf4fd64b93 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
index 20aa396a07..3648ed4846 100644
--- a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 14480770961d8973ac54265353f75e7928261ebd Mon Sep 17 00:00:00 2001
+From ee2f6ed876e06024c6daf383f58a4b4de68a357d 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
@@ -40,10 +40,10 @@ index 2665faa6c..7ed9903a8 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 bd95e1778..f3f3e81b2 100644
+index ff9c2c04f..59bfcce68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1716,8 +1716,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1721,8 +1721,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
@@ -56,7 +56,7 @@ index bd95e1778..f3f3e81b2 100644
      }
  
      // Paper start
-@@ -1806,7 +1808,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1811,7 +1813,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
diff --git a/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
index 71530ccfef..b09842860e 100644
--- a/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
@@ -1,4 +1,4 @@
-From 3569f378c781dc08ac98caa7de3f38f3d199e003 Mon Sep 17 00:00:00 2001
+From 1874cc24efdd0fee1e491b481b6e071f548a1adf Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
@@ -49,10 +49,10 @@ index ce43b4bc5..98065d6b0 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a82717f5c..67530ba0f 100644
+index 466750f77..84a58c7dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -839,5 +839,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -855,5 +855,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          Location origin = getHandle().origin;
          return origin == null ? null : origin.clone();
      }
diff --git a/Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch
index b5ee37334d..722c5b4f04 100644
--- a/Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From 3d24b5f762730dd26308701afe17ecc1166428dc Mon Sep 17 00:00:00 2001
+From 4dd7cd6ff065e63d4491c46a078e5d08ca3672b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -26,10 +26,10 @@ index 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 47e8ef2de..7a74ce26d 100644
+index c5f228455..d85e62252 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1400,6 +1400,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1405,6 +1405,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (container.getBukkitView().getType() != prop.getType()) {
              return false;
          }
diff --git a/Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch
index 045ea7b33c..1bc2fd148e 100644
--- a/Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From d477fc926aea0e4dcbee2979cb44c09ba5d508be Mon Sep 17 00:00:00 2001
+From ad0e9fc95bf0a33085cf12ea78bb21d16cdbd83d 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
@@ -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 01547b31e..52a463f75 100644
+index dafc2948c..e6dadde80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1021,8 +1021,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1026,8 +1026,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
      }
  
diff --git a/Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch
index 48789aa4b2..8d757b7695 100644
--- a/Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From f2a9844d0bbb0a5768592e8915f28dde97969a2f Mon Sep 17 00:00:00 2001
+From e97e5e72de7f38b3261938e969c6c537a26ebf8a 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
@@ -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 52a463f75..66192415d 100644
+index e6dadde80..66873e98f 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 52a463f75..66192415d 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -1161,8 +1163,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1166,8 +1168,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 52a463f75..66192415d 100644
          EntityTrackerEntry entry = tracker.trackedEntities.get(other.getId());
          if (entry != null) {
              entry.clear(getHandle());
-@@ -1203,8 +1211,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1208,8 +1216,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          hiddenPlayers.remove(player.getUniqueId());
  
@@ -91,7 +91,7 @@ index 52a463f75..66192415d 100644
  
          getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
  
-@@ -1213,6 +1226,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1218,6 +1231,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entry.updatePlayer(getHandle());
          }
      }
diff --git a/Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch
index 9115813ff2..3313fd484b 100644
--- a/Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 116352b0a8afcb39408d560294b3561155ebe1e2 Mon Sep 17 00:00:00 2001
+From 679c14d68a179fc09e6868d4cd9438d47daa6dff 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,7 +9,7 @@ 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 66192415d..e8450a565 100644
+index 66873e98f..62235efde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -131,6 +131,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -20,7 +20,7 @@ index 66192415d..e8450a565 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1428,7 +1429,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1433,7 +1434,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {
diff --git a/Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch
index cb311c658e..08561b1daa 100644
--- a/Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 9ccdc6edf0547373e3e6ffd692099c5f54b4a069 Mon Sep 17 00:00:00 2001
+From 858d3e0aec628f0b54d8a3bece5ce35619d1b634 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 67530ba0f..d4a8fb16b 100644
+index 84a58c7dc..a0e1a70d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -542,14 +542,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -558,14 +558,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return false;
          }
          final CraftEntity other = (CraftEntity) obj;
diff --git a/Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch
index 2c924f7f78..d5250609e5 100644
--- a/Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From a3bcf6f34aeef3c2d225a81b1df7ed35c134abb5 Mon Sep 17 00:00:00 2001
+From 7cf1b664e72ac6c1deecb241d9c9577c5e32777e 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
@@ -155,10 +155,10 @@ index 9b19dce9b..cb7697f80 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 e8450a565..29eeb3e29 100644
+index 62235efde..47426d8fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -738,7 +738,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -743,7 +743,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (getHandle().activeContainer != getHandle().defaultContainer) {
@@ -168,7 +168,7 @@ index e8450a565..29eeb3e29 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 e75c188b5..167a3baec 100644
+index acc80d068..2cfe8afe1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1110,8 +1110,19 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch
index e3dc3844d6..7dad973fa1 100644
--- a/Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,4 +1,4 @@
-From b3314d8893709cd8c8325e7ef065690851c75c4f Mon Sep 17 00:00:00 2001
+From 9c9a577ff54d9c95f6b6759b31da79273e864dee 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
@@ -27,10 +27,10 @@ index cc1bc01b1..4bbf57752 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 29eeb3e29..7a5d0176b 100644
+index 47426d8fd..7a918ea72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1892,6 +1892,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1897,6 +1897,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.resourcePackStatus = status;
      }
  
diff --git a/Spigot-Server-Patches/0346-Improve-death-events.patch b/Spigot-Server-Patches/0346-Improve-death-events.patch
index 1e05733754..055755ab0b 100644
--- a/Spigot-Server-Patches/0346-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0346-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From abd95df904a7c8ca358ce81bce7e5e570b90034c Mon Sep 17 00:00:00 2001
+From da5ff47c5f1e7f19ad1a558c85dc31a25b215fd2 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
@@ -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 7a5d0176b..da54a4529 100644
+index 7a918ea72..8d32982c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1686,7 +1686,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1691,7 +1691,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void sendHealthUpdate() {
@@ -305,7 +305,7 @@ index 7a5d0176b..da54a4529 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 93da4c726..054ebc82b 100644
+index e76862ef4..68e30185a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -600,9 +600,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 62cd3a0bc3..e720f63fbe 100644
--- a/Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 5b3800c25be7d699871cabe943901ec67dbd70de Mon Sep 17 00:00:00 2001
+From fb964090a750bb5e7bce0e13a43b0c77089c35d0 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
@@ -106,7 +106,7 @@ index fbdb2df27..e1973c5d6 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 da54a4529..8e0cac8df 100644
+index 8d32982c5..a03796cd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -117,7 +117,7 @@ index da54a4529..8e0cac8df 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1332,6 +1333,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1337,6 +1338,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index da54a4529..8e0cac8df 100644
      public void readExtraData(NBTTagCompound nbttagcompound) {
          hasPlayedBefore = true;
          if (nbttagcompound.hasKey("bukkit")) {
-@@ -1354,6 +1367,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1359,6 +1372,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(NBTTagCompound nbttagcompound) {
@@ -145,7 +145,7 @@ index da54a4529..8e0cac8df 100644
          if (!nbttagcompound.hasKey("bukkit")) {
              nbttagcompound.set("bukkit", new NBTTagCompound());
          }
-@@ -1368,6 +1383,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1373,6 +1388,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/Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch
index 4a0f107264..5a737a2697 100644
--- a/Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From 180010dcd9ff9844849ea2416ca3c4046231b5d3 Mon Sep 17 00:00:00 2001
+From dd23504083434453e3791d16ef952d747eba9bd3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8e0cac8df..76d5eaa7f 100644
+index a03796cd5..eb5971ac1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1937,6 +1937,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1942,6 +1942,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetCooldown();
      }
diff --git a/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch
index b19910bfa0..c7ffe1db28 100644
--- a/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 1dbf386fc08f6efe1e5dcdea5c9df5bf427cd8b5 Mon Sep 17 00:00:00 2001
+From a47a1c2705956a50668c50cda94cf19fc3843d84 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -98,7 +98,7 @@ index b1630137e..df416e3b5 100644
              if (entity != null) {
                  UUID uuid = nbttagcompound1.a("Attach");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5b4bce464..2d436feab 100644
+index 0624848cc..9faed9303 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1084,6 +1084,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -110,10 +110,10 @@ index 5b4bce464..2d436feab 100644
              return regionLimited.addEntity(entity, spawnReason);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d4a8fb16b..51f70c5ee 100644
+index a0e1a70d4..a12dd4779 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -845,5 +845,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -861,5 +861,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean fromMobSpawner() {
          return getHandle().spawnedViaMobSpawner;
      }
diff --git a/work/Bukkit b/work/Bukkit
index 451bd74e46..7634491fde 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 451bd74e462ddbe3f77afb12db21bc08ed78e76a
+Subproject commit 7634491fdee5c9ac4f0bfcf0b4bd1b51c2072b0d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 0bf75bbde2..0e1cea5a4a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0bf75bbde2df2a715d0e637e2c8972e904597b99
+Subproject commit 0e1cea5a4a4b41004912ab7a8b2871349b1ef4a0