TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-15 05:17:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #404 from savior67/master

Browse source 
- EntityBendingDeathEvent now triggers from fire-related deaths
This commit is contained in:
OmniCypher 2016-02-15 19:14:09 -08:00
commit b701c86387
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/com/projectkorra/projectkorra/firebending/FireDamageTimer.java
View file

@ -1,9 +1,14 @@
package com.projectkorra.projectkorra.firebending; package com.projectkorra.projectkorra.firebending;
import org.bukkit.Bukkit;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; 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; import java.util.concurrent.ConcurrentHashMap;
public class FireDamageTimer { public class FireDamageTimer {
@ -49,6 +54,11 @@ public class FireDamageTimer {
} }
LivingEntity Lentity = (LivingEntity) entity; LivingEntity Lentity = (LivingEntity) entity;
Player source = INSTANCES.get(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); Lentity.damage(DAMAGE, source);
if (entity.getFireTicks() > MAX_TICKS) { if (entity.getFireTicks() > MAX_TICKS) {
entity.setFireTicks(MAX_TICKS); entity.setFireTicks(MAX_TICKS);