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 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 abilityParams = abilityFactory.getMapParams(ability, source);