TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Added null checks to hasPassive(...) (#709)

Browse source
This commit is contained in:
Sobki 2017-01-26 11:10:31 +10:00 committed by Christopher Martin
parent 011a047559
commit c068463232
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/projectkorra/projectkorra/ability/util/PassiveManager.java
View file

@ -67,6 +67,11 @@ public class PassiveManager {
} }
public static boolean hasPassive(Player player, CoreAbility passive) { public static boolean hasPassive(Player player, CoreAbility passive) {
if (player == null) {
return false;
} else if (passive == null) {
return false;
}
BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
Element element = passive.getElement(); Element element = passive.getElement();
if (passive.getElement() instanceof SubElement) { if (passive.getElement() instanceof SubElement) {