PaperMC/nms-patches/EntitySkeletonWither.patch

29 lines
1 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/EntitySkeletonWither.java
+++ b/net/minecraft/server/EntitySkeletonWither.java
2018-07-15 02:00:00 +02:00
@@ -32,7 +32,7 @@
}
public void die(DamageSource damagesource) {
- super.die(damagesource);
+ // super.die(damagesource); // CraftBukkit
if (damagesource.getEntity() instanceof EntityCreeper) {
EntityCreeper entitycreeper = (EntityCreeper) damagesource.getEntity();
2018-07-15 02:00:00 +02:00
@@ -41,6 +41,7 @@
this.a((IMaterial) Items.WITHER_SKELETON_SKULL);
}
}
+ super.die(damagesource); // CraftBukkit - moved from above
}
@@ -68,7 +69,7 @@
return false;
} else {
if (entity instanceof EntityLiving) {
- ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.WITHER, 200));
+ ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.WITHER, 200), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
}
return true;