diff --git a/Mage/src/mage/cards/decks/importer/MWSDeckImporter.java b/Mage/src/mage/cards/decks/importer/MWSDeckImporter.java index 508654f79a1..09a19efe91c 100644 --- a/Mage/src/mage/cards/decks/importer/MWSDeckImporter.java +++ b/Mage/src/mage/cards/decks/importer/MWSDeckImporter.java @@ -63,16 +63,16 @@ public class MWSDeckImporter extends DeckImporter { String lineName = line.substring(delim + 1).trim(); try { int num = Integer.parseInt(lineNum); - - CardCriteria criteria = new CardCriteria(); - criteria.name(lineName); - criteria.setCodes(setCode); - List cards = CardRepository.instance.findCards(criteria); - if (cards.isEmpty()) { - criteria = new CardCriteria(); + List cards = null; + if (!setCode.isEmpty()) { + CardCriteria criteria = new CardCriteria(); criteria.name(lineName); + criteria.setCodes(setCode); cards = CardRepository.instance.findCards(criteria); } + if (cards == null || cards.isEmpty()) { + cards = CardRepository.instance.findCards(lineName); + } if (cards.isEmpty()) { sbMessage.append("Could not find card: '").append(lineName).append("' at line ").append(lineCount).append("\n");