Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consolidate waitForAllCards in getAllPlayableCardDefs()

master
melvinzhang 2015-10-13 09:42:39 +08:00
parent ef2b098b31
commit eeb82c896e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/magic/data/CardDefinitions.java
View File

@ -281,8 +281,7 @@ public class CardDefinitions {
}
private static Stream<MagicCardDefinition> getDefaultPlayableCardDefStream() {
MagicSystem.waitForAllCards();
return allPlayableCardDefs.values().stream()
return getAllPlayableCardDefs().stream()
.filter(card -> card.isPlayable());
}
@ -314,13 +313,11 @@ public class CardDefinitions {
}
public static Stream<MagicCardDefinition> getNonBasicLandCards() {
MagicSystem.waitForAllCards();
return getDefaultPlayableCardDefStream()
.filter(card -> card.isLand() && !card.isBasic());
}
public static List<MagicCardDefinition> getSpellCards() {
MagicSystem.waitForAllCards();
return getDefaultPlayableCardDefStream()
.filter(card -> !card.isLand())
.collect(Collectors.toList());