2021-03-16 09:00:00 +11:00
|
|
|
--- a/net/minecraft/world/entity/projectile/EntityEvokerFangs.java
|
|
|
|
+++ b/net/minecraft/world/entity/projectile/EntityEvokerFangs.java
|
2024-02-21 20:55:34 +11:00
|
|
|
@@ -14,6 +14,10 @@
|
|
|
|
import net.minecraft.world.entity.TraceableEntity;
|
|
|
|
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;
|
|
|
|
@@ -118,7 +122,7 @@
|
|
|
|
}
|
|
|
|
|
|
|
|
if (--this.lifeTicks < 0) {
|
|
|
|
- this.discard();
|
|
|
|
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -129,7 +133,7 @@
|
2017-07-08 22:40:54 +10:00
|
|
|
|
2019-04-23 12:00:00 +10:00
|
|
|
if (entityliving.isAlive() && !entityliving.isInvulnerable() && entityliving != entityliving1) {
|
2017-07-08 22:40:54 +10:00
|
|
|
if (entityliving1 == null) {
|
2024-02-11 09:54:25 +11:00
|
|
|
- entityliving.hurt(this.damageSources().magic(), 6.0F);
|
|
|
|
+ entityliving.hurt(this.damageSources().magic().customCausingEntity(this), 6.0F); // CraftBukkit
|
2017-07-08 22:40:54 +10:00
|
|
|
} else {
|
2021-11-22 09:00:00 +11:00
|
|
|
if (entityliving1.isAlliedTo((Entity) entityliving)) {
|
2017-07-08 22:40:54 +10:00
|
|
|
return;
|