TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-12 03:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #286 from Simplicitee/patch-22

Browse source 
Fix invincible FireJet
This commit is contained in:
OmniCypher 2015-11-08 19:56:15 -08:00
commit a8709e6086
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/com/projectkorra/projectkorra/firebending/FireJet.java
View file

@ -56,7 +56,6 @@ public class FireJet extends CoreAbility {
// timers.put(player, time); // timers.put(player, time);
//instances.put(player, this); //instances.put(player, this);
putInstance(player, this); putInstance(player, this);
GeneralMethods.invincible.add(this);
bPlayer.addCooldown("FireJet", config.get().getLong("Abilities.Fire.FireJet.Cooldown")); bPlayer.addCooldown("FireJet", config.get().getLong("Abilities.Fire.FireJet.Cooldown"));
} }
@ -132,6 +131,12 @@ public class FireJet extends CoreAbility {
defaultduration = config.get().getLong("Abilities.Fire.FireJet.Duration"); defaultduration = config.get().getLong("Abilities.Fire.FireJet.Duration");
isToggle = config.get().getBoolean("Abilities.Fire.FireJet.IsAvatarStateToggle"); isToggle = config.get().getBoolean("Abilities.Fire.FireJet.IsAvatarStateToggle");
} }
@Override
public void remove() {
super.remove();
GeneralMethods.invincible.remove(this);
}
public void setDuration(long duration) { public void setDuration(long duration) {
this.duration = duration; this.duration = duration;