From f280ba4e05164a5b6cbc78760d17c55f0d03d7c2 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Wed, 26 Jun 2013 13:44:11 +0000
Subject: [PATCH] - Fixed possible NPE in combatTriggerWillTrigger.

---
 src/main/java/forge/game/ai/ComputerUtilCombat.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/forge/game/ai/ComputerUtilCombat.java b/src/main/java/forge/game/ai/ComputerUtilCombat.java
index 3ea62998754..ebf78a4c802 100644
--- a/src/main/java/forge/game/ai/ComputerUtilCombat.java
+++ b/src/main/java/forge/game/ai/ComputerUtilCombat.java
@@ -586,6 +586,9 @@ public class ComputerUtilCombat {
         final Card source = trigger.getHostCard();
         if (combat == null) {
             combat = game.getCombat();
+            if (combat == null) {
+                return false;
+            }
         }
 
         if (!trigger.zonesCheck(game.getZoneOf(trigger.getHostCard()))) {