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

color simplifications in CardFactory_Instants.java

Browse Source
This commit is contained in:
jendave
2011-08-06 08:37:55 +00:00
parent 746a4fa4f1
commit f19f0e9193
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/CardFactory_Instants.java
View File

@@ -163,7 +163,7 @@ public class CardFactory_Instants {
list.addAll(play.getCards()); list.addAll(play.getCards());
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {
public boolean addCard(Card c) { 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()); CardList list = new CardList(hand.getCards());
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {
public boolean addCard(Card c) { 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()) return sa.isSpell() && opponent.equals(sa.getSourceCard().getController())
@@ -3742,7 +3742,7 @@ public class CardFactory_Instants {
@Override @Override
public void selectCard(Card c, PlayerZone zone) { 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)) { && !c.equals(card)) {
AllZone.GameAction.removeFromGame(c); AllZone.GameAction.removeFromGame(c);
String player = card.getController(); String player = card.getController();