Merge branch 'soulecho' into 'master'

Fix Soul Echo

See merge request core-developers/forge!4691
This commit is contained in:
Michael Kamensky
2021-05-11 18:10:46 +00:00

View File

@@ -52,8 +52,6 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
} }
} else if ("GideonBlackblade".equals(aiLogic)) { } else if ("GideonBlackblade".equals(aiLogic)) {
return SpecialCardAi.GideonBlackblade.consider(ai, sa); return SpecialCardAi.GideonBlackblade.consider(ai, sa);
} else if ("SoulEcho".equals(aiLogic)) {
return doTriggerAINoCost(ai, sa, true);
} else if ("Always".equals(aiLogic)) { } else if ("Always".equals(aiLogic)) {
return true; return true;
} }
@@ -70,7 +68,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
*/ */
@Override @Override
public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) { public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
return checkApiLogic(aiPlayer, sa); return sa.isTrigger() ? doTriggerAINoCost(aiPlayer, sa, sa.isMandatory()) : checkApiLogic(aiPlayer, sa);
} }
@Override @Override