diff --git a/Spigot-API-Patches/Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-API-Patches/Add-Raw-Byte-ItemStack-Serialization.patch
index 01e6431ff1..3369e5329c 100644
--- a/Spigot-API-Patches/Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/Spigot-API-Patches/Add-Raw-Byte-ItemStack-Serialization.patch
@@ -33,6 +33,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *
 +     * This expects that the DataVersion was stored on the root of the Compound, as saved from
 +     * the {@link #serializeAsBytes()} API returned.
++     * @param bytes bytes representing an item in NBT
 +     * @return ItemStack migrated to this version of Minecraft if needed.
 +     */
 +    @NotNull
diff --git a/Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
index 69a198155c..6c4a763b5e 100644
--- a/Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -519,8 +519,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
+      * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
-      * @param <T> Type
       */
 -    public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
 +    public default <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data) { spawnParticle(particle, null, null, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, true); }// Paper start - Expand Particle API
diff --git a/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
index bee42b9306..bd3174644d 100644
--- a/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
@@ -5,86 +5,6 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      * @param count the number of particles
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      * @param count the number of particles
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      * @param offsetZ the maximum random offset on the Z axis
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      * @param offsetZ the maximum random offset on the Z axis
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      *              particle used (normally speed)
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      *              particle used (normally speed)
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      * @param force whether to send the particle to players within an extended
-      *              range and encourage their client to render it regardless of
-      *              settings
-+     * @param <T> Particle data type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
- 
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      * @param force whether to send the particle to players within an extended
-      *              range and encourage their client to render it regardless of
-      *              settings
-+     * @param <T> Particle data type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
- 
-diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-@@ -0,0 +0,0 @@ public interface AreaEffectCloud extends Entity {
-      * @param particle the new particle type
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> the particle data type // Paper
-      */
-     <T> void setParticle(@NotNull Particle particle, @Nullable T data);
- 
 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
@@ -130,54 +50,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param count the number of particles
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param count the number of particles
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param offsetZ the maximum random offset on the Z axis
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param offsetZ the maximum random offset on the Z axis
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *              particle used (normally speed)
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
- 
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *              particle used (normally speed)
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-      */
-     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
- 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java