From 030998fe1884e48cdf22a21c258acfd81357d2d4 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Fri, 2 Sep 2011 09:28:29 +0000
Subject: [PATCH] - Fixed EtB triggers.

---
 src/main/java/forge/GameAction.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index 45415810fa7..990cadf24b3 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -76,9 +76,10 @@ public class GameAction {
         Card lastKnownInfo = null; 
 
         // Don't copy Tokens, Cards staying in same zone, or cards entering Battlefield
-        if (c.isToken() || suppress || zone.is(Constant.Zone.Battlefield))
-            lastKnownInfo = copied = c;
-        else {
+        if (c.isToken() || suppress || zone.is(Constant.Zone.Battlefield)) {
+            lastKnownInfo = c;
+            copied = c;
+        } else {
             copied = AllZone.getCardFactory().copyCard(c);
             lastKnownInfo = CardUtil.getLKICopy(c);
 
@@ -92,7 +93,7 @@ public class GameAction {
         // This is the fix for Isochron Scepter and friends, we need to test other situations
         // To make sure it doesn't break anything serious
         for (Trigger trigger : c.getTriggers())
-            trigger.setHostCard(lastKnownInfo);
+            trigger.setHostCard(copied);
 
         if (suppress)
             AllZone.getTriggerHandler().suppressMode("ChangesZone");