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

AiController: checkETBEffects: make it better working with OverridingAbility (and use better getAbility function)

Browse Source
This commit is contained in:
Hanmac
2016-11-16 06:23:15 +00:00
parent 5ac07c67af
commit e9ddecbc8c
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -247,22 +247,20 @@ public class AiController {
continue; continue;
} }
if (tr.getOverridingAbility() != null) {
// Abilities yet
continue;
}
// if trigger is not mandatory - no problem // if trigger is not mandatory - no problem
if (params.get("OptionalDecider") != null && api == null) { if (params.get("OptionalDecider") != null && api == null) {
continue; continue;
} }
// Maybe better considerations SpellAbility exSA = tr.getOverridingAbility();
final String execute = params.get("Execute");
if (execute == null) { if (exSA == null) {
continue; // Maybe better considerations
if (!params.containsKey("Execute")) {
continue;
}
exSA = AbilityFactory.getAbility(card, params.get("Execute"));
} }
final SpellAbility exSA = AbilityFactory.getAbility(card.getSVar(execute), card);
if (api != null) { if (api != null) {
if (exSA.getApi() != api) { if (exSA.getApi() != api) {