From f19f0e9193f085f2f52d313e3945d12054076c2e Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:37:55 +0000 Subject: [PATCH] color simplifications in CardFactory_Instants.java --- src/forge/CardFactory_Instants.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java index 2397347e5f3..3ebdfe4d167 100644 --- a/src/forge/CardFactory_Instants.java +++ b/src/forge/CardFactory_Instants.java @@ -163,7 +163,7 @@ public class CardFactory_Instants { list.addAll(play.getCards()); list = list.filter(new CardListFilter() { public boolean addCard(Card c) { - return CardUtil.getColors(c).contains(Constant.Color.White); + return c.isWhite(); } }); @@ -3707,7 +3707,7 @@ public class CardFactory_Instants { CardList list = new CardList(hand.getCards()); list = list.filter(new CardListFilter() { public boolean addCard(Card c) { - return CardUtil.getColors(c).contains(Constant.Color.Blue) && !c.equals(card); + return c.isBlue() && !c.equals(card); } }); return sa.isSpell() && opponent.equals(sa.getSourceCard().getController()) @@ -3742,7 +3742,7 @@ public class CardFactory_Instants { @Override public void selectCard(Card c, PlayerZone zone) { - if(CardUtil.getColors(c).contains(Constant.Color.Blue) && zone.is(Constant.Zone.Hand) + if(c.isBlue() && zone.is(Constant.Zone.Hand) && !c.equals(card)) { AllZone.GameAction.removeFromGame(c); String player = card.getController();