diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index 0b50f875e5..0468e151ae 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -4459,7 +4459,7 @@ index bd6dfddb3c076cf92588dd508975db0eee5c2962..d643ff0a0ae9d45711c9a40fc12af681
      private final MinecraftServer server;
      public final WorldDataServer worldDataServer; // CraftBukkit - type
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index dd83cc2cc580b997a9b4f8f8b6e1176cb45e9610..3bdaca5fd461b4923c857b236472dd98d23f43a0 100644
+index 62cdb32a63cdcbaee80946f73d23817bbb455488..721a1c6bd4505cb132e7004c45b795d4959389e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -85,6 +85,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 703cf62b37..27c0b8507b 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1489,7 +1489,7 @@ index 2c671629a43f42da8335e7216f9fd399bb878729..eb3269e0ea3ce33d08e9eee3bca7cf43
                      PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
                  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6b09630279b14a697bcc492655897f4db799ca18..13fe3fbf589d7528708e9fa7bed65dabde24a9ae 100644
+index b9b055923bb70e7b9fc9cd69c28bd06d7836a38c..213e8512247e9873563ad606a7e3a2a3ca409718 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
index 7e38388088..0cdd1fd061 100644
--- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
@@ -5,7 +5,7 @@ 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 ca7fa1ee3ebddb8e395395fcce35059f2e0ee52a..57eb0223477f44e061e916b0c046bdd136de1c0e 100644
+index 8d4a0513df27767053342eddda05398eae7b46be..cebf6f85eea3faea8fecb112234ea23b40cd4d9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1370,12 +1370,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
index 4f2a000148..fb173c8618 100644
--- a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
@@ -9,7 +9,7 @@ This is a duplicate API from spigot, so use our duplicate subclass and
 improve setPosition to use raw
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 13fe3fbf589d7528708e9fa7bed65dabde24a9ae..5bed3682af9eb63b355bb24bbee466a05ae7cc34 100644
+index 213e8512247e9873563ad606a7e3a2a3ca409718..2265fa3c04305e18653b4b37a0d1d36b261521d7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -143,7 +143,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch
index be8b883421..6d46ff6c9c 100644
--- a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch
@@ -52,7 +52,7 @@ index 3a6e780007bc1b1fa799166daa01d3a9e15c7ab0..535056c64ef866e645b1bfbd149b50c5
  
          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 57eb0223477f44e061e916b0c046bdd136de1c0e..01f7d2ac7d4fb639ed9561c25777dea65210e050 100644
+index cebf6f85eea3faea8fecb112234ea23b40cd4d9c..f933af87971ae96f154f26be2a8c122670e3cf64 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 @@
diff --git a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch
index 775a5691a5..a9d43064e9 100644
--- a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch
@@ -30,7 +30,7 @@ index cd47a4ca069df26969de3051c2aac80540093818..abbf59bb91021821876a8960e8f77fac
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 01f7d2ac7d4fb639ed9561c25777dea65210e050..a7526e8f5e2fe3b22133181659be791acbc05d57 100644
+index f933af87971ae96f154f26be2a8c122670e3cf64..c90d3c8fe0965f437fe17979978f1189a27851ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -764,7 +764,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
index 8313c44c6e..63db7ba56d 100644
--- a/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
@@ -79,7 +79,7 @@ index 76091ab3f149decc0d3c848b79edd24e20cf181d..a360711ea14983e8df34caa5edda80a0
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 3bdaca5fd461b4923c857b236472dd98d23f43a0..5f968e8988c3bd20c0f0c078c8f4038630098c8c 100644
+index 721a1c6bd4505cb132e7004c45b795d4959389e3..9913d0136841dac35b6649cb1afbe1e93b36bf4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -178,28 +178,11 @@ public final class CraftItemStack extends ItemStack {
diff --git a/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch
index f59434cb53..3ed46d2950 100644
--- a/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5bed3682af9eb63b355bb24bbee466a05ae7cc34..675b6b521f0583ccbc9f34cbc38c0c32d7e7f3f7 100644
+index 2265fa3c04305e18653b4b37a0d1d36b261521d7..ca1f4bdf81600d2e72564e5dba1df0d69877bdce 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -174,6 +174,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
index 7dbef00671..d7effbc682 100644
--- a/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
@@ -6,7 +6,7 @@ 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 3d28ed4de1956d5ca7d11b63934a2bc174ef9d76..0654819e8fbbe923b1aa439983af020dc39c6734 100644
+index 2e8105fe1d0f5f953ac8ba94df3e8eb66b7813d7..532698f80bb2e266f27ae1d4b70c80138560b8cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -773,6 +773,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch
index a15bd843b7..49c7705dca 100644
--- a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch
@@ -57,7 +57,7 @@ index d1581c9d9838797eb425020d21bd0fba432e5652..99dc43159f240135957aee35f6129f19
              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 675b6b521f0583ccbc9f34cbc38c0c32d7e7f3f7..b7982bbff805b7bc73c9ce74007f32cf05eac5b1 100644
+index ca1f4bdf81600d2e72564e5dba1df0d69877bdce..7fb344d9ef8f5c7a6c6ed5e7256d55860726c6f2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -75,6 +75,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0089-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0089-Configurable-RCON-IP-address.patch
index 0aa53ccbbf..76224288ca 100644
--- a/Spigot-Server-Patches/0089-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0089-Configurable-RCON-IP-address.patch
@@ -45,7 +45,7 @@ index d7e81a6d99fcbf1d71f8c1f42b5138244000f584..729455ce53944a9afaaa3e30052ab44f
      }
  
 diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
-index 064c4b24e268112770245de806217e84051dc4ff..5aea8b8c2c39bd747ecba2cdd0f6a57565c336f9 100644
+index 1afa2b58d04c6169d26336f7871489d7db34ec90..e550b8428245ef2bc0265ae6267bb7e1cabec35c 100644
 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
 @@ -28,7 +28,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
diff --git a/Spigot-Server-Patches/0103-Add-server-name-parameter.patch b/Spigot-Server-Patches/0103-Add-server-name-parameter.patch
index 2b217e2f10..d25dd67633 100644
--- a/Spigot-Server-Patches/0103-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0103-Add-server-name-parameter.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a86eeac5abdd5b5512dd290e61361910672909a0..21295058e25c8d5a7b4867fc9f6120e9a6935b26 100644
+index a111987658a6d89fc3fe970b1db37a7f3517b9bd..b1157195cf00a05d3417bccf781fdf58ff9919b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -137,6 +137,14 @@ public class Main {
diff --git a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
index 9f2a59742a..e709a14824 100644
--- a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
@@ -38,10 +38,10 @@ index f7f76bca254dc7bc5792e449feeaa113a96c93e4..d0b04707e830fbaf3a6bfe92637e4432
              entitywitch.prepare(this.world, this.world.getDamageScaler(entitywitch.getChunkCoordinates()), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
              entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 28f2b741ca972c72c97f313171c2aed8c65c20ed..5368833da677d43e891517839ff9e4e2106db07b 100644
+index f4abad0c0e7e2a57965311ee0a82224154f752aa..47f8c995025f26607baf3b80b8465f6df78a08ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1068,6 +1068,14 @@ public class CraftEventFactory {
+@@ -1080,6 +1080,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
index 5393bd84ef..765101384d 100644
--- a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,7 +18,7 @@ index 2e25aba27993608ed7ee1cfb7ae8ee60bc74feda..c13a47382d0a7456fa5035a64f42a6ed
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5368833da677d43e891517839ff9e4e2106db07b..d72cbc0b0f9cc4f412122deda163764dc3908396 100644
+index 47f8c995025f26607baf3b80b8465f6df78a08ff..9a4d74f6e241dd4e1785ed5bad0eac74b3130fca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -120,6 +120,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index 5368833da677d43e891517839ff9e4e2106db07b..d72cbc0b0f9cc4f412122deda163764d
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -1027,6 +1028,17 @@ public class CraftEventFactory {
+@@ -1039,6 +1040,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
index 55bf229701..540f7cb9aa 100644
--- a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
@@ -71,10 +71,10 @@ index 5cc122fc0e80bd67160c8b4a7a469edfb6e24808..795685f1eed489b8323c7a8528b2bbd4
  
          Vec3D vec3d = this.getMot();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d72cbc0b0f9cc4f412122deda163764dc3908396..6620d92d73bc54a99a0a583db880682d9ed26ea2 100644
+index 9a4d74f6e241dd4e1785ed5bad0eac74b3130fca..ac5f492fd0d837da150e415bc007c10fe7ee3714 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1172,6 +1172,16 @@ public class CraftEventFactory {
+@@ -1184,6 +1184,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch
index 3dc2d2164c..a7acfc5233 100644
--- a/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch
@@ -18,7 +18,7 @@ index 275c1d2d1eb2649de9a9b5aece6e88c21362efba..d72ba7f76c42fd525a5b59a999a0c08e
  
      public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> a() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f8e141190c43bf9be1a7d782e8a22d74c5dedd95..bcf855b549e24929865ce4ca32ce15975b06f951 100644
+index 9e9d054ed9d345eb7ab76ad9c3526889aeb220e3..e7c42fb4fd1235a934c16f4cccc1b1a66b3672a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -221,6 +221,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch
index 8e1da02a97..d98c82248d 100644
--- a/Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b7982bbff805b7bc73c9ce74007f32cf05eac5b1..cc5fea8bce240e0585a334eeb311ce040b9ca040 100644
+index 7fb344d9ef8f5c7a6c6ed5e7256d55860726c6f2..bfe7848655498287e357593259e188f161292d3e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -961,11 +961,13 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch
index b57da83a46..ecce73596d 100644
--- a/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch
@@ -73,7 +73,7 @@ index 793d4d928bac4febf090291eb773871b492cdc6d..28478370fc182751178f7dd6c2043521
      // Spigot Start
      private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index cc5fea8bce240e0585a334eeb311ce040b9ca040..753efa30bdb0af9ac2b0ad11dfb7a6b052f91a09 100644
+index bfe7848655498287e357593259e188f161292d3e..27a79ee13dc65f389136dc1cc1546259d9a89f9c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1072,10 +1072,15 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
index ddace6af6c..cf1139180d 100644
--- a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -245,7 +245,7 @@ index 28478370fc182751178f7dd6c20435218174c700..737159212c5139ba07dca2484c6cce89
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 753efa30bdb0af9ac2b0ad11dfb7a6b052f91a09..a17cae9d7f9c18b7f9a3d7970e902f4a8cbb7d7b 100644
+index 27a79ee13dc65f389136dc1cc1546259d9a89f9c..b680c6c7d8f2349928b9eebfd62f4312ec8d1180 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -79,8 +79,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0158-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0158-Implement-ensureServerConversions-API.patch
index dc7dcc48af..93a0d5cd39 100644
--- a/Spigot-Server-Patches/0158-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0158-Implement-ensureServerConversions-API.patch
@@ -7,10 +7,10 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 17bbeeefa3fc4eeea3df25833d1a6afc00f4be7a..fda97db7227bc9aeb89a3b3b9feed1ee5b8f5a5f 100644
+index 89a3617068421bb86baf4e8bfd9df2d0626adff7..bee1de72de76738d5eed2e0ca5ae8c0a65be7595 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -330,4 +330,10 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -334,4 +334,10 @@ public final class CraftItemFactory implements ItemFactory {
      public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
          return ((CraftMetaItem) meta).updateMaterial(material);
      }
diff --git a/Spigot-Server-Patches/0159-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0159-Implement-getI18NDisplayName.patch
index 5dc388de6c..52f768cc48 100644
--- a/Spigot-Server-Patches/0159-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0159-Implement-getI18NDisplayName.patch
@@ -34,10 +34,10 @@ index ea7cb9943dc6da7a05e0841985eb1be4b6bc5169..c83ba9d9869f8ba51df17963d530536d
  
      public abstract boolean b(String s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index fda97db7227bc9aeb89a3b3b9feed1ee5b8f5a5f..c28691ae6b5c66772577003789a25d27678aa4c0 100644
+index bee1de72de76738d5eed2e0ca5ae8c0a65be7595..1c3e6e0c9abe681bf9e7305a74a68c1506ad8d0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -335,5 +335,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -339,5 +339,18 @@ public final class CraftItemFactory implements ItemFactory {
      public ItemStack ensureServerConversions(ItemStack item) {
          return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
      }
diff --git a/Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch
index 51f95ad5c9..cff4971987 100644
--- a/Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a17cae9d7f9c18b7f9a3d7970e902f4a8cbb7d7b..d5e7a41b39cb384cf9b52303bcbe11ae09b4162b 100644
+index b680c6c7d8f2349928b9eebfd62f4312ec8d1180..9d05320b132679ccd511422c2c187b0d5fa89c2c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -540,9 +540,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch
index 2a7b2b25b5..82bfcbb451 100644
--- a/Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch
@@ -103,7 +103,7 @@ index 4f008e4723d2cb0bcabb2d5621203d63c40c4923..8545146fb1f093f821e3b966d9337049
          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 bcf855b549e24929865ce4ca32ce15975b06f951..30f15491e6b18f51df9ccfc9b140251ba9ece400 100644
+index e7c42fb4fd1235a934c16f4cccc1b1a66b3672a0..758981757996a8c9aa5066640e5b6c293bb7fc64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -188,6 +188,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
index 5866a6ee33..dc2b8d99a5 100644
--- a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -20,10 +20,10 @@ index e30f48caf2ce4f48f371b2594b765c27bc9e9778..2d8b354d707e8b5b0e7cd644fb93bc8f
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6620d92d73bc54a99a0a583db880682d9ed26ea2..531987a9adf21bf870b88f38bf6c2061fbc3ea80 100644
+index ac5f492fd0d837da150e415bc007c10fe7ee3714..3e0b51db3d90b0039eee3375ac0fa4f96712b922 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -565,16 +565,32 @@ public class CraftEventFactory {
+@@ -577,16 +577,32 @@ public class CraftEventFactory {
              EntityExperienceOrb xp = (EntityExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {
diff --git a/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
index c228b0e161..8278777442 100644
--- a/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
@@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 531987a9adf21bf870b88f38bf6c2061fbc3ea80..3354c320978ac7f99ecec1f928b31536f6621e20 100644
+index 3e0b51db3d90b0039eee3375ac0fa4f96712b922..7cadd8d55d0537b31969f421370c830e8925bed2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -575,7 +575,7 @@ public class CraftEventFactory {
+@@ -587,7 +587,7 @@ public class CraftEventFactory {
                      if (e instanceof EntityExperienceOrb) {
                          EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
                          // Paper start
diff --git a/Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch
index 5783731251..4930edc643 100644
--- a/Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch
@@ -43,7 +43,7 @@ index e7fb982913f391bafd608c4626086cd9cab7fad7..7f2d8de12473c5413bbfc10ea0947d6a
          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 30f15491e6b18f51df9ccfc9b140251ba9ece400..7374bd398e89cbaa6670e726a11aec9be78ba1c3 100644
+index 758981757996a8c9aa5066640e5b6c293bb7fc64..e2f707e461e2e13f240a30a94c9acf191828219b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1073,8 +1073,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0192-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0192-Add-ArmorStand-Item-Meta.patch
index 8e064b2844..d5e982e37f 100644
--- a/Spigot-Server-Patches/0192-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0192-Add-ArmorStand-Item-Meta.patch
@@ -13,10 +13,10 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-index f700522840ee0dfd90871b1b0c8973d7d62a9353..16fbee27b01cac4772cd5fe4ed44303875fe31f2 100644
+index 1a3549480be056368bd6c9d1a98335b3bb07d1d5..25b310ad3f1bcefd04406b7efd1ffa82519250e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-@@ -8,13 +8,39 @@ import org.bukkit.Material;
+@@ -8,9 +8,22 @@ import org.bukkit.Material;
  import org.bukkit.configuration.serialization.DelegateDeserialization;
  
  @DelegateDeserialization(CraftMetaItem.SerializableMeta.class)
@@ -40,24 +40,21 @@ index f700522840ee0dfd90871b1b0c8973d7d62a9353..16fbee27b01cac4772cd5fe4ed443038
      NBTTagCompound entityTag;
  
      CraftMetaArmorStand(CraftMetaItem meta) {
-         super(meta);
-+
+@@ -21,6 +34,13 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+         }
+ 
+         CraftMetaArmorStand armorStand = (CraftMetaArmorStand) meta;
 +        // Paper start
-+        if (!(meta instanceof CraftMetaArmorStand)) {
-+            return;
-+        }
-+
-+        CraftMetaArmorStand standMeta = (CraftMetaArmorStand) meta;
-+        this.invisible = standMeta.invisible;
-+        this.noBasePlate = standMeta.noBasePlate;
-+        this.showArms = standMeta.showArms;
-+        this.small = standMeta.small;
-+        this.marker = standMeta.marker;
++        this.invisible = armorStand.invisible;
++        this.noBasePlate = armorStand.noBasePlate;
++        this.showArms = armorStand.showArms;
++        this.small = armorStand.small;
++        this.marker = armorStand.marker;
 +        // Paper end
+         this.entityTag = armorStand.entityTag;
      }
  
-     CraftMetaArmorStand(NBTTagCompound tag) {
-@@ -22,11 +48,47 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -29,11 +49,47 @@ public class CraftMetaArmorStand extends CraftMetaItem {
  
          if (tag.hasKey(ENTITY_TAG.NBT)) {
              entityTag = tag.getCompound(ENTITY_TAG.NBT);
@@ -105,7 +102,7 @@ index f700522840ee0dfd90871b1b0c8973d7d62a9353..16fbee27b01cac4772cd5fe4ed443038
      }
  
      @Override
-@@ -49,6 +111,32 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -56,6 +112,32 @@ public class CraftMetaArmorStand extends CraftMetaItem {
      void applyToItem(NBTTagCompound tag) {
          super.applyToItem(tag);
  
@@ -138,7 +135,7 @@ index f700522840ee0dfd90871b1b0c8973d7d62a9353..16fbee27b01cac4772cd5fe4ed443038
          if (entityTag != null) {
              tag.set(ENTITY_TAG.NBT, entityTag);
          }
-@@ -70,7 +158,7 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -77,7 +159,7 @@ public class CraftMetaArmorStand extends CraftMetaItem {
      }
  
      boolean isArmorStandEmpty() {
@@ -147,7 +144,7 @@ index f700522840ee0dfd90871b1b0c8973d7d62a9353..16fbee27b01cac4772cd5fe4ed443038
      }
  
      @Override
-@@ -81,7 +169,13 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -88,7 +170,13 @@ public class CraftMetaArmorStand extends CraftMetaItem {
          if (meta instanceof CraftMetaArmorStand) {
              CraftMetaArmorStand that = (CraftMetaArmorStand) meta;
  
@@ -162,7 +159,7 @@ index f700522840ee0dfd90871b1b0c8973d7d62a9353..16fbee27b01cac4772cd5fe4ed443038
          }
          return true;
      }
-@@ -96,9 +190,14 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -103,9 +191,14 @@ public class CraftMetaArmorStand extends CraftMetaItem {
          final int original;
          int hash = original = super.applyHash();
  
@@ -180,7 +177,7 @@ index f700522840ee0dfd90871b1b0c8973d7d62a9353..16fbee27b01cac4772cd5fe4ed443038
  
          return original != hash ? CraftMetaArmorStand.class.hashCode() ^ hash : hash;
      }
-@@ -107,6 +206,28 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -114,6 +207,28 @@ public class CraftMetaArmorStand extends CraftMetaItem {
      Builder<String, Object> serialize(Builder<String, Object> builder) {
          super.serialize(builder);
  
@@ -209,7 +206,7 @@ index f700522840ee0dfd90871b1b0c8973d7d62a9353..16fbee27b01cac4772cd5fe4ed443038
          return builder;
      }
  
-@@ -120,4 +241,56 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -127,4 +242,56 @@ public class CraftMetaArmorStand extends CraftMetaItem {
  
          return clone;
      }
diff --git a/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch
index 051495afeb..f39292e3b2 100644
--- a/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch
@@ -48,7 +48,7 @@ index 80a21dbc05ed3007f2e827f7a320131244c3044b..e0f0a1e91a037f93b239e779aa8fd92b
                              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 7374bd398e89cbaa6670e726a11aec9be78ba1c3..816325719eb6150a300bb0d9193928cddf530ecd 100644
+index e2f707e461e2e13f240a30a94c9acf191828219b..13c19f2a779caa9ff27b135fdf4ad720e5c9cce7 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 @@
diff --git a/Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch
index 78c11a8d05..84b589d045 100644
--- a/Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch
@@ -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 816325719eb6150a300bb0d9193928cddf530ecd..3d1c26cd9a8917b223736bcc9c8000b0f8b46a64 100644
+index 13c19f2a779caa9ff27b135fdf4ad720e5c9cce7..b19072c26a37d577888cfefce612487d61aadd61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -144,6 +144,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0221-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0221-ItemStack-getMaxItemUseDuration.patch
index 3c9607ce52..d96b867b61 100644
--- a/Spigot-Server-Patches/0221-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0221-ItemStack-getMaxItemUseDuration.patch
@@ -18,7 +18,7 @@ index c4d034c6a6ff176bc954c00c328512bdf67455a6..7b2010ec4955fb5788c60178c6e306ea
          return this.getItem().e_(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 5f968e8988c3bd20c0f0c078c8f4038630098c8c..1c96af7b25f5ba4eae3df53663ee9bebb6f190fe 100644
+index 9913d0136841dac35b6649cb1afbe1e93b36bf4c..d315a102a5ae2a79189b39c3b534b8fd733cc9e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack {
diff --git a/Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index d0e2624b4c..794dd655eb 100644
--- a/Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -72,10 +72,10 @@ index 1592e94c78611a4b968bfb24daf68570e778fadd..31c80bb0a2e403c34fb9cd4b3ee4e903
                  event.getProjectile().remove();
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3354c320978ac7f99ecec1f928b31536f6621e20..d75ad03bbae557fb37e4b6bd4b85b1b3b1bceeae 100644
+index 7cadd8d55d0537b31969f421370c830e8925bed2..5bcf38d3fcfa569c50d66ed67ad22db7e7d36207 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -493,16 +493,16 @@ public class CraftEventFactory {
+@@ -505,16 +505,16 @@ public class CraftEventFactory {
      /**
       * EntityShootBowEvent
       */
diff --git a/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
index 62f5d5c85c..40722aa0a7 100644
--- a/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
@@ -101,7 +101,7 @@ index 411e6ff17ac50a410da038ad538ad56ba3aef8a8..201b2b0dcbaf6765390c18052f3b3450
          this.player.o();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d5e7a41b39cb384cf9b52303bcbe11ae09b4162b..3a2ab5a5745e2c698042357321bcfe7b1bd92154 100644
+index 9d05320b132679ccd511422c2c187b0d5fa89c2c..4c11aa13b725b2bb502701f2d5fb3878ff162f05 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -420,7 +420,7 @@ public abstract class PlayerList {
@@ -155,7 +155,7 @@ index fe8a21202340c5892f5166ec294212c6e44ed3a5..00d67c9911c52ddcdf48fda7998bcd2a
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3d1c26cd9a8917b223736bcc9c8000b0f8b46a64..d494f8d7695249b43cd28ac2684e35bd8faaeea0 100644
+index b19072c26a37d577888cfefce612487d61aadd61..c7e43f5015851d44870986c6cd6c43b3332cf9be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -791,7 +791,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,10 +168,10 @@ index 3d1c26cd9a8917b223736bcc9c8000b0f8b46a64..d494f8d7695249b43cd28ac2684e35bd
  
          // 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 d75ad03bbae557fb37e4b6bd4b85b1b3b1bceeae..bed1d3f460be8af3378d0ab1d8ff53c0885021f9 100644
+index 5bcf38d3fcfa569c50d66ed67ad22db7e7d36207..72f495327fe56e7d7ba41e39e99a69622a6861b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1322,12 +1322,22 @@ public class CraftEventFactory {
+@@ -1334,12 +1334,22 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch
index 6662d05029..f6c122f542 100644
--- a/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch
@@ -159,10 +159,10 @@ index 2e19fbddb6ede4abf02c79b4e72d11f89db05433..ca3e831e3191dd8ffe7f2b6ab9ecc05a
      public boolean s_() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bed1d3f460be8af3378d0ab1d8ff53c0885021f9..bfa9fd738159d2517c2ec16323a856c5850c0534 100644
+index 72f495327fe56e7d7ba41e39e99a69622a6861b2..cf25906786e246cb8dfdb5f2cb39f6dc08c4d7ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1193,6 +1193,14 @@ public class CraftEventFactory {
+@@ -1205,6 +1205,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/Spigot-Server-Patches/0258-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0258-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 47fbd66565..69fb6e318b 100644
--- a/Spigot-Server-Patches/0258-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0258-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 1c96af7b25f5ba4eae3df53663ee9bebb6f190fe..b64bbe750717330e3b81028e6efacf15afc70b28 100644
+index d315a102a5ae2a79189b39c3b534b8fd733cc9e4..addb8ef990de3dfbf74969ef4c22276d2fa2614a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -566,7 +566,7 @@ public final class CraftItemStack extends ItemStack {
+@@ -570,7 +570,7 @@ public final class CraftItemStack extends ItemStack {
  
      @Override
      public boolean hasItemMeta() {
diff --git a/Spigot-Server-Patches/0264-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0264-Add-hand-to-bucket-events.patch
index 6ecb605d08..5db5c21d1f 100644
--- a/Spigot-Server-Patches/0264-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0264-Add-hand-to-bucket-events.patch
@@ -126,10 +126,10 @@ index 1a103dd830109e119acc1a371b37386e228586b5..a343cba51850bb7214c241a92db0694d
      public LongSet getForceLoadedChunks() {
          ForcedChunk forcedchunk = (ForcedChunk) this.getWorldPersistentData().b(ForcedChunk::new, "chunks");
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bfa9fd738159d2517c2ec16323a856c5850c0534..fac306391872457a6b60a7fc69dfe7d85da6b23f 100644
+index cf25906786e246cb8dfdb5f2cb39f6dc08c4d7ca..f6c8c371e22272983f80268dab8009ee029bed2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -227,7 +227,7 @@ public class CraftEventFactory {
+@@ -228,7 +228,7 @@ public class CraftEventFactory {
      public static Entity entityDamage; // For use in EntityDamageByEntityEvent
  
      // helper methods
@@ -138,7 +138,7 @@ index bfa9fd738159d2517c2ec16323a856c5850c0534..fac306391872457a6b60a7fc69dfe7d8
          int spawnSize = Bukkit.getServer().getSpawnRadius();
  
          if (world.getDimensionKey() != World.OVERWORLD) return true;
-@@ -395,6 +395,20 @@ public class CraftEventFactory {
+@@ -407,6 +407,20 @@ public class CraftEventFactory {
      }
  
      private static PlayerEvent getPlayerBucketEvent(boolean isFilling, WorldServer world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {
@@ -159,7 +159,7 @@ index bfa9fd738159d2517c2ec16323a856c5850c0534..fac306391872457a6b60a7fc69dfe7d8
          Player player = (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item);
          Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem());
-@@ -407,10 +421,10 @@ public class CraftEventFactory {
+@@ -419,10 +433,10 @@ public class CraftEventFactory {
  
          PlayerEvent event;
          if (isFilling) {
diff --git a/Spigot-Server-Patches/0269-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0269-Use-ConcurrentHashMap-in-JsonList.patch
index 0a9888288a..4db56b72bf 100644
--- a/Spigot-Server-Patches/0269-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0269-Use-ConcurrentHashMap-in-JsonList.patch
@@ -122,7 +122,7 @@ index 5b01e4edb3c0f8bc785b70128cbe31b14356e4fb..9213bfb78e92b838189161045e394558
  
          this.d.values().stream().map((jsonlistentry) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3a2ab5a5745e2c698042357321bcfe7b1bd92154..c3acd5e610301de924eb1f49f00f9a3ae85eefb3 100644
+index 4c11aa13b725b2bb502701f2d5fb3878ff162f05..50fbf3e3fb82c25ab5f3b258206f324c8616dae7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -543,7 +543,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0286-Improve-death-events.patch b/Spigot-Server-Patches/0286-Improve-death-events.patch
index 75067bdcbf..3eebcabb19 100644
--- a/Spigot-Server-Patches/0286-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0286-Improve-death-events.patch
@@ -378,10 +378,10 @@ index 21aa19081ca3d9c20ea8e401c2a4b830ba667a51..1398d911456b6e685bf7292687c5f5a4
  
      public void injectScaledMaxHealth(Collection<AttributeModifiable> 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 fac306391872457a6b60a7fc69dfe7d85da6b23f..1dd3c871316b246210ef05d93e949f363deb322f 100644
+index f6c8c371e22272983f80268dab8009ee029bed2a..37f6fdf1be6d0f8a4ec4b9998fa710876b5515c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -771,9 +771,16 @@ public class CraftEventFactory {
+@@ -783,9 +783,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -398,7 +398,7 @@ index fac306391872457a6b60a7fc69dfe7d85da6b23f..1dd3c871316b246210ef05d93e949f36
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -789,8 +796,15 @@ public class CraftEventFactory {
+@@ -801,8 +808,15 @@ public class CraftEventFactory {
          CraftPlayer entity = victim.getBukkitEntity();
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
          event.setKeepInventory(keepInventory);
@@ -414,7 +414,7 @@ index fac306391872457a6b60a7fc69dfe7d85da6b23f..1dd3c871316b246210ef05d93e949f36
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -807,6 +821,31 @@ public class CraftEventFactory {
+@@ -819,6 +833,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index d2c414c57d..12d9d4d358 100644
--- a/Spigot-Server-Patches/0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -28,7 +28,7 @@ index fa975d4788281b66e63b4e8b9ad05c8a0f78c40a..b9125ca724c60026f0dcff40f570f6a5
      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 c3acd5e610301de924eb1f49f00f9a3ae85eefb3..e48184b87b2c98cc2f103204ba62ed22a6fd3694 100644
+index 50fbf3e3fb82c25ab5f3b258206f324c8616dae7..2b5dda81b467cf1d813359faaa5c81d4aeb6ee1c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -97,6 +97,7 @@ public abstract class PlayerList {
@@ -106,7 +106,7 @@ index 00333548b470435aa89fb0f4b29047eb1461e992..5770d4183c1b9ab6119a25930283c023
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9e808c70a8e9762e912b693027d5fbed85f85823..8a251bb55c79c34880599a490efd271a36a09a04 100644
+index 1398d911456b6e685bf7292687c5f5a4dcea5b7e..305deccc0343563ba6080ad75d7397c7c8dd7435 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -145,6 +145,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0338-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0338-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index de697b0ca6..8555f4b014 100644
--- a/Spigot-Server-Patches/0338-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0338-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e48184b87b2c98cc2f103204ba62ed22a6fd3694..29e026f6f4106da029f9596201167c08078f4a45 100644
+index 2b5dda81b467cf1d813359faaa5c81d4aeb6ee1c..2c90e1d04447f0d34fe500a78449435c295c88e3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -930,9 +930,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0341-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0341-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index f0863a85dc..dcb1f88c73 100644
--- a/Spigot-Server-Patches/0341-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0341-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 29e026f6f4106da029f9596201167c08078f4a45..5ee209074e44a1a1988641098b9376e4f0c04b45 100644
+index 2c90e1d04447f0d34fe500a78449435c295c88e3..61d29dabf6ae8be8f8b5b6da9b801e84adda7dfb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1048,6 +1048,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0344-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0344-Entity-getEntitySpawnReason.patch
index 899756c226..54596e5238 100644
--- a/Spigot-Server-Patches/0344-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0344-Entity-getEntitySpawnReason.patch
@@ -59,7 +59,7 @@ index c5abac3eb3f98a948ff7a3423cfcad70abae86ff..4502ea222d98872a4c33714a8c3149c6
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5ee209074e44a1a1988641098b9376e4f0c04b45..b00825156f12fabab0fc740f909363846cee168e 100644
+index 61d29dabf6ae8be8f8b5b6da9b801e84adda7dfb..6a00d1dcd62034c595723547afb4637e9d7c18a0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -262,7 +262,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0346-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0346-Implement-PlayerPostRespawnEvent.patch
index a7062e5cc6..608650cf08 100644
--- a/Spigot-Server-Patches/0346-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0346-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b00825156f12fabab0fc740f909363846cee168e..43cb1e5ecc753f431666f326ada590581e930339 100644
+index 6a00d1dcd62034c595723547afb4637e9d7c18a0..dd05e753942d2f50ba0af41d59b4cb962df4cd1b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -664,9 +664,14 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0382-Fix-MC-158900.patch b/Spigot-Server-Patches/0382-Fix-MC-158900.patch
index b590037691..dbd58cddbf 100644
--- a/Spigot-Server-Patches/0382-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0382-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 43cb1e5ecc753f431666f326ada590581e930339..dadb3e4aa670d3e3a7a6672da55ebc26a86bb666 100644
+index dd05e753942d2f50ba0af41d59b4cb962df4cd1b..62b9c1f23fcc9df1ba49823a45b54b4e547813d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -531,8 +531,10 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0392-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0392-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index c2bb99d3c5..ed16ef1555 100644
--- a/Spigot-Server-Patches/0392-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0392-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -18,7 +18,7 @@ index 6787b467f18bb03a8d45dc254988b5084c74f499..bb60ce14f6c13bc3f123893150129edb
              PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
              this.world.getServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index dadb3e4aa670d3e3a7a6672da55ebc26a86bb666..82259e8404d350cb9578e8a55d9c11b1e5b9a629 100644
+index 62b9c1f23fcc9df1ba49823a45b54b4e547813d0..a047375a231e49485a053903713b6ee5cbc9971f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -759,6 +759,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0415-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0415-Allow-overriding-the-java-version-check.patch
index 76023ba347..d326950c38 100644
--- a/Spigot-Server-Patches/0415-Allow-overriding-the-java-version-check.patch
+++ b/Spigot-Server-Patches/0415-Allow-overriding-the-java-version-check.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check
 -DPaper.IgnoreJavaVersion=true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c05432b2319da2ab8ff18a47ebbf11efa70a36b7..438e86595760be233e89c49224963e5e8ce335e3 100644
+index 05b647fbb360910b2961c9276c2928fe71dad90c..5ec16547a20271074d034f7fbcb43e86cb1597e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -175,7 +175,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0421-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0421-add-hand-to-BlockMultiPlaceEvent.patch
index d1c1e21a28..669c3d1bbc 100644
--- a/Spigot-Server-Patches/0421-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/Spigot-Server-Patches/0421-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1dd3c871316b246210ef05d93e949f363deb322f..a44fa04f312d812f5593df90ebf7fe1483f73376 100644
+index 37f6fdf1be6d0f8a4ec4b9998fa710876b5515c9..36afa821dc5f04d77b6f44fe7282444ec6a7b842 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -318,13 +318,18 @@ public class CraftEventFactory {
+@@ -330,13 +330,18 @@ public class CraftEventFactory {
          }
  
          org.bukkit.inventory.ItemStack item;
diff --git a/Spigot-Server-Patches/0434-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0434-Optimize-Collision-to-not-load-chunks.patch
index deb0f581d3..38b00fc9b4 100644
--- a/Spigot-Server-Patches/0434-Optimize-Collision-to-not-load-chunks.patch
+++ b/Spigot-Server-Patches/0434-Optimize-Collision-to-not-load-chunks.patch
@@ -40,7 +40,7 @@ index b27260270de80de371a5a71fa0516aa43c44c83e..1cc40b1f0af9e617b2a71bcc442543e1
  
      Stream<VoxelShape> c(@Nullable Entity entity, AxisAlignedBB axisalignedbb, Predicate<Entity> predicate);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 82259e8404d350cb9578e8a55d9c11b1e5b9a629..a9dc7807508e5227b59a750f982bf7a0740fa493 100644
+index a047375a231e49485a053903713b6ee5cbc9971f..31f33e8de4b976b6a895568dd55dae35645e9a80 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -722,6 +722,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0440-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0440-Don-t-move-existing-players-to-world-spawn.patch
index 716a39057c..6b1d1d031a 100644
--- a/Spigot-Server-Patches/0440-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0440-Don-t-move-existing-players-to-world-spawn.patch
@@ -40,7 +40,7 @@ index c6f326787328ff6b2f974d653dc9e7932c3c0205..03e1b76a8b6850a26ed8a7b1992e0975
          this.playerInteractManager.a((WorldServer) world);
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a9dc7807508e5227b59a750f982bf7a0740fa493..6f6d1d4c733faa80045fb63269b16ba127c2b616 100644
+index 31f33e8de4b976b6a895568dd55dae35645e9a80..502f4b93e04c78f4681459abfb160c6fc2279c72 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -134,6 +134,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0447-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0447-Improved-Watchdog-Support.patch
index a74ab39e8c..0c1ba4bd46 100644
--- a/Spigot-Server-Patches/0447-Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/0447-Improved-Watchdog-Support.patch
@@ -283,7 +283,7 @@ index bb4d54ebee573964cf3026888da108584b12972f..09f94bd242318155dbb46e12224ad3e4
                  list.stream().map((playerchunk) -> {
                      CompletableFuture completablefuture;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6f6d1d4c733faa80045fb63269b16ba127c2b616..2602c326cf8d3516162fcc08f0f40ba4ee5f6a16 100644
+index 502f4b93e04c78f4681459abfb160c6fc2279c72..bbe41a108b424abd3b3acfdfee4d368467a2c52e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -429,7 +429,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0461-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0461-Broadcast-join-message-to-console.patch
index c29cd22c28..038e379f20 100644
--- a/Spigot-Server-Patches/0461-Broadcast-join-message-to-console.patch
+++ b/Spigot-Server-Patches/0461-Broadcast-join-message-to-console.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 2602c326cf8d3516162fcc08f0f40ba4ee5f6a16..00071913c0bb4deec7501a54818a2a1d6febc769 100644
+index bbe41a108b424abd3b3acfdfee4d368467a2c52e..45fce4f08eb6f3f67306d45be407b85b3fda604b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -211,9 +211,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0462-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0462-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 3076369002..5bd5b46a10 100644
--- a/Spigot-Server-Patches/0462-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/Spigot-Server-Patches/0462-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -52,7 +52,7 @@ index 4ab719930f5b35c0ae221e9345f1e2eda7d9d719..8de86684dda275585826617b41d6792f
          if (!(entity instanceof EntityComplexPart)) {
              EntityTypes<?> entitytypes = entity.getEntityType();
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 00071913c0bb4deec7501a54818a2a1d6febc769..18272d56bdac0ff76092d8d834c53474516732a8 100644
+index 45fce4f08eb6f3f67306d45be407b85b3fda604b..881265d9f3f5432c0f79142abc8d6ca2f5609243 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -200,6 +200,12 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0463-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0463-Load-Chunks-for-Login-Asynchronously.patch
index 17450b3744..658675ac17 100644
--- a/Spigot-Server-Patches/0463-Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/0463-Load-Chunks-for-Login-Asynchronously.patch
@@ -110,7 +110,7 @@ index 6faa8764d19f3e58808de9dc84145f765c8958a8..22ded747e9e8683faa17924149f9b279
          this.minecraftServer.getMethodProfiler().enter("keepAlive");
          // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 18272d56bdac0ff76092d8d834c53474516732a8..045d85016edff8e1e8c775f8c701ac806fb3d4e1 100644
+index 881265d9f3f5432c0f79142abc8d6ca2f5609243..3d110c998f6b28e55055637bbfeff6f2ebdb2747 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -54,11 +54,12 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0469-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0469-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 31694c8e52..83264e8f0b 100644
--- a/Spigot-Server-Patches/0469-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/Spigot-Server-Patches/0469-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -88,10 +88,10 @@ index 51e9f4a6e09474a7489d2872a800308ee3f02e46..250bccee4a27801b41c50d59e93396c6
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a44fa04f312d812f5593df90ebf7fe1483f73376..521e204260e96c3010fdfb90e52f7170ad9a9fc4 100644
+index 36afa821dc5f04d77b6f44fe7282444ec6a7b842..6c5036b23a41769167fd53b8cc5454e5e747598e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -791,7 +791,8 @@ public class CraftEventFactory {
+@@ -803,7 +803,8 @@ public class CraftEventFactory {
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
              if (stack == null || stack.getType() == Material.AIR || stack.getAmount() == 0) continue;
  
diff --git a/Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 1a3341b74f..417fed7984 100644
--- a/Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 894552adf119037e97c7de27d783920db580f62b..83151f3d7e9703f99391d24c41e90fc5ce1a80e7 100644
+index 3e4454a14fdf6305b262c15cf67203854debef28..a8cd55d3c288f2f1c0f7f9392f2f08f12f69f969 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
index 2c4d00dddd..61869bc2a9 100644
--- a/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
@@ -567,7 +567,7 @@ index 026562c72d7e95345d9369c6d6331cf6cedb8f17..fe343f70ce8024c86363637fda8e5c09
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 045d85016edff8e1e8c775f8c701ac806fb3d4e1..0ad06509f26a7677e48f4bfb9c979a42fb6a4f74 100644
+index 3d110c998f6b28e55055637bbfeff6f2ebdb2747..59f00891ee2d1641678d4903a365cb94247bf08f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -175,7 +175,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 64473f8ce1..abf2be1158 100644
--- a/Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -1144,7 +1144,7 @@ index 7fd991fd3994a18625c193aeb15ed521d3b6a447..6bb2b3520362d056d4d75c65764e4c8d
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0ad06509f26a7677e48f4bfb9c979a42fb6a4f74..3c238f7957d28f3edb6481a89ea96d6cbbbc96d8 100644
+index 59f00891ee2d1641678d4903a365cb94247bf08f..e55e11d5c97d656db8fed42c1581375077129906 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -196,8 +196,8 @@ public abstract class PlayerList {
@@ -1223,7 +1223,7 @@ index 11559f9e4b3f5fda6bfe4f70f963ce4f7967f051..bf2f602bb07aa4c7c0a22ad9be9e77d7
              net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);
              return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 517a4b64e8e0a3237c349fa284d23b43039035f4..c7b4e5f2a26aaa83520b55ec5c917d63980c8041 100644
+index e3ae90aa7c2c067741540995fbb1c694b663f624..8f2b84a84a8249ae2b48d195eb8c1ffb4464fe0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -744,6 +744,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch
index 5cfe7311cb..79e13aff50 100644
--- a/Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch
+++ b/Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch
@@ -11,7 +11,7 @@ This will drastically cut down on packet sending cost for worlds with
 lots of players in them.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3c238f7957d28f3edb6481a89ea96d6cbbbc96d8..3c5ba8f2fd59d37639f87ac888cc950e7cd628f7 100644
+index e55e11d5c97d656db8fed42c1581375077129906..f17399a73e0de49d2e7325747a2637f447df78f2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1059,16 +1059,40 @@ public abstract class PlayerList {
diff --git a/work/Bukkit b/work/Bukkit
index 1cb03826eb..0ca45a21b9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 1cb03826ebde4ef887519ce37b0a2a341494a183
+Subproject commit 0ca45a21b94ba986a410ad495ad40b0ee2aa6de4
diff --git a/work/CraftBukkit b/work/CraftBukkit
index dc7c3c61fa..145921e2a6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit dc7c3c61fa061c87eca5d158f1f1c369620622b6
+Subproject commit 145921e2a6ca99081f6019321b63e80756f9cac9
diff --git a/work/Spigot b/work/Spigot
index 4d9262cf9f..beb7d47c1d 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 4d9262cf9f7cf1a38525d21734708c3fe4a28bcb
+Subproject commit beb7d47c1d386faa934fceb3b8bd914721074b59