From f9e498f5d74bb23c33e07826f71582e1c11ce8ab Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Tue, 28 Feb 2012 07:18:46 +0000
Subject: [PATCH] - Fixed a possible NPE in CombatUtil.

---
 src/main/java/forge/CombatUtil.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java
index 70fe183a1d7..7278b9990fb 100644
--- a/src/main/java/forge/CombatUtil.java
+++ b/src/main/java/forge/CombatUtil.java
@@ -1994,6 +1994,9 @@ public class CombatUtil {
                 trigger = TriggerHandler.parseTrigger(source.getSVar(sVarName), trigger.getHostCard(), true);
                 trigParams = trigger.getMapParams();
             }
+            if (!trigParams.containsKey("Execute")) {
+                continue;
+            }
             String ability = source.getSVar(trigParams.get("Execute"));
             AbilityFactory abilityFactory = new AbilityFactory();
             final HashMap<String, String> abilityParams = abilityFactory.getMapParams(ability, source);
@@ -2044,6 +2047,9 @@ public class CombatUtil {
                 trigger = TriggerHandler.parseTrigger(source.getSVar(sVarName), trigger.getHostCard(), true);
                 trigParams = trigger.getMapParams();
             }
+            if (!trigParams.containsKey("Execute")) {
+                continue;
+            }
             String ability = source.getSVar(trigParams.get("Execute"));
             AbilityFactory abilityFactory = new AbilityFactory();
             final HashMap<String, String> abilityParams = abilityFactory.getMapParams(ability, source);