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
This commit is contained in:
Nassim Jahnke
2022-08-17 13:02:35 +02:00
parent 53102645d2
commit 0446f518f4
5 changed files with 6 additions and 15 deletions

View File

@@ -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.