--- a/net/minecraft/server/EntityFireworks.java +++ b/net/minecraft/server/EntityFireworks.java @@ -3,12 +3,13 @@ import java.util.Iterator; import java.util.List; import java.util.OptionalInt; +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntityFireworks extends Entity implements IProjectile { public static final DataWatcherObject FIREWORK_ITEM = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.g); private static final DataWatcherObject c = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.r); - private static final DataWatcherObject d = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.i); + public static final DataWatcherObject d = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.i); // PAIL private int ticksFlown; public int expectedLifespan; private EntityLiving ridingEntity; @@ -133,7 +134,11 @@ } if (!this.world.isClientSide && this.ticksFlown > this.expectedLifespan) { - this.explode(); + // CraftBukkit start + if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { + this.explode(); + } + // CraftBukkit end } } @@ -146,7 +151,11 @@ protected void a(MovingObjectPosition movingobjectposition) { if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY && !this.world.isClientSide) { - this.explode(); + // CraftBukkit start + if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { + this.explode(); + } + // CraftBukkit end } else if (this.z) { BlockPosition blockposition; @@ -158,7 +167,11 @@ this.world.getType(blockposition).a(this.world, blockposition, (Entity) this); if (this.l()) { - this.explode(); + // CraftBukkit start + if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { + this.explode(); + } + // CraftBukkit end } } @@ -184,7 +197,9 @@ if (f > 0.0F) { if (this.ridingEntity != null) { + CraftEventFactory.entityDamage = this; // CraftBukkit this.ridingEntity.damageEntity(DamageSource.FIREWORKS, 5.0F + (float) (nbttaglist.size() * 2)); + CraftEventFactory.entityDamage = null; // CraftBukkit } double d0 = 5.0D; @@ -211,7 +226,9 @@ if (flag) { float f1 = f * (float) Math.sqrt((5.0D - (double) this.g(entityliving)) / 5.0D); + CraftEventFactory.entityDamage = this; // CraftBukkit entityliving.damageEntity(DamageSource.FIREWORKS, f1); + CraftEventFactory.entityDamage = null; // CraftBukkit } } }