From c9121e89d98e856ce1326a21d7385554822d8be1 Mon Sep 17 00:00:00 2001 From: excessum Date: Tue, 15 Mar 2016 11:55:25 +0000 Subject: [PATCH] - Fixed NPE caused by r30946 --- forge-ai/src/main/java/forge/ai/ComputerUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index be043bcbb89..063f97a8cf7 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -359,7 +359,7 @@ public class ComputerUtil { } // 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) && ComputerUtilCombat.lifeInSeriousDanger(ai, game.getCombat())) { if (!typeList.isEmpty()) {