diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index 6088154aeb7..b68d09bdcf6 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -457,7 +457,9 @@ public final class StaticAbilityContinuous { if (params.containsKey("AddColor")) { final String colors = params.get("AddColor"); if (colors.equals("ChosenColor")) { - addColors = ColorSet.fromNames(hostCard.getChosenColors()); + if (hostCard.hasChosenColor()) { + addColors = ColorSet.fromNames(hostCard.getChosenColors()); + } } else if (colors.equals("All")) { addColors = ColorSet.ALL_COLORS; } else { @@ -468,7 +470,9 @@ public final class StaticAbilityContinuous { if (params.containsKey("SetColor")) { final String colors = params.get("SetColor"); if (colors.equals("ChosenColor")) { - addColors = ColorSet.fromNames(hostCard.getChosenColors()); + if (hostCard.hasChosenColor()) { + addColors = ColorSet.fromNames(hostCard.getChosenColors()); + } } else if (colors.equals("All")) { addColors = ColorSet.ALL_COLORS; } else {