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

- Fixed ManaEffect with AnyMana crashing, e.g. for Chromatic Star (temporarily fixed it by reverting the relevant part to the previous version, feel free to revert and commit a more optimal fix)

Browse Source
This commit is contained in:
Agetian
2014-02-03 06:25:51 +00:00
parent e592d3bc56
commit 9cd2bc595d
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
View File

@@ -79,15 +79,21 @@ public class ManaEffect extends SpellAbilityEffect {
String colorsNeeded = abMana.getExpressChoice(); String colorsNeeded = abMana.getExpressChoice();
String choice = ""; String choice = "";
ColorSet colorMenu = null; ColorSet colorMenu = null;
byte mask = 0; if (colorsNeeded.length() > 1 && colorsNeeded.length() < 5) {
//loop through colors to make menu byte mask = 0;
for (int nChar = 0; nChar < colorsNeeded.length(); nChar++) { //loop through colors to make menu
mask |= MagicColor.fromName(colorsNeeded.charAt(nChar)); for (int nChar = 0; nChar < colorsNeeded.length(); nChar++) {
mask |= forge.card.MagicColor.fromName(colorsNeeded.substring(nChar, nChar + 1));
}
colorMenu = ColorSet.fromMask(mask);
}
else {
colorMenu = ColorSet.fromNames(MagicColor.Constant.ONLY_COLORS);
} }
colorMenu = ColorSet.fromMask(mask);
byte val = act.getController().chooseColor("Select Mana to Produce", sa, colorMenu); byte val = act.getController().chooseColor("Select Mana to Produce", sa, colorMenu);
if (0 == val) { if (0 == val) {
throw new RuntimeException("AbilityFactoryMana::manaResolve() - " + act + " color mana choice is empty for " + card.getName()); throw new RuntimeException("AbilityFactoryMana::manaResolve() - " + act + " color mana choice is empty for " + card.getName());
} }