diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
index 670a11e52d..8e7703b345 100644
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -1079,6 +1079,126 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      /**
       * Sets the entities armor to the provided array of ItemStacks
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop killed by anything
+      * </ul>
+      *
+      * @return chance of the currently held item being dropped (1 for non-{@link Mob})
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @param chance the chance of the main hand item being dropped
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @return chance of the off hand item being dropped (1 for non-{@link Mob})
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @param chance the chance of off hand item being dropped
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @return the chance of the helmet being dropped (1 for non-{@link Mob})
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @param chance of the helmet being dropped
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @return the chance of the chest plate being dropped (1 for non-{@link Mob})
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @param chance of the chest plate being dropped
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @return the chance of the leggings being dropped (1 for non-{@link Mob})
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @param chance chance of the leggings being dropped
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @return the chance of the boots being dropped (1 for non-{@link Mob})
+@@ -0,0 +0,0 @@ public interface EntityEquipment {
+      *
+      * <ul>
+      * <li>A drop chance of 0.0F will never drop
+-     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
+      * </ul>
+      *
+      * @param chance of the boots being dropped
 diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFlag.java
diff --git a/patches/api/add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/add-get-set-drop-chance-to-EntityEquipment.patch
index 688074e1c3..58bab0013d 100644
--- a/patches/api/add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/add-get-set-drop-chance-to-EntityEquipment.patch
@@ -18,7 +18,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *
 +     * <ul>
 +     * <li>A drop chance of 0.0F will never drop
-+     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
 +     * </ul>
 +     *
 +     * @param slot the slot to get the drop chance of
@@ -31,7 +32,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *
 +     * <ul>
 +     * <li>A drop chance of 0.0F will never drop
-+     * <li>A drop chance of 1.0F will always drop
++     * <li>A drop chance of 1.0F will always drop if killed by a player
++     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
 +     * </ul>
 +     *
 +     * @param slot the slot to set the drop chance of