diff --git a/src/com/projectkorra/projectkorra/ability/util/PassiveManager.java b/src/com/projectkorra/projectkorra/ability/util/PassiveManager.java index 9d07f3e6..ca6399a5 100644 --- a/src/com/projectkorra/projectkorra/ability/util/PassiveManager.java +++ b/src/com/projectkorra/projectkorra/ability/util/PassiveManager.java @@ -67,6 +67,11 @@ public class PassiveManager { } public static boolean hasPassive(Player player, CoreAbility passive) { + if (player == null) { + return false; + } else if (passive == null) { + return false; + } BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); Element element = passive.getElement(); if (passive.getElement() instanceof SubElement) {