36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
--- a/net/minecraft/world/entity/projectile/EntityThrownTrident.java
|
|
+++ b/net/minecraft/world/entity/projectile/EntityThrownTrident.java
|
|
@@ -24,6 +24,10 @@
|
|
import net.minecraft.world.phys.MovingObjectPositionEntity;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityThrownTrident extends EntityArrow {
|
|
|
|
private static final DataWatcherObject<Byte> ID_LOYALTY = DataWatcher.defineId(EntityThrownTrident.class, DataWatcherRegistry.BYTE);
|
|
@@ -75,10 +79,10 @@
|
|
}
|
|
}
|
|
|
|
- this.discard();
|
|
+ this.discard(EntityRemoveEvent.Cause.DROP); // CraftBukkit - add Bukkit remove cause
|
|
} else {
|
|
if (!(entity instanceof EntityHuman) && this.position().distanceTo(entity.getEyePosition()) < (double) entity.getBbWidth() + 1.0D) {
|
|
- this.discard();
|
|
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
|
|
return;
|
|
}
|
|
|
|
@@ -136,7 +140,7 @@
|
|
|
|
world = this.level();
|
|
if (world instanceof WorldServer) {
|
|
- worldserver = (WorldServer) world;
|
|
+ WorldServer worldserver = (WorldServer) world; // CraftBukkit - decompile error
|
|
EnchantmentManager.doPostAttackEffectsWithItemSourceOnBreak(worldserver, entity, damagesource, this.getWeaponItem(), (item) -> {
|
|
this.kill(worldserver);
|
|
});
|