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

- Fix filtering lands by color identity such that colorless lands are not filtered out if a certain color or combination of colors are filtered out (but colorless cards are not filtered out).

Browse Source
This commit is contained in:
Agetian
2015-09-26 10:47:42 +00:00
parent 6938c66ee5
commit a9a85381f7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,7 @@ public class SFilterUtil {
result = color.isMulticolor() || (wantColorless && color.isColorless());
} else if (colors != ColorSet.ALL_COLORS.getColor()) {
if (useColorIdentity && !allColorsFilteredOut) {
result = color.hasAnyColor(colors);
result = color.hasAnyColor(colors) || (wantColorless && color.isColorless());
} else {
result = rules.canCastWithAvailable(colors);
}
@@ -190,7 +190,7 @@ public class SFilterUtil {
result = !color.isMulticolor();
if (colors != ColorSet.ALL_COLORS.getColor()) {
if (useColorIdentity && !allColorsFilteredOut) {
result = result && color.hasAnyColor(colors);
result = result && (color.hasAnyColor(colors) || (wantColorless && color.isColorless()));
} else {
result = result && rules.canCastWithAvailable(colors);
}