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

*Fixed ThisTurnEntered

Browse Source
This commit is contained in:
Hellfish
2011-09-22 14:26:08 +00:00
parent c3861aa6e8
commit ec65b5d300
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/CardUtil.java
View File

@@ -664,14 +664,7 @@ public final class CardUtil {
res.addAll(((DefaultPlayerZone) AllZone.getStackZone()).getCardsAddedThisTurn(from)); res.addAll(((DefaultPlayerZone) AllZone.getStackZone()).getCardsAddedThisTurn(from));
} }
res = res.filter(new CardListFilter() { res = res.getValidCards(valid, src.getController(), src);
public boolean addCard(final Card c) {
if (c.isValidCard(valid.split(","), src.getController(), src)) {
return true;
}
return false;
}
});
return res; return res;
} }

3
src/main/java/forge/DefaultPlayerZone.java
View File

@@ -320,9 +320,8 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
public final CardList getCardsAddedThisTurn(final Constant.Zone origin) { public final CardList getCardsAddedThisTurn(final Constant.Zone origin) {
System.out.print("Request cards put into " + getZoneType() + " from " + origin + ".Amount: "); System.out.print("Request cards put into " + getZoneType() + " from " + origin + ".Amount: ");
CardList ret = new CardList(); CardList ret = new CardList();
String originName = origin == null ? null : origin.name();
for (int i = 0; i < cardsAddedThisTurn.size(); i++) { for (int i = 0; i < cardsAddedThisTurn.size(); i++) {
if (cardsAddedThisTurnSource.get(i).equals(originName) || origin == null /* former: equals('Any') */) { if (cardsAddedThisTurnSource.get(i) == origin || origin == null /* former: equals('Any') */) {
ret.add(cardsAddedThisTurn.get(i)); ret.add(cardsAddedThisTurn.get(i));
} }
} }