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

Merge branch 'assorted-fixes' into 'master'

Browse Source 
- Fixed the AI for Hunt the Weak/Savage Storm, prevented a crash when trying to exec a trigger with a non-existent SVar

See merge request core-developers/forge!130
This commit is contained in:
Michael Kamensky
2018-01-21 18:04:27 +00:00
parent 95263720f3 b20c5acf75
commit d16a197651
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-ai/src/main/java/forge/ai/ability/FightAi.java
View File

@@ -55,6 +55,7 @@ public class FightAi extends SpellAbilityAi {
return true;
}
}
return false; // bail at this point, otherwise the AI will overtarget and waste the activation
}
if (sa.hasParam("TargetsFromDifferentZone")) {

5
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -570,6 +570,11 @@ public class TriggerHandler {
};
}
else {
if (!host.getCurrentState().hasSVar(triggerParams.get("Execute"))) {
System.err.println("Warning: tried to run a trigger for card " + host + " referencing a SVar " + triggerParams.get("Execute") + " not present on the current state " + host.getCurrentState() + ". Aborting trigger execution to prevent a crash.");
return;
}
sa = AbilityFactory.getAbility(host, triggerParams.get("Execute"));
}
} else {