diff options
| author | Nassim Jahnke <[email protected]> | 2022-08-17 13:02:35 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2022-08-17 13:02:35 +0200 |
| commit | 2da891fcfacf585956781cb0f5694605d75dba60 (patch) | |
| tree | 48037c0acc3293eff2c01551faf9ecc5805aeea0 /patches/api/0371-More-Projectile-API.patch | |
| parent | 4ba43fe02a01abbbccac73f6ff992b6c667accb0 (diff) | |
| download | Paper-2da891fcfacf585956781cb0f5694605d75dba60.tar.gz Paper-2da891fcfacf585956781cb0f5694605d75dba60.zip | |
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
Diffstat (limited to 'patches/api/0371-More-Projectile-API.patch')
| -rw-r--r-- | patches/api/0371-More-Projectile-API.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/patches/api/0371-More-Projectile-API.patch b/patches/api/0371-More-Projectile-API.patch index 900562612a..6a949d5721 100644 --- a/patches/api/0371-More-Projectile-API.patch +++ b/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; - /** - * 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 { +@@ -32,12 +32,34 @@ public interface ThrownPotion extends ThrowableProjectile { /** * Set the ItemStack for this thrown potion. |