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

Merge branch 'master' into 'master'

Browse Source 
Fixed the AI not putting the Najeela trigger on stack if it doesn't want to use it.

See merge request core-developers/forge!925
This commit is contained in:
Michael Kamensky
2018-09-16 16:04:39 +00:00
parent 8e0e976681 d87e63c9a7
commit fb39bce069
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-ai/src/main/java/forge/ai/ability/TokenAi.java
View File

@@ -311,6 +311,12 @@ public class TokenAi extends SpellAbilityAi {
} }
} }
if (mandatory) {
// Necessary because the AI goes into this method twice, first to set up targets (with mandatory=true)
// and then the second time to confirm the trigger (where mandatory may be set to false).
return true;
}
if ("OnlyOnAlliedAttack".equals(sa.getParam("AILogic"))) { if ("OnlyOnAlliedAttack".equals(sa.getParam("AILogic"))) {
Combat combat = ai.getGame().getCombat(); Combat combat = ai.getGame().getCombat();
return combat != null && combat.getAttackingPlayer() != null return combat != null && combat.getAttackingPlayer() != null