Fix NPE in GeneralMethods

This commit is contained in:
kingbirdy 2015-08-22 17:25:02 -04:00
parent eeae6d217b
commit ba76586243

View file

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