--- a/net/minecraft/world/entity/projectile/EntityFireworks.java +++ b/net/minecraft/world/entity/projectile/EntityFireworks.java @@ -29,6 +29,8 @@ import net.minecraft.world.phys.MovingObjectPositionEntity; import net.minecraft.world.phys.Vec3D; +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit + public class EntityFireworks extends IProjectile implements ItemSupplier { public static final DataWatcherObject DATA_ID_FIREWORKS_ITEM = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.ITEM_STACK); @@ -141,7 +143,7 @@ MovingObjectPosition movingobjectposition = ProjectileHelper.a((Entity) this, this::a); if (!this.noPhysics) { - this.a(movingobjectposition); + this.preOnHit(movingobjectposition); // CraftBukkit - projectile hit event this.hasImpulse = true; } @@ -156,7 +158,11 @@ } if (!this.level.isClientSide && this.life > this.lifetime) { - this.explode(); + // CraftBukkit start + if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { + this.explode(); + } + // CraftBukkit end } } @@ -172,7 +178,11 @@ protected void a(MovingObjectPositionEntity movingobjectpositionentity) { super.a(movingobjectpositionentity); if (!this.level.isClientSide) { - this.explode(); + // CraftBukkit start + if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { + this.explode(); + } + // CraftBukkit end } } @@ -182,7 +192,11 @@ this.level.getType(blockposition).a(this.level, blockposition, (Entity) this); if (!this.level.isClientSide() && this.hasExplosions()) { - this.explode(); + // CraftBukkit start + if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { + this.explode(); + } + // CraftBukkit end } super.a(movingobjectpositionblock); @@ -208,7 +222,9 @@ if (f > 0.0F) { if (this.attachedToEntity != null) { + CraftEventFactory.entityDamage = this; // CraftBukkit this.attachedToEntity.damageEntity(DamageSource.a(this, this.getShooter()), 5.0F + (float) (nbttaglist.size() * 2)); + CraftEventFactory.entityDamage = null; // CraftBukkit } double d0 = 5.0D; @@ -235,7 +251,9 @@ if (flag) { float f1 = f * (float) Math.sqrt((5.0D - (double) this.e((Entity) entityliving)) / 5.0D); + CraftEventFactory.entityDamage = this; // CraftBukkit entityliving.damageEntity(DamageSource.a(this, this.getShooter()), f1); + CraftEventFactory.entityDamage = null; // CraftBukkit } } }