From 9a66973dc4492c05eaf7f44e278ea0173713b108 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sun, 19 May 2013 21:51:07 +0000
Subject: [PATCH] fix bug in mana express choice from colorset

---
 src/main/java/forge/card/spellability/AbilityManaPart.java | 2 +-
 src/main/java/forge/control/input/InputPayManaBase.java    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/forge/card/spellability/AbilityManaPart.java b/src/main/java/forge/card/spellability/AbilityManaPart.java
index c4a1848ac57..9cf483e79db 100644
--- a/src/main/java/forge/card/spellability/AbilityManaPart.java
+++ b/src/main/java/forge/card/spellability/AbilityManaPart.java
@@ -236,7 +236,7 @@ public class AbilityManaPart implements java.io.Serializable {
         if(cs.hasWhite()) sb.append("W ");
         if(cs.hasRed()) sb.append("R ");
         if(cs.hasGreen()) sb.append("G ");
-        this.lastExpressChoice = cs.toString();
+        this.lastExpressChoice = sb.toString().trim();
     }    
     
     /**
diff --git a/src/main/java/forge/control/input/InputPayManaBase.java b/src/main/java/forge/control/input/InputPayManaBase.java
index 2d6cbc91817..07ee2e8d36a 100644
--- a/src/main/java/forge/control/input/InputPayManaBase.java
+++ b/src/main/java/forge/control/input/InputPayManaBase.java
@@ -187,8 +187,11 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I
             subchosen = subchosen.getSubAbility();
         }
     
-        // save off color needed for use by any mana and reflected mana
-        subchosen.getManaPart().setExpressChoice(ColorSet.fromMask(colorCanUse));
+        if( 0 == colorNeeded ) {
+            subchosen.getManaPart().setExpressChoice(ColorSet.fromMask(colorCanUse));
+        } else {
+            subchosen.getManaPart().setExpressChoice(ColorSet.fromMask(colorNeeded));
+        }
         
         // System.out.println("Chosen sa=" + chosen + " of " + chosen.getSourceCard() + " to pay mana");
         Runnable proc = new Runnable() {