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

CardListFilter replaced with Predicate<Card>

Browse Source
This commit is contained in:
Maxmtg
2012-09-23 08:10:27 +00:00
parent 99a2df6a59
commit 7786ef990d
50 changed files with 718 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/game/phase/PhaseUtil.java
View File

@@ -23,7 +23,7 @@ import forge.AllZone;
import forge.AllZoneUtil;
import forge.Card;
import forge.CardList;
import forge.CardListFilter;
import forge.CardPredicates;
import forge.Singletons;
import forge.card.trigger.TriggerType;
import forge.game.player.Player;
@@ -31,6 +31,7 @@ import forge.game.zone.ZoneType;
import forge.gui.match.CMatchUI;
import forge.gui.match.controllers.CMessage;
import forge.gui.match.nonsingleton.VField.PhaseLabel;
import forge.util.closures.Predicate;
/**
* <p>
@@ -100,7 +101,7 @@ public class PhaseUtil {
Singletons.getModel().getGameAction().resetActivationsPerTurn();
final CardList lands = AllZoneUtil.getPlayerLandsInPlay(turn).filter(CardListFilter.UNTAPPED);
final CardList lands = AllZoneUtil.getPlayerLandsInPlay(turn).filter(CardPredicates.UNTAPPED);
turn.setNumPowerSurgeLands(lands.size());
// anything before this point happens regardless of whether the Untap
@@ -369,9 +370,9 @@ public class PhaseUtil {
CardList list = new CardList();
list.addAll(AllZone.getCombat().getAllBlockers());
list = list.filter(new CardListFilter() {
list = list.filter(new Predicate<Card>() {
@Override
public boolean addCard(final Card c) {
public boolean isTrue(final Card c) {
return !c.getDamageHistory().getCreatureBlockedThisCombat();
}
});