diff --git a/src/main/java/forge/StaticEffects.java b/src/main/java/forge/StaticEffects.java index 407e92a32c4..c7dc9ab4b45 100644 --- a/src/main/java/forge/StaticEffects.java +++ b/src/main/java/forge/StaticEffects.java @@ -153,13 +153,21 @@ public class StaticEffects { } if (params.containsKey("AddColor")) { - addColors = CardUtil.getShortColorsString(new ArrayList(Arrays.asList(params.get("AddColor").split( - " & ")))); + final String colors = params.get("AddColor"); + if (colors.equals("ChosenColor")) { + addColors = CardUtil.getShortColorsString(se.getSource().getChosenColor()); + } else { + addColors = CardUtil.getShortColorsString(new ArrayList(Arrays.asList(colors.split(" & ")))); + } } if (params.containsKey("SetColor")) { - addColors = CardUtil.getShortColorsString(new ArrayList(Arrays.asList(params.get("SetColor").split( - " & ")))); + final String colors = params.get("SetColor"); + if (colors.equals("ChosenColor")) { + addColors = CardUtil.getShortColorsString(se.getSource().getChosenColor()); + } else { + addColors = CardUtil.getShortColorsString(new ArrayList(Arrays.asList(colors.split(" & ")))); + } } // modify players