From a9927b68eb95f7fcc64f10bb18d905f90c091a2d Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sat, 10 Nov 2012 04:56:36 +0000
Subject: [PATCH] wrapper will return api (temporary)

---
 src/main/java/forge/card/abilityfactory/AbilityFactory.java | 5 ++---
 src/main/java/forge/card/spellability/SpellAbility.java     | 2 +-
 src/main/java/forge/card/trigger/TriggerHandler.java        | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
index eca06543dff..c4a45d51ad8 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
@@ -1447,9 +1447,8 @@ public class AbilityFactory {
 
         final Target tgt = sa.getTarget();
 
-        if (sa.hasParam("RememberTargets")) {
-            final ArrayList<Object> tgts = (tgt == null) ? new ArrayList<Object>() : tgt.getTargets();
-            for (final Object o : tgts) {
+        if (sa.hasParam("RememberTargets") && tgt != null) {  
+            for (final Object o : tgt.getTargets()) {
                 host.addRemembered(o);
             }
         }
diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java
index 0d0d07bf2b5..2358dd01545 100644
--- a/src/main/java/forge/card/spellability/SpellAbility.java
+++ b/src/main/java/forge/card/spellability/SpellAbility.java
@@ -560,7 +560,7 @@ public abstract class SpellAbility {
     }        
     
     // If this is not null, then ability was made in a factory
-    public final ApiType getApi() {
+    public ApiType getApi() {
         return api;
     }
     
diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java
index e78ffdbf1ad..7846b57409c 100644
--- a/src/main/java/forge/card/trigger/TriggerHandler.java
+++ b/src/main/java/forge/card/trigger/TriggerHandler.java
@@ -527,6 +527,9 @@ public class TriggerHandler {
                 return true;
             }
 
+            @Override
+            public ApiType getApi() { return sa[0].getApi(); } 
+            
             @Override
             public void setPaidHash(final HashMap<String, List<Card>> hash) {
                 sa[0].setPaidHash(hash);