diff --git a/patches/api/Add-Mob-lookAt-API.patch b/patches/api/Add-Mob-lookAt-API.patch
index 6a61e428a..ba87ab018 100644
--- a/patches/api/Add-Mob-lookAt-API.patch
+++ b/patches/api/Add-Mob-lookAt-API.patch
@@ -95,5 +95,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    int getMaxHeadPitch();
      // Paper end
- 
      /**
+      * Instructs this Mob to set the specified LivingEntity as its target.
diff --git a/patches/api/Add-sun-related-API.patch b/patches/api/Add-sun-related-API.patch
index c39ae9ba0..4674cf2fe 100644
--- a/patches/api/Add-sun-related-API.patch
+++ b/patches/api/Add-sun-related-API.patch
@@ -41,5 +41,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    boolean isInDaylight();
      // Paper end
- 
      /**
+      * Instructs this Mob to set the specified LivingEntity as its target.
diff --git a/patches/api/Allow-disabling-armour-stand-ticking.patch b/patches/api/Allow-disabling-armour-stand-ticking.patch
index 722fc385c..97dc76057 100644
--- a/patches/api/Allow-disabling-armour-stand-ticking.patch
+++ b/patches/api/Allow-disabling-armour-stand-ticking.patch
@@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
-      * @param move {@code true} if this armour stand can move, {@code false} otherwise
-      */
-     void setCanMove(boolean move);
+ 
+     @Override
+     org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
 +
 +    /**
 +     * Tests if this armor stand can tick.
diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
index 6e5456757..8e94854f3 100644
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -31,6 +31,50 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       *
       * @return an array containing all previous players
       */
+diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/ArmorStand.java
++++ b/src/main/java/org/bukkit/entity/ArmorStand.java
+@@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
+      * @param move {@code true} if this armour stand can move, {@code false} otherwise
+      */
+     void setCanMove(boolean move);
++
++    @Override
++    org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/HumanEntity.java
++++ b/src/main/java/org/bukkit/entity/HumanEntity.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder {
+ 
++    // Paper start
++    @Override
++    org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
++    // Paper end
++
+     /**
+      * Returns the name of this player
+      *
+diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/Mob.java
++++ b/src/main/java/org/bukkit/entity/Mob.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public interface Mob extends LivingEntity, Lootable {
+ 
++    // Paper start
++    @Override
++    org.bukkit.inventory.@org.jetbrains.annotations.NotNull EntityEquipment getEquipment();
++    // Paper end
+     /**
+      * Instructs this Mob to set the specified LivingEntity as its target.
+      * <p>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
diff --git a/patches/api/Mob-Pathfinding-API.patch b/patches/api/Mob-Pathfinding-API.patch
index a8edb05ff..dd6a0bc1c 100644
--- a/patches/api/Mob-Pathfinding-API.patch
+++ b/patches/api/Mob-Pathfinding-API.patch
@@ -241,19 +241,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.jetbrains.annotations.Nullable;
  
  /**
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface Mob extends LivingEntity, Lootable {
- 
-+    // Paper start
+@@ -0,0 +0,0 @@ public interface Mob extends LivingEntity, Lootable {
+     // Paper start
+     @Override
+     org.bukkit.inventory.@org.jetbrains.annotations.NotNull EntityEquipment getEquipment();
++
 +    /**
 +     * Enables access to control the pathing of an Entity
 +     * @return Pathfinding Manager for this entity
 +     */
 +    @NotNull
 +    com.destroystokyo.paper.entity.Pathfinder getPathfinder();
-+    // Paper end
-+
+     // Paper end
      /**
       * Instructs this Mob to set the specified LivingEntity as its target.
-      * <p>