From 70f7601bbd5c909ab6bf7192a81ef35aab32cf08 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Wed, 16 Jul 2014 20:58:49 -0400 Subject: [PATCH] HeatControl properly negates fire damage --- src/com/projectkorra/ProjectKorra/PKListener.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/projectkorra/ProjectKorra/PKListener.java b/src/com/projectkorra/ProjectKorra/PKListener.java index 70dac04d..50c386f1 100644 --- a/src/com/projectkorra/ProjectKorra/PKListener.java +++ b/src/com/projectkorra/ProjectKorra/PKListener.java @@ -781,6 +781,15 @@ public class PKListener implements Listener { event.setCancelled(true); Enflamed.dealFlameDamage(entity); } + + if (entity instanceof Player) { + Player player = (Player) entity; + if (Methods.getBoundability(player) != null && Methods.getBoundAbility(player).equalsIgnoreCase("HeatControl")) { + if (event.getCause() == DamageCause.FIRE || event.getCause() == DamageCause.FIRE_TICK) { + event.setCancelled(true); + } + } + } } @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)