From d4fe10394a2105f22e5bd2b519fb596fcaacd801 Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 27 Mar 2014 08:27:59 -0400 Subject: [Bleeding] Add many missing event calls. --- src/main/java/net/minecraft/server/EntityMonster.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/main/java/net/minecraft/server/EntityMonster.java') diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java index 6e02e2a5..d13a91e4 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -1,5 +1,6 @@ package net.minecraft.server; +import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityTargetEvent; // CraftBukkit public abstract class EntityMonster extends EntityCreature implements IMonster { @@ -108,7 +109,14 @@ public abstract class EntityMonster extends EntityCreature implements IMonster { int j = EnchantmentManager.getFireAspectEnchantmentLevel(this); if (j > 0) { - entity.setOnFire(j * 4); + // CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item + EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), j * 4); + org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent); + + if (!combustEvent.isCancelled()) { + entity.setOnFire(combustEvent.getDuration()); + } + // CraftBukkit end } if (entity instanceof EntityLiving) { -- cgit v1.2.3