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

Merge pull request #89 from jacklin213/bugfix

Browse source 
Fix NPE found in FireBurst and Lightning
This commit is contained in:
MistPhizzle 2015-01-22 19:37:55 -05:00
commit d5feed9c79
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/ProjectKorra/firebending/FireBurst.java
View file

@ -44,7 +44,9 @@ public class FireBurst {
}
if (AvatarState.isAvatarState(player))
chargetime = 0;
if (BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) chargetime = 0;
if (BendingManager.events.containsKey(player.getWorld())) {
if(BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) chargetime = 0;
}
this.player = player;
instances.put(player, this);
}

8
src/com/projectkorra/ProjectKorra/firebending/Lightning.java
View file

@ -90,9 +90,11 @@ public class Lightning {
stunChance = AvatarState.getValue(stunChance);
//stunDuration = AvatarState.getValue(stunDuration);
}
else if(BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) {
chargeTime = 0;
cooldown = 0;
else if(BendingManager.events.containsKey(player.getWorld())) {
if (BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) {
chargeTime = 0;
cooldown = 0;
}
}
instances.add(this);
}