diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index b24e7d922c..e29192c7ab 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1007,7 +1007,7 @@ index d91b029c95b6380300db81e7c0fb172ff57958a1..218071260dec39dd4f7eb733ae6f832a
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5e0db989a0f6c7c7041a968550f4068b9a946136..a6534087b10c9a469a3d2cf4da717fab17b31544 100644
+index 9f32f6c3c34464e82a953a50141343b0083dea71..ace7d5a36c0a44763d554d5d83cee7817f77fcc1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -31,7 +31,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@@ -1043,7 +1043,7 @@ index 5e0db989a0f6c7c7041a968550f4068b9a946136..a6534087b10c9a469a3d2cf4da717fab
  
      protected BlockPosition ap() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f388ded80048a695e72dde393992d37f99df6ef9..ef00abc40fa1645f6e7420aba703b3a382276844 100644
+index 0ca7457a669b3c96313a39af0c1696d51c1eb10a..5f348259cca7eb21912100c4b1c63e63a2d2f724 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -42,7 +42,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1081,7 +1081,7 @@ index f388ded80048a695e72dde393992d37f99df6ef9..ef00abc40fa1645f6e7420aba703b3a3
 -        SpigotTimings.timerEntityTickRest.stopTiming(); // Spigot
      }
  
-     private void p() {
+     public void updateEquipment() { // PAIL private->public; updateEquipment
 @@ -2672,7 +2667,6 @@ public abstract class EntityLiving extends Entity {
  
          this.setMot(d4, d5, d6);
@@ -1173,7 +1173,7 @@ index 9946985407561596c6c364526d2fe7477771303a..b1fe488e41a2c9f77df091e1d14ed5c8
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 99d517fadc279a2ea9b51565d4ef373776af66d4..3a11fca68223def767d8b140d177f2874299422a 100644
+index 472803c2d9292379a36fca681c2ab92ffb01184f..89d3ff83f0e152e9747c554693af4145f0a7d07e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -65,7 +65,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -1683,7 +1683,7 @@ index 9c6b15e70bfb7db853c8e4a8dfd7b24bae27a70c..b4aeea40ee04fd2ed10484f40d25dbd2
              CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c54f297e89939fa27c7c39ff6d0110aba537e6ce..da01aac42b32af6831a69f49e43d77fd6d5704ca 100644
+index c96ad91b15920293e228f5eb7d0843beda92faec..21e4088cfdb7218e78fb771fe4c9bd2027594663 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -2207,7 +2207,7 @@ index e52ef47b783785dc214746b678e7b549aea9a274..3d90b3426873a3528af14f7f1ab0adae
          this.value = value;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1e138a569fc785eb69b3f3935dcf97f4dcb08051..4075553d0abe19442903add9854f61cd657ab0ce 100644
+index 6194d8aac0d2e54958aad3fb8b5fe144451cf879..d63a160f1b00de8d67ae1eb4fefbd5ca06835de7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -158,6 +158,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch
index 54a62e7605..aedb5902d6 100644
--- a/Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch
@@ -20,7 +20,7 @@ index 3562950df4868b1393790b1a1ff1fe0dc589c155..5ab0e7183e48134b7a0f736462516b1a
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 8922c656617bd8aed5b68f671d5191a537695bdf..8021d06b7765ad00abdbd8b77c37f7a80cb15803 100644
+index abcf3ab8bab2ca98ab0f7e852b8185e27949a210..5076dd7e874be76d81b13f53076bc4723dd2fddc 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -46,9 +46,16 @@ public class EntityArmorStand extends EntityLiving {
@@ -82,7 +82,7 @@ index 8922c656617bd8aed5b68f671d5191a537695bdf..8021d06b7765ad00abdbd8b77c37f7a8
 +
 +            if (this.noTickEquipmentDirty) {
 +                this.noTickEquipmentDirty = false;
-+                this.updateEntityEquipment();
++                this.updateEquipment();
 +            }
 +
 +            return;
@@ -136,18 +136,6 @@ index 8922c656617bd8aed5b68f671d5191a537695bdf..8021d06b7765ad00abdbd8b77c37f7a8
          this.rightLegPose = vector3f;
          this.datawatcher.set(EntityArmorStand.bh, vector3f);
      }
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0040f91477af23b7021a3c5506bb0f16121a9a1f..190161266fb26ac2bfee72ad24fa4101e09a2877 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2526,6 +2526,7 @@ public abstract class EntityLiving extends Entity {
-         }
-     }
- 
-+    public final void updateEntityEquipment() { p(); }; // Paper - OBFHELPER
-     private void p() {
-         Map<EnumItemSlot, ItemStack> map = this.q();
- 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 index c19f0b0dd3fe988a30049297355445fd73cae630..cb22cbd68a4d310fecad3a87a97bf101216a5f64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
diff --git a/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
index 2f3c15bbb0..d9b3a94474 100644
--- a/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 65db092417ddf7253c0b52e98d53b6cfc3744c3a..b00c7fda9aa7328848e0aff3a5897063f8a5abd6 100644
+index 54f0f5b49d33794c1df38f4434707e207a1e03c1..c8ce23e443df0761bfdd10836a19bf7a401bd622 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -3486,6 +3486,23 @@ public abstract class EntityLiving extends Entity {
+@@ -3485,6 +3485,23 @@ public abstract class EntityLiving extends Entity {
          this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
      }
      // Paper start
diff --git a/Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch
index 84c46e956e..d5b61330bf 100644
--- a/Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 470f8f1440c62b30a9df6cf356003dd35a69ee46..ea0525ca0b52b3270b868cc8a526c7139baa4db8 100644
+index 9b8d17aa68bad1a4916681b9eed121011bf3380c..031dcd2092800118d4cb12c8bb92b51ccf1bbd27 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1954,12 +1954,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 470f8f1440c62b30a9df6cf356003dd35a69ee46..ea0525ca0b52b3270b868cc8a526c713
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index c0b061f588944b2a9a82bea4087c68423c7e22a1..14e3496f6f382e8f259f5b55be43b3c2eb4616f3 100644
+index 502625005f9775ec4cb7200c7e401e44314f6d08..ed544187f27b06c4cd575eff45f5691c8ff7bebd 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -942,9 +942,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,10 +91,10 @@ index c0b061f588944b2a9a82bea4087c68423c7e22a1..14e3496f6f382e8f259f5b55be43b3c2
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1dc5bad650c3035005175c9d5e37d91994e3d97f..c0703015ce72c65006e212ca1a6dbd3ce3c6a782 100644
+index ad15e356b1ae5e1cbcd7f4bde974218c506ea658..68ffb2c3f27ea8d034eda4776ddb78524f654770 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2916,11 +2916,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2915,11 +2915,13 @@ public abstract class EntityLiving extends Entity {
          return ((Byte) this.datawatcher.get(EntityLiving.ag) & 4) != 0;
      }
  
@@ -112,7 +112,7 @@ index 1dc5bad650c3035005175c9d5e37d91994e3d97f..c0703015ce72c65006e212ca1a6dbd3c
              this.a(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4ad9afc9806fc58ef3044371dcd64eb3d86ecf4d..0925bd03f0be1e8addef7c6ea28537ab34ede6a5 100644
+index 7520a53a0a35762b1632518842cde4568b73f11f..84df78110428ef22fc62759cf55fcb894f902893 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1110,11 +1110,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch
index 5bce91db7b..597a4049b2 100644
--- a/Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch
@@ -46,7 +46,7 @@ index 02c09f39848399a86d46bd17569b4f01a7b5ab1f..ed9b2f9adfecdc6d1b9925579ec51065
          double[] adouble = new double[]{1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ea0525ca0b52b3270b868cc8a526c7139baa4db8..f999920fcc61109d2359ada18fb4272e25c2fcc7 100644
+index 031dcd2092800118d4cb12c8bb92b51ccf1bbd27..8827ccfc77284020496046e755b3639de75c5903 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1418,6 +1418,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -66,10 +66,10 @@ index ea0525ca0b52b3270b868cc8a526c7139baa4db8..f999920fcc61109d2359ada18fb4272e
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c0703015ce72c65006e212ca1a6dbd3ce3c6a782..a68d9d709a7413f40f927c20bd53311b558d9541 100644
+index 68ffb2c3f27ea8d034eda4776ddb78524f654770..b0a2ce464261b6bdb96f78e429a28e48a42e841b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -3538,6 +3538,37 @@ public abstract class EntityLiving extends Entity {
+@@ -3537,6 +3537,37 @@ public abstract class EntityLiving extends Entity {
          return world.rayTrace(raytrace);
      }
  
diff --git a/Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch
index 8132fcb455..23cdcef6d5 100644
--- a/Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Update entity Metadata for all tracked players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 216445778ce8432fe2506cd7ac4312f43f42ba33..e9bc1d22825850a1f1ef3267428c19847d4c8ab8 100644
+index c346ca8ba30da401ea1a421e8ce6ed1d5b6e4c13..d89d53e9990918fb9863a7eed3111ef026c95386 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-@@ -392,6 +392,12 @@ public class EntityTrackerEntry {
+@@ -393,6 +393,12 @@ public class EntityTrackerEntry {
          return PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc);
      }
  
@@ -22,7 +22,7 @@ index 216445778ce8432fe2506cd7ac4312f43f42ba33..e9bc1d22825850a1f1ef3267428c1984
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index af80dcddc4f65acc916b5b12bb7f9fb2effd3b90..755c5778e0258878daa7ede1b26877e75d97a5ce 100644
+index 800f6de16d5c0fe8fd0e8997e0f66fd494e2852f..1d630b6be698a9e23ceee81c30d3b4a8a1d6b1db 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2139,7 +2139,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch
index 1446163310..26d81c9368 100644
--- a/Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a68d9d709a7413f40f927c20bd53311b558d9541..dbd212fc2f0c95ab1dcc4b6be86f0f87ac726fa7 100644
+index b0a2ce464261b6bdb96f78e429a28e48a42e841b..2ad4415b41930b4e002c5c526f0cdd9a1645a38a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -3101,10 +3101,13 @@ public abstract class EntityLiving extends Entity {
+@@ -3100,10 +3100,13 @@ public abstract class EntityLiving extends Entity {
          this.datawatcher.set(EntityLiving.ag, (byte) j);
      }
  
@@ -24,7 +24,7 @@ index a68d9d709a7413f40f927c20bd53311b558d9541..dbd212fc2f0c95ab1dcc4b6be86f0f87
              this.activeItem = itemstack;
              this.bd = itemstack.k();
              if (!this.world.isClientSide) {
-@@ -3182,6 +3185,7 @@ public abstract class EntityLiving extends Entity {
+@@ -3181,6 +3184,7 @@ public abstract class EntityLiving extends Entity {
              this.releaseActiveItem();
          } else {
              if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@@ -32,7 +32,7 @@ index a68d9d709a7413f40f927c20bd53311b558d9541..dbd212fc2f0c95ab1dcc4b6be86f0f87
                  this.b(this.activeItem, 16);
                  // CraftBukkit start - fire PlayerItemConsumeEvent
                  ItemStack itemstack;
-@@ -3216,8 +3220,8 @@ public abstract class EntityLiving extends Entity {
+@@ -3215,8 +3219,8 @@ public abstract class EntityLiving extends Entity {
                  }
  
                  this.clearActiveItem();
diff --git a/Spigot-Server-Patches/0396-Lag-compensate-eating.patch b/Spigot-Server-Patches/0396-Lag-compensate-eating.patch
index 5f484a22e7..88e99f4cb9 100644
--- a/Spigot-Server-Patches/0396-Lag-compensate-eating.patch
+++ b/Spigot-Server-Patches/0396-Lag-compensate-eating.patch
@@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 37e3efa1fed858f735166a5c0cb97f886b2bbb4e..e86500d789a713d763c64448cfa7141a15d6b4bd 100644
+index f855a39f27309f11e9f27f97a188d118f138c658..35d8972535342c65bafd67c24008d05a557ecf1d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -120,7 +120,7 @@ public abstract class EntityLiving extends Entity {
@@ -19,7 +19,7 @@ index 37e3efa1fed858f735166a5c0cb97f886b2bbb4e..e86500d789a713d763c64448cfa7141a
      protected int be;
      private BlockPosition bx;
      private Optional<BlockPosition> by;
-@@ -3051,6 +3051,11 @@ public abstract class EntityLiving extends Entity {
+@@ -3050,6 +3050,11 @@ public abstract class EntityLiving extends Entity {
          return ((Byte) this.datawatcher.get(EntityLiving.ag) & 2) > 0 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND;
      }
  
@@ -31,7 +31,7 @@ index 37e3efa1fed858f735166a5c0cb97f886b2bbb4e..e86500d789a713d763c64448cfa7141a
      private void t() {
          if (this.isHandRaised()) {
              if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) {
-@@ -3060,7 +3065,12 @@ public abstract class EntityLiving extends Entity {
+@@ -3059,7 +3064,12 @@ public abstract class EntityLiving extends Entity {
                      this.b(this.activeItem, 5);
                  }
  
@@ -45,7 +45,7 @@ index 37e3efa1fed858f735166a5c0cb97f886b2bbb4e..e86500d789a713d763c64448cfa7141a
                      this.s();
                  }
              } else {
-@@ -3110,7 +3120,10 @@ public abstract class EntityLiving extends Entity {
+@@ -3109,7 +3119,10 @@ public abstract class EntityLiving extends Entity {
  
          if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag
              this.activeItem = itemstack;
@@ -57,7 +57,7 @@ index 37e3efa1fed858f735166a5c0cb97f886b2bbb4e..e86500d789a713d763c64448cfa7141a
              if (!this.world.isClientSide) {
                  this.c(1, true);
                  this.c(2, enumhand == EnumHand.OFF_HAND);
-@@ -3134,7 +3147,10 @@ public abstract class EntityLiving extends Entity {
+@@ -3133,7 +3146,10 @@ public abstract class EntityLiving extends Entity {
                  }
              } else if (!this.isHandRaised() && !this.activeItem.isEmpty()) {
                  this.activeItem = ItemStack.b;
@@ -69,7 +69,7 @@ index 37e3efa1fed858f735166a5c0cb97f886b2bbb4e..e86500d789a713d763c64448cfa7141a
              }
          }
  
-@@ -3262,7 +3278,10 @@ public abstract class EntityLiving extends Entity {
+@@ -3261,7 +3277,10 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.activeItem = ItemStack.b;
diff --git a/Spigot-Server-Patches/0408-Entity-Jump-API.patch b/Spigot-Server-Patches/0408-Entity-Jump-API.patch
index 1759d8e8f1..cdc81a2366 100644
--- a/Spigot-Server-Patches/0408-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0408-Entity-Jump-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4cf740c3661aea67f12afeb564cb84db626ffa81..364a4de656b680e871dd4ff0ad5130f4d10d57e6 100644
+index eaac2827d49067f92e22b39fceef8d149fb5001b..4df0fd9883027440b7148a47c855e30730ab8590 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2776,8 +2776,10 @@ public abstract class EntityLiving extends Entity {
+@@ -2775,8 +2775,10 @@ public abstract class EntityLiving extends Entity {
              } else if (this.aQ() && (!this.onGround || d7 > d8)) {
                  this.c((Tag) TagsFluid.LAVA);
              } else if ((this.onGround || flag && d7 <= d8) && this.jumpTicks == 0) {
diff --git a/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
index 37940c15f7..2a2a13c20d 100644
--- a/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -7,10 +7,10 @@ Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 364a4de656b680e871dd4ff0ad5130f4d10d57e6..91881c7a61edeed5f7dbc390aab96ed5db163ed8 100644
+index 4df0fd9883027440b7148a47c855e30730ab8590..8ab635d2f95e32d08db21060419914f0250dbc79 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2844,10 +2844,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2843,10 +2843,16 @@ public abstract class EntityLiving extends Entity {
      protected void doTick() {}
  
      protected void collideNearby() {
diff --git a/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index bfd27c8afc..55706d1e24 100644
--- a/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e34f3c24be9defab765aaf7c54225759ad5ce60a..6b3e521dac8823ac8103f5aa2b1ea62edb260a72 100644
+index c081df4c5e007770bf1d4f0e45eac91869d27c14..338fb04d69eaad4902a2db80a6839d2ad0eeb467 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2941,7 +2941,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2940,7 +2940,7 @@ public abstract class EntityLiving extends Entity {
          Entity entity = this.getVehicle();
  
          super.stopRiding(suppressCancellation); // Paper - suppress
diff --git a/Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch b/Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch
index 434875a0d4..d5874d8fca 100644
--- a/Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -19,7 +19,7 @@ index b4d76494851601d61a69e2f060727a68f4461267..6262246c4018c660705fbad028f297fc
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 50669b68ae130ec43ea52d2e62d55d633eecb042..36fbe16e6f06fca3eb282cce5b8c5fcc87a0166d 100644
+index e39be18fe6b45a1a53cb484c656872dda00fa274..f9d7419e376268b00db2eb98a3db4116bdb72bd8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1483,6 +1483,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -36,7 +36,7 @@ index 50669b68ae130ec43ea52d2e62d55d633eecb042..36fbe16e6f06fca3eb282cce5b8c5fcc
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 0fd3a7ebddfd22d6640307452f525d1c2aaf4439..d6de166babe2e25a88f9e6dae462907e26b6fb6f 100644
+index 97425f38ac05c24433dc27c5cda74c36871d61a9..0ef9516fbe9283cb1aca71eb9dbdbec0d98c8fa4 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -327,7 +327,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -75,7 +75,7 @@ index 45fea38933d57e52dea19317c65682d57114a077..fdfdf83c28c3065fa89fba9e44b3da99
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 8af1fe5d820f3bcb5e02dd2300e8e9cbd7e4e201..fcb31147622b4b81934be05ffc8de5e821ce69b7 100644
+index befd863533b84a88ae2f004125428a6fbeedddab..2a91f07ca9c4dc0cb3b5aef5c9c1db7f69773530 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -88,7 +88,7 @@ index 8af1fe5d820f3bcb5e02dd2300e8e9cbd7e4e201..fcb31147622b4b81934be05ffc8de5e8
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 943cbd0a9ac449117812cad968bffcbc68cc2cf7..5f5cea628c7f4c10670524f5fd7d9328f9a685a0 100644
+index 338fb04d69eaad4902a2db80a6839d2ad0eeb467..568e9b13691f5dd8f388718d040fd57c75f72eea 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -43,7 +43,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -99,7 +99,7 @@ index 943cbd0a9ac449117812cad968bffcbc68cc2cf7..5f5cea628c7f4c10670524f5fd7d9328
  
  public abstract class EntityLiving extends Entity {
  
-@@ -2859,7 +2858,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2858,7 +2857,7 @@ public abstract class EntityLiving extends Entity {
              return;
          }
          // Paper - end don't run getEntities if we're not going to use its result
@@ -108,7 +108,7 @@ index 943cbd0a9ac449117812cad968bffcbc68cc2cf7..5f5cea628c7f4c10670524f5fd7d9328
  
          if (!list.isEmpty()) {
              // Paper - move up
-@@ -2997,9 +2996,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2996,9 +2995,16 @@ public abstract class EntityLiving extends Entity {
          return !this.dead && this.collides; // CraftBukkit
      }
  
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 0bad58f1e2..c3e684ef70 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0bad58f1e28412140342f422bced8d8403837843
+Subproject commit c3e684ef704c2685bc85b1f2b760d7075e434dfc
diff --git a/work/Spigot b/work/Spigot
index 5bde3115bf..89d6047d1a 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 5bde3115bf508315e9ff2b83e1e42ecfd6eee4d7
+Subproject commit 89d6047d1aea78b9011ba38681663780a63233c9