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

Fix NPE found in FireBurst and Lightning

Browse source
This commit is contained in:
Jack Lin 2015-01-18 18:44:52 +13:00
parent db0c691892
commit 3e9d568d40
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)) if (AvatarState.isAvatarState(player))
chargetime = 0; 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; this.player = player;
instances.put(player, this); 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); stunChance = AvatarState.getValue(stunChance);
//stunDuration = AvatarState.getValue(stunDuration); //stunDuration = AvatarState.getValue(stunDuration);
} }
else if(BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) { else if(BendingManager.events.containsKey(player.getWorld())) {
chargeTime = 0; if (BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) {
cooldown = 0; chargeTime = 0;
cooldown = 0;
}
} }
instances.add(this); instances.add(this);
} }