ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Filterable operation shortcuts for simple filters.

Browse Source
This commit is contained in:
marcins78
2013-02-14 17:13:22 +00:00
parent 2515a2df26
commit 85df9109b9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -848,11 +848,15 @@ public class Filters {
public static Filter and(final Filterable... filters) {
Filter[] filtersInt = convertToFilters(filters);
if (filtersInt.length == 1)
return filtersInt[0];
return andInternal(filtersInt);
}
public static Filter or(final Filterable... filters) {
Filter[] filtersInt = convertToFilters(filters);
if (filtersInt.length == 1)
return filtersInt[0];
return orInternal(filtersInt);
}
@@ -915,6 +919,10 @@ public class Filters {
public static Filter and(final Filterable[] filters1, final Filterable... filters2) {
final Filter[] newFilters1 = convertToFilters(filters1);
final Filter[] newFilters2 = convertToFilters(filters2);
if (newFilters1.length == 1 && newFilters2.length == 0)
return newFilters1[0];
if (newFilters1.length == 0 && newFilters2.length == 1)
return newFilters2[0];
return new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {