From efc2842273ef6c3178d5a47e4c0d433d4b4cb8b8 Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 19 Jan 2016 06:19:48 +0000 Subject: [PATCH] - Update the fix to SFilterUtil to make the colorless card filter work correctly. --- forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java index 38e91b0e93a..3eca94aebaa 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java @@ -157,9 +157,6 @@ public class SFilterUtil { if (buttonMap.get(StatTypes.GREEN).isSelected()) { colors0 |= MagicColor.GREEN; } - if (buttonMap.get(StatTypes.COLORLESS).isSelected()) { - colors0 |= MagicColor.COLORLESS; - } final byte colors = colors0; final boolean wantColorless = buttonMap.get(StatTypes.COLORLESS).isSelected(); @@ -195,7 +192,7 @@ public class SFilterUtil { if (useColorIdentity && !allColorsFilteredOut) { result = result && (color.hasAnyColor(colors) || (wantColorless && color.isColorless())); } else { - result = result && rules.canCastWithAvailable(colors); + result = result && (color.isColorless() || rules.canCastWithAvailable(colors)); } } }