From 3fa52e7ac55f3a2981722389af6f5a56aa99e206 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 3 Feb 2017 14:26:26 +0800
Subject: [PATCH] corrections

---
 projects/mtg/include/AllAbilities.h | 1 +
 projects/mtg/src/AllAbilities.cpp   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index bda614e49..bd11ac26c 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -2045,6 +2045,7 @@ class AACopier: public ActivatedAbility
 {
 public:
     bool isactivated;
+    vector<MTGAbility *> currentAbilities;
     MTGAbility * andAbility;
     AACopier(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL);
     int resolve();
diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index 0b4811d00..2de381334 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -1610,7 +1610,7 @@ int AACopier::resolve()
         if(source->isACopier)
         {
             source->GrantedAndAbility = andAbility;
-
+            AbilityFactory af(game);
             for(unsigned int i = 0;i < source->cardsAbilities.size();i++)
             {
                 MTGAbility * a = dynamic_cast<MTGAbility *>(source->cardsAbilities[i]);
@@ -1620,9 +1620,10 @@ int AACopier::resolve()
             source->cardsAbilities.clear();
             source->magicText = _target->magicText;
 
-            for (size_t i = 0; i < source->cardsAbilitiesFilter.size(); ++i)
+            af.getAbilities(&currentAbilities, NULL, source);
+            for (size_t i = 0; i < currentAbilities.size(); ++i)
             {
-                MTGAbility * a = source->cardsAbilitiesFilter[i];
+                MTGAbility * a = currentAbilities[i];
                 a->source = (MTGCardInstance *) source;
                 if (a)
                 {