diff options
author | GJ <gjmcferrin@gmail.com> | 2014-03-27 08:27:59 -0400 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-04-18 09:01:11 -0500 |
commit | d4fe10394a2105f22e5bd2b519fb596fcaacd801 (patch) | |
tree | 5adc7d3298dab7714a3777afc37a82f032ef3aa2 /src/main/java/net/minecraft/server/EntityHuman.java | |
parent | 286c71329d25b6646e4da932ca6723a056b152cf (diff) | |
download | craftbukkit-d4fe10394a2105f22e5bd2b519fb596fcaacd801.tar craftbukkit-d4fe10394a2105f22e5bd2b519fb596fcaacd801.tar.gz craftbukkit-d4fe10394a2105f22e5bd2b519fb596fcaacd801.tar.lz craftbukkit-d4fe10394a2105f22e5bd2b519fb596fcaacd801.tar.xz craftbukkit-d4fe10394a2105f22e5bd2b519fb596fcaacd801.zip |
[Bleeding] Add many missing event calls.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHuman.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index b4a01227..381ba316 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -911,8 +911,15 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen int j = EnchantmentManager.getFireAspectEnchantmentLevel(this); if (entity instanceof EntityLiving && j > 0 && !entity.isBurning()) { - flag1 = true; - entity.setOnFire(1); + // CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item + EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 1); + org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent); + + if (!combustEvent.isCancelled()) { + flag1 = true; + entity.setOnFire(combustEvent.getDuration()); + } + // CraftBukkit end } boolean flag2 = entity.damageEntity(DamageSource.playerAttack(this), f); |