Merge origin/master

This commit is contained in:
LevelX2 2015-10-30 22:35:08 +01:00
commit 077f62c4ff

View file

@ -73,7 +73,8 @@ public class MWSDeckImporter extends DeckImporter {
if (!cards.isEmpty()) {
cardInfo = cards.get(new Random().nextInt(cards.size()));
}
} else {
}
if (cardInfo == null) {
cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(lineName, true);
}