From 82cd3cc1fe9fd1cc8f4b03a0824e9297bfd5e06e Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 12 Apr 2015 19:06:20 +0000 Subject: [PATCH] Tweak previous fix --- .../src/main/java/forge/itemmanager/SFilterUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 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 dbff8b00e18..5b36ec8786c 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java @@ -195,10 +195,10 @@ public class SFilterUtil { result = !color.isMulticolor(); if (colors != MagicColor.ALL_COLORS) { if (useColorIdentity) { - result &= color.hasAnyColor(colors); + result = result && color.hasAnyColor(colors); } else { - result &= rules.canCastWithAvailable(colors); + result = result && rules.canCastWithAvailable(colors); } } } @@ -206,9 +206,9 @@ public class SFilterUtil { 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 - result &= color.hasAnyColor(colors); + result = result && color.hasAnyColor(colors); } - result &= !color.isColorless(); + result = result && !color.isColorless(); } return result; }