Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
0b32cbaa PR-782: ThrownPotion now extends ThrowableProjectile
474238ca SPIGOT-7138: Can't retrieve pixel color from map

CraftBukkit Changes:
cdef8fc72 PR-1097: CraftThrownPotion now extends CraftThrowableProjectile
419010b13 SPIGOT-7112: Mobs added 1.17 and after do not create an EntityTargetEvent properly
e71426201 SPIGOT-7079: Allays don't call EntityTargetEvent on ground items
f80adb8b9 SPIGOT-7138: Can't retrieve pixel color from map

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;
+@@ -0,0 +0,0 @@ public interface ThrownPotion extends ThrowableProjectile {
- /**
-  * 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 {
  
      /**
       * Set the ItemStack for this thrown potion.

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 CraftThrowableProjectile 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, 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);
      }

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.

work/Bukkit

@@ -1 +1 @@
-Subproject commit d43a1e722f50396694cfaaa96f6059ca533d7b45
+Subproject commit 0b32cbaabe6aba2b4ccdcd9766e891637c0c4a52

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit ead719a65bf1202e32a4d81442a8bde1a62c07fd
+Subproject commit cdef8fc72fa074e96f1c00fdf3dad3f9d3a55f7e