From a2bedc6cd63284deed3e5f6b31a246b3a921c51d Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Tue, 26 Jul 2016 19:36:09 +0000
Subject: [PATCH] TriggerHandler: try to fix problem with transformed cards in
 clearInstrinsicActiveTriggers

---
 .../src/main/java/forge/game/trigger/TriggerHandler.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index cca32992351..a4c2f339572 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -220,7 +220,7 @@ public class TriggerHandler {
 
             // Clear if no ZoneFrom, or not coming from the TriggerZone
             if (c.getId() == t.getHostCard().getId() && t.isIntrinsic()) {
-                if (!t.zonesCheck(zoneFrom))
+                if (!c.getTriggers().contains(t) || !t.zonesCheck(zoneFrom))
                     toBeRemoved.add(t);
             }
         }
@@ -497,7 +497,7 @@ public class TriggerHandler {
                 };
             }
             else {
-                sa = AbilityFactory.getAbility(host.getSVar(triggerParams.get("Execute")), host);
+                sa = AbilityFactory.getAbility(host, triggerParams.get("Execute"));
             }
         }