summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntitySkeletonWither.patch
blob: 089956eefa61339bb9b9e089459e74fc37762fea (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
--- a/net/minecraft/server/EntitySkeletonWither.java
+++ b/net/minecraft/server/EntitySkeletonWither.java
@@ -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();
 
@@ -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;