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

Merge branch 'master' into 'master'

Browse Source 
Don't add a null card to target in animateTgtAi

See merge request core-developers/forge!3272
This commit is contained in:
Michael Kamensky
2020-10-15 09:53:34 +00:00
parent cf1a559029 a0a909d04c
commit 6dea278e3f
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ability/AnimateAi.java
View File

@@ -340,7 +340,8 @@ public class AnimateAi extends SpellAbilityAi {
// select the worst of the best // select the worst of the best
final Card worst = ComputerUtilCard.getWorstAI(maxList); final Card worst = ComputerUtilCard.getWorstAI(maxList);
if (worst != null && worst.isLand()) { if (worst != null) {
if (worst.isLand()) {
// e.g. Clan Guildmage, make sure we're not using the same land we want to animate to activate the ability // e.g. Clan Guildmage, make sure we're not using the same land we want to animate to activate the ability
this.holdAnimatedTillMain2(ai, worst); this.holdAnimatedTillMain2(ai, worst);
if (!ComputerUtilMana.canPayManaCost(sa, ai, 0)) { if (!ComputerUtilMana.canPayManaCost(sa, ai, 0)) {
@@ -350,6 +351,7 @@ public class AnimateAi extends SpellAbilityAi {
} }
this.rememberAnimatedThisTurn(ai, worst); this.rememberAnimatedThisTurn(ai, worst);
sa.getTargets().add(worst); sa.getTargets().add(worst);
}
return true; return true;
} }