diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch
index cb536157f6..8f32e343c7 100644
--- a/patches/api/0056-Fix-upstream-javadocs.patch
+++ b/patches/api/0056-Fix-upstream-javadocs.patch
@@ -74,6 +74,19 @@ index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f814
       * @param z Z-coordinate (0-15)
       * @return temperature at given coordinate
       */
+diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
+index 3d636cb7f275df053d202356c5e9fad5b1112867..4a06ed9c769acb2eb4c6f4b76c84dc2e63176010 100644
+--- a/src/main/java/org/bukkit/Particle.java
++++ b/src/main/java/org/bukkit/Particle.java
+@@ -209,7 +209,7 @@ public enum Particle implements Keyed {
+     }
+ 
+     /**
+-     * Options which can be applied to redstone dust particles - a particle
++     * Options which can be applied to dust particles - a particle
+      * color and size.
+      */
+     public static class DustOptions {
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
 index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc698715440 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
@@ -1450,7 +1463,7 @@ index 18c2864c99d4dfae16cdb35143486aeebb9a6fd6..d66857825528ee772219440dffa28ad8
       * AttributeModifiers without a slot are active in any slot.<br>
       * If there are no attributes set for the given slot, an empty map
 diff --git a/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java b/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
-index c1676991c3cc5f8d6e3f97d8cb356d6e2aa52809..4eadbcf766e69459c036a28f6e43523170558308 100644
+index c1676991c3cc5f8d6e3f97d8cb356d6e2aa52809..7f9eabcaa4d803ee524a9cc8717379fe6a93a5af 100644
 --- a/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
 @@ -8,8 +8,8 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
index 04e8bc9ac2..0b9d1fdb76 100644
--- a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,10 +10,10 @@ This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b529629192cea6900
+index 0000000000000000000000000000000000000000..52f639b838e8b49952c560f20bacbad0337f279c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
-@@ -0,0 +1,579 @@
+@@ -0,0 +1,583 @@
 +package com.destroystokyo.paper;
 +
 +import com.google.common.base.Preconditions;
@@ -454,7 +454,8 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +    }
 +
 +    /**
-+     * Sets the particle Color. Only valid for REDSTONE.
++     * Sets the particle Color.
++     * Only valid for {@link Particle#DUST}.
 +     *
 +     * @param color the new particle color
 +     * @return a reference to this object.
@@ -465,7 +466,8 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +    }
 +
 +    /**
-+     * Sets the particle Color and size. Only valid for REDSTONE.
++     * Sets the particle Color and size.
++     * Only valid for {@link Particle#DUST}.
 +     *
 +     * @param color the new particle color
 +     * @param size the size of the particle
@@ -474,7 +476,7 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +    @NotNull
 +    public ParticleBuilder color(@Nullable Color color, float size) {
 +        if (particle != Particle.DUST && color != null) {
-+            throw new IllegalStateException("Color may only be set on REDSTONE");
++            throw new IllegalStateException("Color may only be set on particle DUST.");
 +        }
 +
 +        // We don't officially support reusing these objects, but here we go
@@ -491,7 +493,8 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +
 +    /**
 +     * Sets the particle Color.
-+     * Only valid for REDSTONE.
++     * Only valid for {@link Particle#DUST}.
++     *
 +     * @param r red color component
 +     * @param g green color component
 +     * @param b blue color component
@@ -504,11 +507,10 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +
 +    /**
 +     * Sets the particle Color.
-+     * Only valid for REDSTONE.
++     * Only valid for {@link Particle#DUST}.
 +     *
 +     * @param rgb an integer representing the red, green, and blue color components
 +     * @return a reference to this object.
-+     * @throws IllegalArgumentException if called on a particle builder that does not have
 +     */
 +    @NotNull
 +    public ParticleBuilder color(final int rgb) {
@@ -516,7 +518,8 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +    }
 +
 +    /**
-+     * Sets the particle Color Transition. Only valid for DUST_COLOR_TRANSITION.
++     * Sets the particle Color Transition.
++     * Only valid for {@link Particle#DUST_COLOR_TRANSITION}.
 +     *
 +     * @param fromColor the new particle from color
 +     * @param toColor the new particle to color
@@ -530,7 +533,7 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +
 +    /**
 +     * Sets the particle Color Transition.
-+     * Only valid for DUST_COLOR_TRANSITION.
++     * Only valid for {@link Particle#DUST_COLOR_TRANSITION}.
 +     *
 +     * @param fromRed red color component for the from color
 +     * @param fromGreen green color component for the from color
@@ -549,7 +552,7 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +
 +    /**
 +     * Sets the particle Color Transition.
-+     * Only valid for DUST_COLOR_TRANSITION.
++     * Only valid for {@link Particle#DUST_COLOR_TRANSITION}.
 +     *
 +     * @param fromRgb an integer representing the red, green, and blue color components for the from color
 +     * @param toRgb   an integer representing the red, green, and blue color components for the to color
@@ -562,7 +565,8 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +    }
 +
 +    /**
-+     * Sets the particle Color Transition and size. Only valid for DUST_COLOR_TRANSITION.
++     * Sets the particle Color Transition and size.
++     * Only valid for {@link Particle#DUST_COLOR_TRANSITION}.
 +     *
 +     * @param fromColor the new particle color for the from color.
 +     * @param toColor the new particle color for the to color.
@@ -594,7 +598,7 @@ index 0000000000000000000000000000000000000000..e63aabacac12a153ee8f413b52962919
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 3d636cb7f275df053d202356c5e9fad5b1112867..b0ccd263cabe911d43cc13261011b64cacaeb7bb 100644
+index 4a06ed9c769acb2eb4c6f4b76c84dc2e63176010..c5e3a8143a166d426d87fa3d0f0b3d4f3d4bff1a 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
 @@ -208,6 +208,18 @@ public enum Particle implements Keyed {
@@ -614,7 +618,7 @@ index 3d636cb7f275df053d202356c5e9fad5b1112867..b0ccd263cabe911d43cc13261011b64c
 +    // Paper end
 +
      /**
-      * Options which can be applied to redstone dust particles - a particle
+      * Options which can be applied to dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
 index c489140bffdfdfa1e34e71489d308ed10cf10b21..b6d08d50c26aa0e69d2479d188fc3c690e8ed357 100644