diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
index d533919a02..63f4bbc3c0 100644
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -74,6 +74,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @param z Z-coordinate (0-15)
       * @return temperature at given coordinate
       */
+diff --git a/src/main/java/org/bukkit/HeightMap.java b/src/main/java/org/bukkit/HeightMap.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/HeightMap.java
++++ b/src/main/java/org/bukkit/HeightMap.java
+@@ -0,0 +0,0 @@ public enum HeightMap {
+      */
+     MOTION_BLOCKING,
+     /**
+-     * The highest block that blocks motion or contains a fluid or is in the
+-     * {@link Tag#LEAVES}.
++     * The highest block that blocks motion or contains a fluid, excluding leaves.
+      */
+     MOTION_BLOCKING_NO_LEAVES,
+     /**
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/Particle.java