external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Update the fix to SFilterUtil to make the colorless card filter work correctly.

Browse Source
This commit is contained in:
Agetian
2016-01-19 06:19:48 +00:00
parent 62049a29ab
commit efc2842273
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
View File

@@ -157,9 +157,6 @@ public class SFilterUtil {
if (buttonMap.get(StatTypes.GREEN).isSelected()) { if (buttonMap.get(StatTypes.GREEN).isSelected()) {
colors0 |= MagicColor.GREEN; colors0 |= MagicColor.GREEN;
} }
if (buttonMap.get(StatTypes.COLORLESS).isSelected()) {
colors0 |= MagicColor.COLORLESS;
}
final byte colors = colors0; final byte colors = colors0;
final boolean wantColorless = buttonMap.get(StatTypes.COLORLESS).isSelected(); final boolean wantColorless = buttonMap.get(StatTypes.COLORLESS).isSelected();
@@ -195,7 +192,7 @@ public class SFilterUtil {
if (useColorIdentity && !allColorsFilteredOut) { if (useColorIdentity && !allColorsFilteredOut) {
result = result && (color.hasAnyColor(colors) || (wantColorless && color.isColorless())); result = result && (color.hasAnyColor(colors) || (wantColorless && color.isColorless()));
} else { } else {
result = result && rules.canCastWithAvailable(colors); result = result && (color.isColorless() || rules.canCastWithAvailable(colors));
} }
} }
} }