From 15f75f8d11f47df152b081551c3e76868af0745c Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Sun, 9 Oct 2011 14:58:08 -0400
Subject: [PATCH] fixed issue 141

---
 .../championsofkamigawa/GhostlyPrison.java    |  9 +++------
 .../src/mage/sets/newphyrexia/NornsAnnex.java |  4 +---
 .../sets/scarsofmirrodin/LeoninArbiter.java   |  4 +---
 .../sets/scarsofmirrodin/VigilForTheLost.java |  2 +-
 .../src/mage/sets/tempest/Propaganda.java     |  4 +---
 .../src/mage/sets/tenth/WindbornMuse.java     |  4 +---
 .../abilities/costs/mana/ManaCostsImpl.java   | 19 +++++++++++++++++++
 7 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java
index bcd8a5e0209..95621819bd8 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GhostlyPrison.java
@@ -91,16 +91,13 @@ class GhostlyPrisonReplacementEffect extends ReplacementEffectImpl<GhostlyPrison
 			if ( player != null && event.getTargetId().equals(source.getControllerId())) {
 				ManaCostsImpl propagandaTax = new ManaCostsImpl("{2}");
 				if ( propagandaTax.canPay(source.getSourceId(), event.getPlayerId(), game) &&
-					 player.chooseUse(Constants.Outcome.Benefit, "Pay {2} to declare attacker?", game) )
-				{
-					propagandaTax.pay(source, game, this.getId(), event.getPlayerId(), false);
-
-					if ( propagandaTax.isPaid() ) {
+					 player.chooseUse(Constants.Outcome.Benefit, "Pay {2} to declare attacker?", game) ) {
+					if (propagandaTax.payOrRollback(source, game, this.getId(), event.getPlayerId())) {
 						return false;
 					}
 				}
+                return true;
 			}
-			return true;
 		}
 		return false;
 	}
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java b/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java
index 615abfd2f1c..ca3c50e7a03 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java
@@ -91,9 +91,7 @@ class NornsAnnexReplacementEffect extends ReplacementEffectImpl<NornsAnnexReplac
                 ManaCostsImpl propagandaTax = new ManaCostsImpl("{WP}");
                 if (propagandaTax.canPay(source.getSourceId(), event.getPlayerId(), game) &&
                         player.chooseUse(Constants.Outcome.Benefit, "Pay {WP} to declare attacker?", game)) {
-                    propagandaTax.pay(source, game, this.getId(), event.getPlayerId(), false);
-
-                    if (propagandaTax.isPaid()) {
+                    if (propagandaTax.payOrRollback(source, game, this.getId(), event.getPlayerId())) {
                         return false;
                     }
                 }
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java
index 65eb1cdc214..9d04374f2d6 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java
@@ -105,9 +105,7 @@ class LeoninArbiterReplacementEffect extends ReplacementEffectImpl<LeoninArbiter
 				if ( arbiterTax.canPay(source.getSourceId(), event.getPlayerId(), game) &&
 					 player.chooseUse(Outcome.Neutral, "Pay {2} to search your library?", game) )
 				{
-					arbiterTax.pay(source, game, this.getId(), event.getPlayerId(), false);
-
-					if ( arbiterTax.isPaid() ) {
+					if (arbiterTax.payOrRollback(source, game, this.getId(), event.getPlayerId()) ) {
 						paidPlayers.add(event.getPlayerId());
 						return false;
 					}
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java
index bca4dfc837b..afafcbadfbf 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java
@@ -117,7 +117,7 @@ class VigilForTheLostEffect extends OneShotEffect<VigilForTheLostEffect> {
     public boolean apply(Game game, Ability source) {
         ManaCostsImpl cost = new ManaCostsImpl("{X}");
         cost.clearPaid();
-        if (cost.pay(source, game, source.getId(), source.getControllerId(), false)) {
+        if (cost.payOrRollback(source, game, source.getId(), source.getControllerId())) {
             Player player = game.getPlayer(source.getControllerId());
             player.gainLife(cost.getX(), game);
             return true;
diff --git a/Mage.Sets/src/mage/sets/tempest/Propaganda.java b/Mage.Sets/src/mage/sets/tempest/Propaganda.java
index 3ea3b8e7911..089106e161f 100644
--- a/Mage.Sets/src/mage/sets/tempest/Propaganda.java
+++ b/Mage.Sets/src/mage/sets/tempest/Propaganda.java
@@ -93,9 +93,7 @@ class PropagandaReplacementEffect extends ReplacementEffectImpl<PropagandaReplac
 				if ( propagandaTax.canPay(source.getSourceId(), event.getPlayerId(), game) &&
 					 player.chooseUse(Constants.Outcome.Neutral, "Pay {2} to declare attacker?", game) )
 				{
-					propagandaTax.pay(source, game, this.getId(), event.getPlayerId(), false);
-
-					if ( propagandaTax.isPaid() ) {
+					if (propagandaTax.payOrRollback(source, game, this.getId(), event.getPlayerId()) ) {
 						return false;
 					}
 				}
diff --git a/Mage.Sets/src/mage/sets/tenth/WindbornMuse.java b/Mage.Sets/src/mage/sets/tenth/WindbornMuse.java
index e501c87f442..e49e583f7c2 100644
--- a/Mage.Sets/src/mage/sets/tenth/WindbornMuse.java
+++ b/Mage.Sets/src/mage/sets/tenth/WindbornMuse.java
@@ -98,9 +98,7 @@ class WindbornMuseReplacementEffect extends ReplacementEffectImpl<WindbornMuseRe
 				if ( propagandaTax.canPay(source.getSourceId(), event.getPlayerId(), game) &&
 					 player.chooseUse(Constants.Outcome.Benefit, "Pay {2} to declare attacker?", game) )
 				{
-					propagandaTax.pay(source, game, this.getId(), event.getPlayerId(), false);
-
-					if ( propagandaTax.isPaid() ) {
+					if (propagandaTax.payOrRollback(source, game, this.getId(), event.getPlayerId())) {
 						return false;
 					}
 				}
diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java
index ada7a96506f..fb23bc0b143 100644
--- a/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java
+++ b/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java
@@ -132,6 +132,25 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
         return true;
     }
 
+    /**
+     * bookmarks the current state and restores it if player doesn't pay the mana cost
+     * 
+     * @param ability
+     * @param game
+     * @param sourceId
+     * @param controllerId
+     * @return true if the cost was paid
+     */
+    public boolean payOrRollback(Ability ability, Game game, UUID sourceId, UUID controllerId) {
+        int bookmark = game.bookmarkState();
+        if (pay(ability, game, sourceId, controllerId, false)) {
+            game.removeBookmark(bookmark);
+            return true;
+        }
+        game.restoreState(bookmark);
+        return false;
+    }
+    
     @Override
     public ManaCosts<T> getUnpaid() {
         ManaCosts<T> unpaid = new ManaCostsImpl<T>();