52 lines
2.4 KiB
Diff
52 lines
2.4 KiB
Diff
--- a/net/minecraft/world/entity/projectile/EntityWitherSkull.java
|
|
+++ b/net/minecraft/world/entity/projectile/EntityWitherSkull.java
|
|
@@ -24,6 +24,11 @@
|
|
import net.minecraft.world.phys.MovingObjectPositionEntity;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+import org.bukkit.event.entity.ExplosionPrimeEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityWitherSkull extends EntityFireball {
|
|
|
|
private static final DataWatcherObject<Boolean> DATA_DANGEROUS = DataWatcher.<Boolean>defineId(EntityWitherSkull.class, DataWatcherRegistry.BOOLEAN);
|
|
@@ -70,7 +75,7 @@
|
|
if (entity.isAlive()) {
|
|
EnchantmentManager.doPostAttackEffects(worldserver, entity, damagesource);
|
|
} else {
|
|
- entityliving.heal(5.0F);
|
|
+ entityliving.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
|
|
}
|
|
}
|
|
} else {
|
|
@@ -87,7 +92,7 @@
|
|
}
|
|
|
|
if (i > 0) {
|
|
- entityliving1.addEffect(new MobEffect(MobEffects.WITHER, 20 * i, 1), this.getEffectSource());
|
|
+ entityliving1.addEffect(new MobEffect(MobEffects.WITHER, 20 * i, 1), this.getEffectSource(), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
|
|
}
|
|
}
|
|
|
|
@@ -98,8 +103,16 @@
|
|
protected void onHit(MovingObjectPosition movingobjectposition) {
|
|
super.onHit(movingobjectposition);
|
|
if (!this.level().isClientSide) {
|
|
- this.level().explode(this, this.getX(), this.getY(), this.getZ(), 1.0F, false, World.a.MOB);
|
|
- this.discard();
|
|
+ // CraftBukkit start
|
|
+ // this.level().explode(this, this.getX(), this.getY(), this.getZ(), 1.0F, false, World.a.MOB);
|
|
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 1.0F, false);
|
|
+ this.level().getCraftServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), World.a.MOB);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+ this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
|
|
}
|
|
|
|
}
|