external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in mana express choice from colorset

Browse Source
This commit is contained in:
Maxmtg
2013-05-19 21:51:07 +00:00
parent fe02d5c6fc
commit 9a66973dc4
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/spellability/AbilityManaPart.java
View File

@@ -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();
}
/**

7
src/main/java/forge/control/input/InputPayManaBase.java
View File

@@ -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() {