From e606c08836516f45ba301c51cd76dcf04e58bd2e Mon Sep 17 00:00:00 2001 From: Simplicitee Date: Sun, 8 Nov 2015 22:15:51 -0500 Subject: [PATCH 1/2] Fix invincible FireJet - Fixes invincible in firejet, making it remove that instance of firejet from the invincible arraylist --- src/com/projectkorra/projectkorra/firebending/FireJet.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/projectkorra/projectkorra/firebending/FireJet.java b/src/com/projectkorra/projectkorra/firebending/FireJet.java index cbf14d4d..26b3eda0 100644 --- a/src/com/projectkorra/projectkorra/firebending/FireJet.java +++ b/src/com/projectkorra/projectkorra/firebending/FireJet.java @@ -132,6 +132,12 @@ public class FireJet extends CoreAbility { defaultduration = config.get().getLong("Abilities.Fire.FireJet.Duration"); isToggle = config.get().getBoolean("Abilities.Fire.FireJet.IsAvatarStateToggle"); } + + @Override + public void remove() { + super.remove(); + GeneralMethods.invincible.remove(this); + } public void setDuration(long duration) { this.duration = duration; From fa9ee5e53c4fd39fc2b267cca970ecf63cc2c00d Mon Sep 17 00:00:00 2001 From: Simplicitee Date: Sun, 8 Nov 2015 22:19:22 -0500 Subject: [PATCH 2/2] Removal - Removes second instance of GeneralMethods.invincible.add(this); from FireJet, unneeded. --- src/com/projectkorra/projectkorra/firebending/FireJet.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/firebending/FireJet.java b/src/com/projectkorra/projectkorra/firebending/FireJet.java index 26b3eda0..101e25ad 100644 --- a/src/com/projectkorra/projectkorra/firebending/FireJet.java +++ b/src/com/projectkorra/projectkorra/firebending/FireJet.java @@ -56,7 +56,6 @@ public class FireJet extends CoreAbility { // timers.put(player, time); //instances.put(player, this); putInstance(player, this); - GeneralMethods.invincible.add(this); bPlayer.addCooldown("FireJet", config.get().getLong("Abilities.Fire.FireJet.Cooldown")); }