--- a/net/minecraft/server/EntityTNTPrimed.java +++ b/net/minecraft/server/EntityTNTPrimed.java @@ -1,6 +1,7 @@ package net.minecraft.server; import javax.annotation.Nullable; +import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit public class EntityTNTPrimed extends Entity { @@ -8,6 +9,8 @@ @Nullable private EntityLiving source; private int fuseTicks; + public float yield = 4; // CraftBukkit - add field + public boolean isIncendiary = false; // CraftBukkit - add field public EntityTNTPrimed(EntityTypes<? extends EntityTNTPrimed> entitytypes, World world) { super(entitytypes, world); @@ -57,10 +60,13 @@ --this.fuseTicks; if (this.fuseTicks <= 0) { - this.die(); + // CraftBukkit start - Need to reverse the order of the explosion and the entity death so we have a location for the event + // this.die(); if (!this.world.isClientSide) { this.explode(); } + this.die(); + // CraftBukkit end } else { this.aJ(); if (this.world.isClientSide) { @@ -71,9 +77,16 @@ } private void explode() { - float f = 4.0F; + // CraftBukkit start + // float f = 4.0F; - this.world.explode(this, this.locX(), this.e(0.0625D), this.locZ(), 4.0F, Explosion.Effect.BREAK); + ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity()); + this.world.getServer().getPluginManager().callEvent(event); + + if (!event.isCancelled()) { + this.world.createExplosion(this, this.locX(), this.e(0.0625D), this.locZ(), event.getRadius(), event.getFire(), Explosion.Effect.BREAK); + } + // CraftBukkit end } @Override