--- a/net/minecraft/server/EntityWitherSkull.java +++ b/net/minecraft/server/EntityWitherSkull.java @@ -1,5 +1,7 @@ package net.minecraft.server; +import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit + public class EntityWitherSkull extends EntityFireball { private static final DataWatcherObject<Boolean> e = DataWatcher.a(EntityWitherSkull.class, DataWatcherRegistry.i); @@ -43,7 +45,7 @@ if (entity.isAlive()) { this.a(entityliving, entity); } else { - entityliving.heal(5.0F); + entityliving.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit } } } else { @@ -60,7 +62,7 @@ } if (b0 > 0) { - ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.WITHER, 20 * b0, 1)); + ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.WITHER, 20 * b0, 1), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit } } @@ -73,7 +75,15 @@ if (!this.world.isClientSide) { Explosion.Effect explosion_effect = this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) ? Explosion.Effect.DESTROY : Explosion.Effect.NONE; - this.world.createExplosion(this, this.locX(), this.locY(), this.locZ(), 1.0F, false, explosion_effect); + // CraftBukkit start + // this.world.createExplosion(this, this.locX(), this.locY(), this.locZ(), 1.0F, false, explosion_effect); + ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 1.0F, false); + this.world.getServer().getPluginManager().callEvent(event); + + if (!event.isCancelled()) { + this.world.createExplosion(this, this.locX(), this.locY(), this.locZ(), event.getRadius(), event.getFire(), explosion_effect); + } + // CraftBukkit end this.die(); }