From c018c8fcd13c00196ade0b808ff568f509deb980 Mon Sep 17 00:00:00 2001
From: "Yuriy A. Apollov" <apollovy@gmail.com>
Date: Tue, 18 Nov 2014 06:51:40 +0300
Subject: [PATCH 1/2] Fix buyback payed once stayed forever.

---
 projects/mtg/src/MTGAbility.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index ca1a4b5ab..a4ad3f5e2 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -4284,6 +4284,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell)
         }
         else if (card->alternateCostPaid[ManaCost::MANA_PAID_WITH_BUYBACK] > 0)
         {
+            card->alternateCostPaid[ManaCost::MANA_PAID_WITH_BUYBACK] = 0;
             zones->putInZone(card, zones->stack, Endzones->hand);
         }
         else if (card->alternateCostPaid[ManaCost::MANA_PAID_WITH_FLASHBACK] > 0)

From 57a26b458386f526a6c33bc23e7ded3c7b8d2890 Mon Sep 17 00:00:00 2001
From: "Yuriy A. Apollov" <apollovy@gmail.com>
Date: Tue, 18 Nov 2014 06:58:38 +0300
Subject: [PATCH 2/2] Add test for buyback case.

---
 projects/mtg/bin/Res/test/buyback.txt | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 projects/mtg/bin/Res/test/buyback.txt

diff --git a/projects/mtg/bin/Res/test/buyback.txt b/projects/mtg/bin/Res/test/buyback.txt
new file mode 100644
index 000000000..ca655e5d5
--- /dev/null
+++ b/projects/mtg/bin/Res/test/buyback.txt
@@ -0,0 +1,30 @@
+# Cast card once with buyback and second time without.
+# The card must be in the graveyard, not in the hand
+[INIT]
+FIRSTMAIN
+
+[PLAYER1]
+hand:Capsize
+manapool:{5}{U}{U}{U}{U}
+
+[PLAYER2]
+inplay:Swamp,Island
+
+[DO]
+Capsize
+# pay buyback
+choice 1
+Swamp
+Capsize
+Island
+
+[ASSERT]
+FIRSTMAIN
+
+[PLAYER1]
+graveyard:Capsize
+
+[PLAYER2]
+hand:Swamp,Island
+
+[END]