From 7af4cf87ea41375fcff1852c98dd88f72c4b519f Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 12 Apr 2015 19:30:11 +0000 Subject: [PATCH] Fix filtering when only multicolor selected --- forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java index 5b36ec8786c..63b6c754543 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java @@ -175,12 +175,7 @@ public class SFilterUtil { boolean result = true; if (wantMulticolor) { if (colors == 0) { //handle showing all multi-color cards if all 5 colors are filtered - if (color.isMulticolor()) { - result = true; - } - else if (wantColorless && color.isColorless()) { - result = true; - } + result = color.isMulticolor() || (wantColorless && color.isColorless()); } else if (colors != MagicColor.ALL_COLORS) { if (useColorIdentity) {