diff --git a/patches/api/More-Projectile-API.patch b/patches/api/More-Projectile-API.patch
index ac1d7983f2..4048632d3f 100644
--- a/patches/api/More-Projectile-API.patch
+++ b/patches/api/More-Projectile-API.patch
@@ -100,16 +100,7 @@ diff --git a/src/main/java/org/bukkit/entity/ThrownPotion.java b/src/main/java/o
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/ThrownPotion.java
 +++ b/src/main/java/org/bukkit/entity/ThrownPotion.java
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Represents a thrown potion bottle
-  */
--public interface ThrownPotion extends Projectile {
-+public interface ThrownPotion extends ThrowableProjectile { // Paper - extend ThrowableProjectile
- 
-     /**
-      * Returns the effects that are applied by this potion.
-@@ -0,0 +0,0 @@ public interface ThrownPotion extends Projectile {
+@@ -0,0 +0,0 @@ public interface ThrownPotion extends ThrowableProjectile {
  
      /**
       * Set the ItemStack for this thrown potion.
diff --git a/patches/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 9ba97fba10..e476a7c86a 100644
--- a/patches/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
@@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.bukkit.inventory.ItemStack;
  import org.bukkit.potion.PotionEffect;
  
--public class CraftThrownPotion extends CraftProjectile implements ThrownPotion {
-+public class CraftThrownPotion extends CraftProjectile implements ThrownPotion, org.bukkit.entity.SplashPotion, org.bukkit.entity.LingeringPotion { // Paper - implement other classes to avoid violating spawn method generic contracts
+-public class CraftThrownPotion extends CraftThrowableProjectile implements ThrownPotion {
++public class CraftThrownPotion extends CraftThrowableProjectile implements ThrownPotion, org.bukkit.entity.SplashPotion, org.bukkit.entity.LingeringPotion { // Paper - implement other classes to avoid violating spawn method generic contracts
      public CraftThrownPotion(CraftServer server, net.minecraft.world.entity.projectile.ThrownPotion entity) {
          super(server, entity);
      }
diff --git a/patches/server/More-Projectile-API.patch b/patches/server/More-Projectile-API.patch
index c1d45bdddd..f876925cb7 100644
--- a/patches/server/More-Projectile-API.patch
+++ b/patches/server/More-Projectile-API.patch
@@ -161,7 +161,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-@@ -0,0 +0,0 @@ public class CraftThrownPotion extends CraftProjectile implements ThrownPotion {
+@@ -0,0 +0,0 @@ public class CraftThrownPotion extends CraftThrowableProjectile implements Throw
          Validate.notNull(item, "ItemStack cannot be null.");
  
          // The ItemStack must be a potion.
diff --git a/work/Bukkit b/work/Bukkit
index d43a1e722f..0b32cbaabe 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit d43a1e722f50396694cfaaa96f6059ca533d7b45
+Subproject commit 0b32cbaabe6aba2b4ccdcd9766e891637c0c4a52
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ead719a65b..cdef8fc72f 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ead719a65bf1202e32a4d81442a8bde1a62c07fd
+Subproject commit cdef8fc72fa074e96f1c00fdf3dad3f9d3a55f7e