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

CardLists.filter now uses Predicates.and

Browse Source
This commit is contained in:
Hanmac
2016-11-26 10:26:10 +00:00
parent f341d2cdb1
commit 1e7d900ba0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/card/CardLists.java
View File

@@ -256,7 +256,11 @@ public class CardLists {
}
public static CardCollection filter(Iterable<Card> cardList, Predicate<Card> f1, Predicate<Card> f2) {
return new CardCollection(Iterables.filter(Iterables.filter(cardList, f1), f2));
return new CardCollection(Iterables.filter(cardList, Predicates.and(f1, f2)));
}
public static CardCollection filter(Iterable<Card> cardList, Iterable<Predicate<Card>> filt) {
return new CardCollection(Iterables.filter(cardList, Predicates.and(filt)));
}
/**
@@ -275,7 +279,11 @@ public class CardLists {
}
public static List<Card> filterAsList(Iterable<Card> cardList, Predicate<Card> f1, Predicate<Card> f2) {
return Lists.newArrayList((Iterables.filter(Iterables.filter(cardList, f1), f2)));
return Lists.newArrayList(Iterables.filter(cardList, Predicates.and(f1, f2)));
}
public static List<Card> filterAsList(Iterable<Card> cardList, Iterable<Predicate<Card>> filt) {
return Lists.newArrayList(Iterables.filter(cardList, Predicates.and(filt)));
}
public static int count(Iterable<Card> cardList, Predicate<Card> filt) {