From 2520a642c0a32d895d033821899f87f2f5e7d90e Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew@gmail.com"
 <wagic.the.homebrew@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Tue, 29 Sep 2009 13:27:31 +0000
Subject: [PATCH] Erwan -fix issue 84 (control magic on a token)

---
 projects/mtg/bin/Res/test/_tests.txt         |  1 +
 projects/mtg/bin/Res/test/control_magic4.txt | 41 ++++++++++++++++++++
 projects/mtg/src/GameObserver.cpp            |  1 +
 3 files changed, 43 insertions(+)
 create mode 100644 projects/mtg/bin/Res/test/control_magic4.txt

diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 9eccb1ba2..dd847ac1e 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -77,6 +77,7 @@ composite_golem.txt
 control_magic.txt
 control_magic2.txt
 control_magic3.txt
+control_magic4.txt
 corrupt.txt
 counsel_of_the_soratami.txt
 counterspell.txt
diff --git a/projects/mtg/bin/Res/test/control_magic4.txt b/projects/mtg/bin/Res/test/control_magic4.txt
new file mode 100644
index 000000000..0e746e32f
--- /dev/null
+++ b/projects/mtg/bin/Res/test/control_magic4.txt
@@ -0,0 +1,41 @@
+#Bug:control magic of an artifact that gets destroyed
+[INIT]
+SECONDMAIN
+[PLAYER1]
+hand:control magic,shock
+inplay:201966,201965,forest,swamp,mountain
+[PLAYER2]
+inplay:1138,201978,201976,201975,195172,195194
+manapool:{5}
+[DO]
+eot
+next
+next
+next
+201978
+201976
+201975
+195172
+195194
+1138
+eot
+next
+next
+next
+201966
+201965
+forest
+swamp
+control magic
+-1138
+mountain
+shock
+-1138
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:control magic,shock
+inplay:201966,201965,forest,swamp,mountain
+[PLAYER2]
+inplay:1138,201978,201976,201975,195172,195194
+[END]
\ No newline at end of file
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index f0bcc952a..adc3120c2 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -123,6 +123,7 @@ void GameObserver::nextGamePhase(){
     for (int i=0; i < 2; i++){
       delete (players[i]->game->garbage);
       players[i]->game->garbage = NEW MTGGameZone();
+      players[i]->game->garbage->setOwner(players[i]);
     }
     return nextGamePhase();
   }