mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 03:52:45 +01:00
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
--- a/net/minecraft/world/entity/projectile/EntityEvokerFangs.java
|
|
+++ b/net/minecraft/world/entity/projectile/EntityEvokerFangs.java
|
|
@@ -17,6 +17,10 @@
|
|
import net.minecraft.world.item.enchantment.EnchantmentManager;
|
|
import net.minecraft.world.level.World;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityEvokerFangs extends Entity implements TraceableEntity {
|
|
|
|
public static final int ATTACK_DURATION = 20;
|
|
@@ -121,7 +125,7 @@
|
|
}
|
|
|
|
if (--this.lifeTicks < 0) {
|
|
- this.discard();
|
|
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
|
|
}
|
|
}
|
|
|
|
@@ -132,7 +136,7 @@
|
|
|
|
if (entityliving.isAlive() && !entityliving.isInvulnerable() && entityliving != entityliving1) {
|
|
if (entityliving1 == null) {
|
|
- entityliving.hurt(this.damageSources().magic(), 6.0F);
|
|
+ entityliving.hurt(this.damageSources().magic().customEntityDamager(this), 6.0F); // CraftBukkit
|
|
} else {
|
|
if (entityliving1.isAlliedTo((Entity) entityliving)) {
|
|
return;
|