From aed68a2cd99789866e7ddd95fdb2bf7676b335de Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew"
 <wagic.the.homebrew@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Tue, 10 May 2011 11:37:46 +0000
Subject: [PATCH] Fix for issue 652 (Use Tidal warrior several times causes a
 crash)

---
 projects/mtg/bin/Res/test/_tests.txt          |  1 +
 .../mtg/bin/Res/test/tidal_warrior_i652.txt   | 23 +++++++++++++++++++
 projects/mtg/include/AllAbilities.h           |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 projects/mtg/bin/Res/test/tidal_warrior_i652.txt

diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index d74aef4ed..d37aa73dd 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -544,6 +544,7 @@ throne_of_bone.txt
 thunder-thrash_elder.txt
 tidal_warrior_i646.txt
 tidal_warrior_i650.txt
+tidal_warrior_i652.txt
 titanic_ultimatum.txt
 tolsimir_wolfblood.txt
 torture.txt
diff --git a/projects/mtg/bin/Res/test/tidal_warrior_i652.txt b/projects/mtg/bin/Res/test/tidal_warrior_i652.txt
new file mode 100644
index 000000000..b3a33dcb4
--- /dev/null
+++ b/projects/mtg/bin/Res/test/tidal_warrior_i652.txt
@@ -0,0 +1,23 @@
+#Testing Tidal Warrior's "target becomes island" ability,
+# Make sure it can be cast several times
+#see http://code.google.com/p/wagic/issues/detail?id=652
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Forest,mountain, Tidal Warrior
+[PLAYER2]
+[DO]
+Tidal Warrior
+Forest
+eot
+eot
+Tidal Warrior
+Mountain
+Mountain
+[ASSERT]
+UNTAP
+[PLAYER1]
+inplay:Forest, Mountain,Tidal Warrior
+manapool:{U}
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 1455526aa..ea0b890a3 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -1766,6 +1766,7 @@ public:
     GenericInstantAbility * clone() const
     {
         GenericInstantAbility * a = NEW GenericInstantAbility(*this);
+        a->ability = ability->clone();
         a->isClone = 1;
         return a;
     }