- Fixed NPE caused by r30946

This commit is contained in:
excessum
2016-03-15 11:55:25 +00:00
parent 118f22bbc0
commit c9121e89d9

View File

@@ -359,7 +359,7 @@ public class ComputerUtil {
} }
// try everything when about to die // try everything when about to die
if ("Reality Smasher".equals(activate.getName()) || if (activate != null && "Reality Smasher".equals(activate.getName()) ||
game.getPhaseHandler().getPhase().equals(PhaseType.COMBAT_DECLARE_BLOCKERS) game.getPhaseHandler().getPhase().equals(PhaseType.COMBAT_DECLARE_BLOCKERS)
&& ComputerUtilCombat.lifeInSeriousDanger(ai, game.getCombat())) { && ComputerUtilCombat.lifeInSeriousDanger(ai, game.getCombat())) {
if (!typeList.isEmpty()) { if (!typeList.isEmpty()) {