From 4a2be2c3e6154fc85e64c9e54555f26c329fc429 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 27 Oct 2014 20:47:02 +0100
Subject: [PATCH] * MWSDeckImporter - Fixed bug that could find the wrong card
 (fixes #609).

---
 .../mage/cards/decks/importer/MWSDeckImporter.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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<CardInfo> cards = CardRepository.instance.findCards(criteria);
-            if (cards.isEmpty()) {
-                criteria = new CardCriteria();
+            List<CardInfo> 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");