geforkt von Mirrors/Paper
76 Zeilen
3.0 KiB
Diff
76 Zeilen
3.0 KiB
Diff
--- a/net/minecraft/server/EntityCreeper.java
|
|
+++ b/net/minecraft/server/EntityCreeper.java
|
|
@@ -2,6 +2,11 @@
|
|
|
|
import java.util.Collection;
|
|
import java.util.Iterator;
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.bukkit.event.entity.ExplosionPrimeEvent;
|
|
+// CraftBukkit end
|
|
|
|
public class EntityCreeper extends EntityMonster {
|
|
|
|
@@ -165,9 +170,19 @@
|
|
@Override
|
|
public void onLightningStrike(WorldServer worldserver, EntityLightning entitylightning) {
|
|
super.onLightningStrike(worldserver, entitylightning);
|
|
- this.datawatcher.set(EntityCreeper.POWERED, true);
|
|
+ // CraftBukkit start
|
|
+ if (CraftEventFactory.callCreeperPowerEvent(this, entitylightning, org.bukkit.event.entity.CreeperPowerEvent.PowerCause.LIGHTNING).isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ this.setPowered(true);
|
|
}
|
|
|
|
+ public void setPowered(boolean powered) {
|
|
+ this.datawatcher.set(EntityCreeper.POWERED, powered);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
@Override
|
|
protected EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) {
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
|
@@ -192,10 +207,18 @@
|
|
Explosion.Effect explosion_effect = this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) ? Explosion.Effect.DESTROY : Explosion.Effect.NONE;
|
|
float f = this.isPowered() ? 2.0F : 1.0F;
|
|
|
|
- this.killed = true;
|
|
- this.world.explode(this, this.locX(), this.locY(), this.locZ(), (float) this.explosionRadius * f, explosion_effect);
|
|
- this.die();
|
|
- this.createEffectCloud();
|
|
+ // CraftBukkit start
|
|
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), this.explosionRadius * f, false);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+ if (!event.isCancelled()) {
|
|
+ this.killed = true;
|
|
+ this.world.createExplosion(this, this.locX(), this.locY(), this.locZ(), event.getRadius(), event.getFire(), explosion_effect);
|
|
+ this.die();
|
|
+ this.createEffectCloud();
|
|
+ } else {
|
|
+ fuseTicks = 0;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
}
|
|
@@ -206,6 +229,7 @@
|
|
if (!collection.isEmpty()) {
|
|
EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.world, this.locX(), this.locY(), this.locZ());
|
|
|
|
+ entityareaeffectcloud.setSource(this); // CraftBukkit
|
|
entityareaeffectcloud.setRadius(2.5F);
|
|
entityareaeffectcloud.setRadiusOnUse(-0.5F);
|
|
entityareaeffectcloud.setWaitTime(10);
|
|
@@ -219,7 +243,7 @@
|
|
entityareaeffectcloud.addEffect(new MobEffect(mobeffect));
|
|
}
|
|
|
|
- this.world.addEntity(entityareaeffectcloud);
|
|
+ this.world.addEntity(entityareaeffectcloud, CreatureSpawnEvent.SpawnReason.EXPLOSION); // CraftBukkit
|
|
}
|
|
|
|
}
|