diff --git a/Spigot-Server-Patches/Generator-Settings.patch b/Spigot-Server-Patches/Generator-Settings.patch
index 3a1eaa64d4..259f29faa6 100644
--- a/Spigot-Server-Patches/Generator-Settings.patch
+++ b/Spigot-Server-Patches/Generator-Settings.patch
@@ -41,15 +41,6 @@ diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/n
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
-@@ -0,0 +0,0 @@ public abstract class BiomeBase {
-     protected List<BiomeBase.BiomeMeta> x;
- 
-     public static int a(BiomeBase biomebase) {
--        return BiomeBase.REGISTRY_ID.a((Object) biomebase);
-+        return BiomeBase.REGISTRY_ID.a(biomebase); // Paper - Fix compile
-     }
- 
-     public static BiomeBase a(int i) {
 @@ -0,0 +0,0 @@ public abstract class BiomeBase {
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
  
diff --git a/Spigot-Server-Patches/Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/Player-Tab-List-and-Title-APIs.patch
index 2b157f09e8..4c1b8a893f 100644
--- a/Spigot-Server-Patches/Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/Player-Tab-List-and-Title-APIs.patch
@@ -47,16 +47,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public void b(PacketDataSerializer packetdataserializer) throws IOException {
-@@ -0,0 +0,0 @@ public class PacketPlayOutPlayerListHeaderFooter implements Packet<PacketListene
-         packetdataserializer.a(this.b);
-     }
- 
-+    // PaperSpigot - Fix compile error
-     public void a(PacketListenerPlayOut packetlistenerplayout) {
--        packetlistenerplayout.a(this);
-+        packetlistenerplayout.a((IChatBaseComponent) this);
-     }
- }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
@@ -95,17 +85,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
-@@ -0,0 +0,0 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
- 
-     }
- 
-+    // Paper - Fix compile error
-     public void a(PacketListenerPlayOut packetlistenerplayout) {
--        packetlistenerplayout.a(this);
-+        packetlistenerplayout.a((IChatBaseComponent) this);
-     }
- 
-     public static enum EnumTitleAction {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
diff --git a/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
index 15df9d13fe..40c936d855 100644
--- a/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
@@ -62,15 +62,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
-@@ -0,0 +0,0 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
-         return Objects.toStringHelper(this).add("x", this.getX()).add("y", this.getY()).add("z", this.getZ()).toString();
-     }
- 
--    public int compareTo(Object object) {
-+    public int compareTo(BaseBlockPosition object) { // Paper - correct decompile error
-         return this.i((BaseBlockPosition) object);
-     }
- }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
diff --git a/Spigot-Server-Patches/Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/Support-offline-mode-in-whitelist-command-as-well.patch
index d8b202d2ef..67bda86c37 100644
--- a/Spigot-Server-Patches/Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/Support-offline-mode-in-whitelist-command-as-well.patch
@@ -45,9 +45,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  } else if (astring[0].equals("reload")) {
                      minecraftserver.getPlayerList().reloadWhitelist();
 @@ -0,0 +0,0 @@ public class CommandWhitelist extends CommandAbstract {
-             return Collections.emptyList();
-         }
+         return a((ICommand) o);
      }
+     // Paper end
 +
 +    /**
 +     * Paper - Adds or removes a player from the game whitelist
@@ -85,12 +85,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            }
 +        }
 +    }
-+
-+    // Paper start - Fix decompiler error
-+    @Override
-+    public int compareTo(ICommand o) {
-+        return a((ICommand) o);
-+    }
-+    // Paper end
  }
 --
\ No newline at end of file
diff --git a/Spigot-Server-Patches/mc-dev-imports.patch b/Spigot-Server-Patches/mc-dev-imports.patch
index 2772de8447..8190e9e553 100644
--- a/Spigot-Server-Patches/mc-dev-imports.patch
+++ b/Spigot-Server-Patches/mc-dev-imports.patch
@@ -99,7 +99,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return Objects.toStringHelper(this).add("x", this.getX()).add("y", this.getY()).add("z", this.getZ()).toString();
 +    }
 +
-+    public int compareTo(Object object) {
++    public int compareTo(BaseBlockPosition object) { // Paper - correct decompile error
 +        return this.i((BaseBlockPosition) object);
 +    }
 +}
@@ -158,7 +158,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    protected List<BiomeBase.BiomeMeta> x;
 +
 +    public static int a(BiomeBase biomebase) {
-+        return BiomeBase.REGISTRY_ID.a((Object) biomebase);
++        return BiomeBase.REGISTRY_ID.a(biomebase); // Paper - Fix compile
 +    }
 +
 +    public static BiomeBase a(int i) {
@@ -4557,6 +4557,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            return Collections.emptyList();
 +        }
 +    }
++
++    // Paper start - Fix decompiler error
++    @Override
++    public int compareTo(ICommand o) {
++        return a((ICommand) o);
++    }
++    // Paper end
 +}
 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
 new file mode 100644
@@ -5074,7 +5081,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    public void a(PacketListenerPlayOut packetlistenerplayout) {
-+        packetlistenerplayout.a(this);
++        packetlistenerplayout.a((IChatBaseComponent) this); // Paper - Fix decompile error
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
@@ -5142,7 +5149,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    public void a(PacketListenerPlayOut packetlistenerplayout) {
-+        packetlistenerplayout.a(this);
++        packetlistenerplayout.a((IChatBaseComponent) this); // Paper - Fix decompile error
 +    }
 +
 +    public static enum EnumTitleAction {