diff --git a/nms-patches/EntitySmallFireball.patch b/nms-patches/EntitySmallFireball.patch index b166c7328..30c995082 100644 --- a/nms-patches/EntitySmallFireball.patch +++ b/nms-patches/EntitySmallFireball.patch @@ -20,25 +20,23 @@ } public EntitySmallFireball(World world, double d0, double d1, double d2, double d3, double d4, double d5) { -@@ -24,7 +31,16 @@ +@@ -24,7 +31,14 @@ Entity entity1 = this.getShooter(); int i = entity.getFireTicks(); - entity.setOnFire(5); + // CraftBukkit start - Entity damage by entity event + combust event -+ if (isIncendiary) { -+ EntityCombustByEntityEvent event = new EntityCombustByEntityEvent((org.bukkit.entity.Projectile) this.getBukkitEntity(), entity.getBukkitEntity(), 5); -+ entity.world.getServer().getPluginManager().callEvent(event); ++ EntityCombustByEntityEvent event = new EntityCombustByEntityEvent((org.bukkit.entity.Projectile) this.getBukkitEntity(), entity.getBukkitEntity(), 5); ++ entity.world.getServer().getPluginManager().callEvent(event); + -+ if (!event.isCancelled()) { -+ entity.setOnFire(event.getDuration(), false); -+ } ++ if (!event.isCancelled()) { ++ entity.setOnFire(event.getDuration(), false); + } + // CraftBukkit end boolean flag = entity.damageEntity(DamageSource.fireball(this, entity1), 5.0F); if (!flag) { -@@ -43,10 +59,10 @@ +@@ -43,10 +57,10 @@ if (!this.world.isClientSide) { Entity entity = this.getShooter();