TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-09-11 12:49:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #218 from kingbirdy/master

Browse source 
Fix NPE in GeneralMethods
This commit is contained in:
MistPhizzle 2015-08-23 18:23:41 -05:00
parent c8a5451235 ba76586243
commit 93e18ea975
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -830,7 +830,7 @@ public class PKListener implements Listener {
element = GeneralMethods.getAbilityElement(killerAbility).name();
ability = element + "Combo";
}
} else if (GeneralMethods.abilityExists(ability)) {
} else if (ability != null && GeneralMethods.abilityExists(ability)) {
element = GeneralMethods.getAbilityElement(ability).name();
} else {
bendingDeathPlayer.remove(event.getEntity());