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 the express mana payment sometimes presenting the player with choices which are not legal.

Browse Source
This commit is contained in:
Michael Kamensky
2019-05-21 01:16:16 +00:00
committed by swordshine
parent f2f2ef09e2
commit ccc935a025
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-gui/src/main/java/forge/match/input/InputPayMana.java
View File

@@ -316,8 +316,20 @@ public abstract class InputPayMana extends InputSyncronizedBase {
} else { } else {
chosen = chosenAbility; chosen = chosenAbility;
} }
ColorSet colors = ColorSet.fromMask(0 == colorNeeded ? colorCanUse : colorNeeded); ColorSet colors = ColorSet.fromMask(0 == colorNeeded ? colorCanUse : colorNeeded);
chosen.getManaPartRecursive().setExpressChoice(colors);
// Filter the colors for the express choice so that only actually producible colors can be chosen
int producedColorMask = 0;
for (final byte color : ManaAtom.MANATYPES) {
if (chosen.getManaPartRecursive().getOrigProduced().contains(MagicColor.toShortString(color))
&& colors.hasAnyColor(color)) {
producedColorMask |= color;
}
}
ColorSet producedAndNeededColors = ColorSet.fromMask(producedColorMask);
chosen.getManaPartRecursive().setExpressChoice(producedAndNeededColors);
// System.out.println("Chosen sa=" + chosen + " of " + chosen.getHostCard() + " to pay mana"); // System.out.println("Chosen sa=" + chosen + " of " + chosen.getHostCard() + " to pay mana");