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

Deck import set recongition re-enabled

Browse Source
This commit is contained in:
Maxmtg
2014-02-25 09:26:07 +00:00
parent c7758ca855
commit 52cac29ca7
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -239,7 +239,17 @@ public final class CardDb implements ICardDatabase {
@Override
public PaperCard getCardFromEdition(final String cardName, final Date printedBefore, final SetPreference fromSet, int artIndex) {
List<PaperCard> cards = this.allCardsByName.get(cardName);
final CardRequest cr = CardRequest.fromString(cardName);
List<PaperCard> cards = this.allCardsByName.get(cr.cardName);
if ( StringUtils.isNotBlank(cr.edition) ) {
cards = Lists.newArrayList(Iterables.filter(cards, new Predicate<PaperCard>() {
@Override public boolean apply(PaperCard input) { return input.getEdition().equalsIgnoreCase(cr.edition); }
}));
}
if(artIndex == -1 && cr.artIndex > 0) {
artIndex = cr.artIndex;
}
int sz = cards.size();
if( fromSet == SetPreference.Earliest || fromSet == SetPreference.EarliestCoreExp) {