- Fixing X Mana bug when paying from the Mana Pool

src/main/java/forge/card/cost/Cost.java

@@ -355,7 +355,10 @@ public class Cost {
                 CostMana costMana = (CostMana) part;
 
                 String mana = getTotalMana();
-                costMana.setAdjustedMana(AllZone.getGameAction().getSpellCostChange(sa, new ManaCost(mana)).toString());
+                
+                ManaCost changedCost = AllZone.getGameAction().getSpellCostChange(sa, new ManaCost(mana));
+                
+                costMana.setAdjustedMana(changedCost.toString(false));
             }
         }
     }

src/main/java/forge/card/mana/ManaCost.java

@@ -478,21 +478,21 @@ public class ManaCost {
         }
     }
 
-    /** {@inheritDoc} */
+    public final String toString(boolean addX){
-    @Override
+		// Boolean addX used to add Xs into the returned value
-    public final String toString() {
         StringBuilder sb = new StringBuilder();
         ArrayList<Object> list = new ArrayList<Object>(manaPart);
         // need to reverse everything since the colored mana is stored first
         Collections.reverse(list);
 
-        for (int i = 0; i < getXcounter(); i++) {
+        if (addX) {
-            sb.append(" ").append("X");
+            for (int i = 0; i < getXcounter(); i++) {
+                sb.append("X").append(" ");
+            }
         }
 
         for (int i = 0; i < list.size(); i++) {
-            sb.append(" ");
+            sb.append(list.get(i).toString()).append(" ");
-            sb.append(list.get(i).toString());
         }
 
         String str = sb.toString().trim();
@@ -504,6 +504,12 @@ public class ManaCost {
         return str;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public final String toString() {
+        return toString(true);
+    }
+
     /**
      * <p>
      * getConvertedManaCost.