diff --git a/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch
index 0bb78f0956..f4c4fc359e 100644
--- a/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch
@@ -82,7 +82,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +            if (this.noTickEquipmentDirty) {
 +                this.noTickEquipmentDirty = false;
-+                this.updateEntityEquipment();
++                this.updateEquipment();
 +            }
 +
 +            return;
@@ -136,18 +136,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index ad04e41ddf..6463d4f9d0 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -1081,7 +1081,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        SpigotTimings.timerEntityTickRest.stopTiming(); // Spigot
      }
  
-     private void p() {
+     public void updateEquipment() { // PAIL private->public; updateEquipment
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
  
          this.setMot(d4, d5, d6);
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