external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed a possible NPE in CombatUtil.

Browse Source
This commit is contained in:
Sloth
2012-02-28 07:18:46 +00:00
parent 4d9af1d881
commit f9e498f5d7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/CombatUtil.java
View File

@@ -1994,6 +1994,9 @@ public class CombatUtil {
trigger = TriggerHandler.parseTrigger(source.getSVar(sVarName), trigger.getHostCard(), true); trigger = TriggerHandler.parseTrigger(source.getSVar(sVarName), trigger.getHostCard(), true);
trigParams = trigger.getMapParams(); trigParams = trigger.getMapParams();
} }
if (!trigParams.containsKey("Execute")) {
continue;
}
String ability = source.getSVar(trigParams.get("Execute")); String ability = source.getSVar(trigParams.get("Execute"));
AbilityFactory abilityFactory = new AbilityFactory(); AbilityFactory abilityFactory = new AbilityFactory();
final HashMap<String, String> abilityParams = abilityFactory.getMapParams(ability, source); 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); trigger = TriggerHandler.parseTrigger(source.getSVar(sVarName), trigger.getHostCard(), true);
trigParams = trigger.getMapParams(); trigParams = trigger.getMapParams();
} }
if (!trigParams.containsKey("Execute")) {
continue;
}
String ability = source.getSVar(trigParams.get("Execute")); String ability = source.getSVar(trigParams.get("Execute"));
AbilityFactory abilityFactory = new AbilityFactory(); AbilityFactory abilityFactory = new AbilityFactory();
final HashMap<String, String> abilityParams = abilityFactory.getMapParams(ability, source); final HashMap<String, String> abilityParams = abilityFactory.getMapParams(ability, source);