From e9ddecbc8cf9677454bf6b946cb35b73588834e1 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Wed, 16 Nov 2016 06:23:15 +0000
Subject: [PATCH] AiController: checkETBEffects: make it better working with
 OverridingAbility (and use better getAbility function)

---
 .../src/main/java/forge/ai/AiController.java   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java
index 75259b57f5b..7a46af43486 100644
--- a/forge-ai/src/main/java/forge/ai/AiController.java
+++ b/forge-ai/src/main/java/forge/ai/AiController.java
@@ -247,22 +247,20 @@ public class AiController {
                 continue;
             }
 
-            if (tr.getOverridingAbility() != null) {
-                // Abilities yet
-                continue;
-            }
-            
             // if trigger is not mandatory - no problem
             if (params.get("OptionalDecider") != null && api == null) {
                 continue;
             }
 
-            // Maybe better considerations
-            final String execute = params.get("Execute");
-            if (execute == null) {
-                continue;
+            SpellAbility exSA = tr.getOverridingAbility();
+
+            if (exSA == null) {
+                // 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 (exSA.getApi() != api) {