From 7ae8434ba370e59fd10eeea2a3f0dedf0ceb1c1c Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 5 Jun 2016 20:32:33 +0800
Subject: [PATCH] Correction

---
 projects/mtg/src/AllAbilities.cpp    |  2 +-
 projects/mtg/src/MTGCardInstance.cpp | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index 3d86feaef..510ebf25b 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -479,7 +479,7 @@ int AACopier::resolve()
         MTGCardInstance * myClone = NEW MTGCardInstance(clone, source->controller()->game);
         source->copy(myClone);
         source->isACopier = true;
-        source->copiedID = _target->copiedID;
+        source->copiedID = _target->getMTGId();
         source->modifiedbAbi = _target->modifiedbAbi;
         source->origbasicAbilities = _target->origbasicAbilities;
         if(_target->isMorphed)
diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp
index 338e22057..af2913ebb 100644
--- a/projects/mtg/src/MTGCardInstance.cpp
+++ b/projects/mtg/src/MTGCardInstance.cpp
@@ -118,9 +118,14 @@ void MTGCardInstance::copy(MTGCardInstance * card)
     AbilityFactory af(observer);
     af.addAbilities(observer->mLayers->actionLayer()->getMaxId(), spell);
     delete spell;
-    mtgid = card->getMTGId();   ///////////////////////////////////////////////////
-    setId = card->setId;        // Copier/Cloner cards produces the same token...//
-    rarity = card->getRarity(); ///////////////////////////////////////////////////
+    if(observer->players[1]->playMode == Player::MODE_TEST_SUITE)
+        mtgid = backupid; // there must be a way to get the token id...
+    else
+    {
+        mtgid = card->getMTGId();   ///////////////////////////////////////////////////
+        setId = card->setId;        // Copier/Cloner cards produces the same token...//
+        rarity = card->getRarity(); ///////////////////////////////////////////////////
+    }
     castMethod = castMethodBackUP;
     backupTargets = this->backupTargets;
     storedCard = oldStored;