Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[AVR] Second Guest + tests. Refactored filters.

Browse source
This commit is contained in:
magenoxx 2012-05-24 09:01:31 +04:00
parent 3fac42fc3c
commit 32e29392d2
184 changed files with 823 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/cards/CardsImpl.java
View file

@ -112,7 +112,7 @@ public class CardsImpl extends LinkedHashSet<UUID> implements Cards, Serializabl
public int count(FilterCard filter, Game game) {
int result = 0;
for (UUID card: this) {
if (filter.match(game.getCard(card)))
if (filter.match(game.getCard(card), game))
result++;
}
return result;
@ -132,7 +132,7 @@ public class CardsImpl extends LinkedHashSet<UUID> implements Cards, Serializabl
public Set<Card> getCards(FilterCard filter, Game game) {
Set<Card> cards = new LinkedHashSet<Card>();
for (UUID card: this) {
boolean match = filter.match(game.getCard(card));
boolean match = filter.match(game.getCard(card), game);
if (match)
cards.add(game.getCard(card));
}