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

- Re-added the color fix for Fork (without the NPEs this time)

Browse Source
This commit is contained in:
moomarc
2012-09-10 09:43:12 +00:00
parent ff27c9035c
commit 2990b4fc62
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/forge/card/cardfactory/CardFactory.java
View File

@@ -162,20 +162,23 @@ public class CardFactory implements CardFactoryInterface {
final Card c = AllZone.getCardFactory().copyCard(original);
// change the color of the copy (eg: Fork)
/*final SpellAbility sourceSA = source.getFirstSpellAbility();
if (sourceSA.getAbilityFactory().getMapParams().containsKey("CopyIsColor")) {
String tmp = "";
final HashMap<String, String> params = sourceSA.getAbilityFactory().getMapParams();
final String newColor = params.get("CopyIsColor");
if (newColor.equals("ChosenColor")) {
tmp = CardUtil.getShortColorsString(source.getChosenColor());
} else {
tmp = CardUtil.getShortColorsString(new ArrayList<String>(Arrays.asList(newColor.split(","))));
}
final String finalColors = tmp;
// Currently won't work for abilities, only for spells
if (null != source.getFirstSpellAbility().getAbilityFactory()) {
final SpellAbility sourceSA = source.getFirstSpellAbility();
if (sourceSA.getAbilityFactory().getMapParams().containsKey("CopyIsColor")) {
String tmp = "";
final HashMap<String, String> params = sourceSA.getAbilityFactory().getMapParams();
final String newColor = params.get("CopyIsColor");
if (newColor.equals("ChosenColor")) {
tmp = CardUtil.getShortColorsString(source.getChosenColor());
} else {
tmp = CardUtil.getShortColorsString(new ArrayList<String>(Arrays.asList(newColor.split(","))));
}
final String finalColors = tmp;
c.addColor(finalColors, c, !params.containsKey("OverwriteColors"), true);
}*/
c.addColor(finalColors, c, !params.containsKey("OverwriteColors"), true);
}
}
c.addController(controller);
c.setCopiedSpell(true);