From 6cbded92cb083f36fd9adff8b44481cc71e72009 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 30 Nov 2013 07:04:21 +0000 Subject: [PATCH] if colorless filtered out ensure phyrexian cards don't appear unless at least one of their colors is selected --- .../main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java index 4a761f3a847..127a696ec70 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java @@ -89,6 +89,11 @@ public class SFilterUtil { preFinal = Predicates.and(CardRulesPredicates.canCastWithAvailable(colors), Predicates.not(Presets.IS_MULTICOLOR)); } if (!wantColorless) { + if (colors != 0 && colors != MagicColor.ALL_COLORS) { + //if colorless filtered out ensure phyrexian cards don't appear + //unless at least one of their colors is selected + preFinal = Predicates.and(preFinal, CardRulesPredicates.isColor(colors)); + } preFinal = optimizedAnd(preFinal, Predicates.not(Presets.IS_COLORLESS)); }