From 81bcfa9867a54b05d53bb3e4244caf24256c8631 Mon Sep 17 00:00:00 2001 From: savior67 Date: Mon, 15 Feb 2016 21:40:05 -0500 Subject: [PATCH] - EntityBendingDeathEvent now triggers when an entity is killed by fire originating from a bending ability --- .../projectkorra/firebending/FireDamageTimer.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/com/projectkorra/projectkorra/firebending/FireDamageTimer.java b/src/com/projectkorra/projectkorra/firebending/FireDamageTimer.java index 301f6d75..3a47153a 100644 --- a/src/com/projectkorra/projectkorra/firebending/FireDamageTimer.java +++ b/src/com/projectkorra/projectkorra/firebending/FireDamageTimer.java @@ -1,9 +1,14 @@ package com.projectkorra.projectkorra.firebending; +import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import com.projectkorra.projectkorra.Element; +import com.projectkorra.projectkorra.ability.CoreAbility; +import com.projectkorra.projectkorra.event.EntityBendingDeathEvent; + import java.util.concurrent.ConcurrentHashMap; public class FireDamageTimer { @@ -49,6 +54,11 @@ public class FireDamageTimer { } LivingEntity Lentity = (LivingEntity) entity; Player source = INSTANCES.get(entity); + if (Lentity.getHealth() - DAMAGE <= 0 && !entity.isDead()) { + EntityBendingDeathEvent event = new EntityBendingDeathEvent(entity, source, DAMAGE, CoreAbility.getAbilitiesByElement(Element.FIRE).get(0).getName()); + Bukkit.getServer().getPluginManager().callEvent(event); + } + Lentity.damage(DAMAGE, source); if (entity.getFireTicks() > MAX_TICKS) { entity.setFireTicks(MAX_TICKS);