mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 01:10:37 +01:00
2da891fcfa
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
22 lines
1.3 KiB
Diff
22 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 21 Apr 2022 18:18:02 -0700
|
|
Subject: [PATCH] Fix CCE for SplashPotion and LingeringPotion spawning
|
|
|
|
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 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 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);
|
|
}
|