forked from External/mage
[AVR] Second Guest + tests. Refactored filters.
This commit is contained in:
parent
3fac42fc3c
commit
32e29392d2
184 changed files with 823 additions and 562 deletions
|
|
@ -28,9 +28,6 @@
|
|||
|
||||
package mage.target;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import mage.Constants.Zone;
|
||||
import mage.cards.Card;
|
||||
import mage.cards.Cards;
|
||||
|
|
@ -38,6 +35,10 @@ import mage.filter.FilterCard;
|
|||
import mage.game.Game;
|
||||
import mage.players.Player;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author BetaSteward_at_googlemail.com
|
||||
|
|
@ -159,7 +160,7 @@ public class TargetCard<T extends TargetCard<T>> extends TargetObject<TargetCard
|
|||
break;
|
||||
case LIBRARY:
|
||||
for (Card card: player.getLibrary().getUniqueCards(game)) {
|
||||
if (filter.match(card))
|
||||
if (filter.match(card, game))
|
||||
possibleTargets.add(card.getId());
|
||||
}
|
||||
break;
|
||||
|
|
@ -179,7 +180,7 @@ public class TargetCard<T extends TargetCard<T>> extends TargetObject<TargetCard
|
|||
public boolean canTarget(UUID id, Cards cards, Game game) {
|
||||
Card card = cards.get(id, game);
|
||||
if (card != null)
|
||||
return filter.match(card);
|
||||
return filter.match(card, game);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue