* UI: fixed wrong deck import from cubes and other sources without ca…

…rds amount;
magefree · Jul 1, 2019 · e3f5071 · e3f5071
1 parent 7f9e259
commit e3f5071
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java
@@ -55,8 +55,13 @@ protected void readLine(String line, DeckCardLists deckList) {
             line = line.substring(0, commentDelim).trim();
         }
 
+        // ignore all empty lines until real cards starts
+        if (line.isEmpty() && !wasCardLines) {
+            return;
+        }
+
         // switch sideboard by empty line
-        if (switchSideboardByEmptyLine && line.isEmpty() && wasCardLines) {
+        if (switchSideboardByEmptyLine && line.isEmpty()) {
             if (!sideboard) {
                 sideboard = true;
             } else {
@@ -77,29 +82,28 @@ protected void readLine(String line, DeckCardLists deckList) {
 
         line = line.replace("\t", " "); // changing tabs to blanks as delimiter
         int delim = line.indexOf(' ');
-        if (delim < 0) {
-            return;
-        }
-
-        String lineNum = line.substring(0, delim).trim();
-        if (IGNORE_NAMES.contains(lineNum)) {
-            return;
+        String lineNum = "";
+        if (delim > 0) {
+            lineNum = line.substring(0, delim).trim();
+            if (IGNORE_NAMES.contains(lineNum)) {
+                return;
+            }
         }
 
         // amount
         int cardAmount = 0;
-        boolean haveCardAmout;
-        try {
-            cardAmount = Integer.parseInt(lineNum.replaceAll("\\D+", ""));
-            if ((cardAmount <= 0) || (cardAmount >= 100)) {
-                sbMessage.append("Invalid number (too small or too big): ").append(lineNum).append(" at line ").append(lineCount).append('\n');
-                return;
+        boolean haveCardAmout = false;
+        if (!lineNum.isEmpty()) {
+            try {
+                cardAmount = Integer.parseInt(lineNum.replaceAll("\\D+", ""));
+                if ((cardAmount <= 0) || (cardAmount >= 100)) {
+                    sbMessage.append("Invalid number (too small or too big): ").append(lineNum).append(" at line ").append(lineCount).append('\n');
+                    return;
+                }
+                haveCardAmout = true;
+            } catch (NumberFormatException nfe) {
+                // card without amount
             }
-            haveCardAmout = true;
-        } catch (NumberFormatException nfe) {
-            haveCardAmout = false;
-            //sbMessage.append("Invalid number: ").append(lineNum).append(" at line ").append(lineCount).append('\n');
-            //return;
         }
 
         String lineName;