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/0371-More-Projectile-API.patch

@@ -97,19 +97,10 @@ index d1b37530319f6d37ee37f62080289c1e45848bc8..e94c7e279356c510f60508b26277d489
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/ThrownPotion.java b/src/main/java/org/bukkit/entity/ThrownPotion.java
-index 10a3c297bd87ad3ab4555054858f47a479e76e1a..977e150569bed69d5d28ae685c9c4a7903fa42a0 100644
+index 7051e07b4e456aae0ec9e37808b59e5fa62a4027..225ac312613b9e8f3cf680819f2ebe350d1bf48a 100644
 --- a/src/main/java/org/bukkit/entity/ThrownPotion.java
 +++ b/src/main/java/org/bukkit/entity/ThrownPotion.java
-@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -32,12 +32,34 @@ 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.
-@@ -32,12 +32,34 @@ public interface ThrownPotion extends Projectile {
  
      /**
       * Set the ItemStack for this thrown potion.

patches/server/0861-More-Projectile-API.patch

@@ -158,10 +158,10 @@ index 6bfa984781a483d048ef4318761203c701d8a632..5e0c2c5094e1578162d1a50d50701fbd
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-index b08739dd1ffd041f0885af6c1f57dca9027763b6..73293157d694adb5a9a41c2cf350c6400f2e8206 100644
+index 0db8aa840ea026d48215ac5dc80ffde5f12725b1..397e0df15a0e64e5bc522f62f3b327a5039ec4c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-@@ -39,11 +39,31 @@ public class CraftThrownPotion extends CraftProjectile implements ThrownPotion {
+@@ -39,11 +39,31 @@ public class CraftThrownPotion extends CraftThrowableProjectile implements Throw
          Validate.notNull(item, "ItemStack cannot be null.");
  
          // The ItemStack must be a potion.

patches/server/0910-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch

@@ -7,15 +7,15 @@ Remove in 1.19 along with the SplashPotion and
 LingeringPotion interfaces
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-index c1594f62c06a49ba2d0c2c6e6befcda7d1fe6e1b..793d12cd7f2782cb412535fa7ec8ae9f57c082b0 100644
+index 397e0df15a0e64e5bc522f62f3b327a5039ec4c8..a926f4dc51821a05c28872dc90ad000fe8cb51f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 @@ -14,7 +14,7 @@ import org.bukkit.entity.ThrownPotion;
  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);
      }

work/Bukkit

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

work/CraftBukkit

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