diff --git a/patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch
index 117495396f..1f2b880d46 100644
--- a/patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -454,7 +454,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    /**
-+     * 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..00000000000000000000000000000000
 +    }
 +
 +    /**
-+     * 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..00000000000000000000000000000000
 +    @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..00000000000000000000000000000000
 +
 +    /**
 +     * 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..00000000000000000000000000000000
 +
 +    /**
 +     * 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..00000000000000000000000000000000
 +    }
 +
 +    /**
-+     * 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..00000000000000000000000000000000
 +
 +    /**
 +     * 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..00000000000000000000000000000000
 +
 +    /**
 +     * 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..00000000000000000000000000000000
 +    }
 +
 +    /**
-+     * 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.
@@ -614,7 +618,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
index 7ada732469..afc735a93b 100644
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -74,6 +74,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/Particle.java
++++ b/src/main/java/org/bukkit/Particle.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java