From ec02774818318f16520b46d4f9bebbc70a2cef34 Mon Sep 17 00:00:00 2001 From: Evan Murawski Date: Sat, 2 Feb 2019 18:41:56 -0500 Subject: [PATCH] Replace single slash with double slash in split card names when importing with TxtDeckImporter.java --- .../java/mage/cards/decks/importer/TxtDeckImporter.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 index a2b5706eb8..2efe665182 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java @@ -19,7 +19,7 @@ public class TxtDeckImporter extends PlainTextDeckImporter { private static final String[] SET_VALUES = new String[]{"lands", "creatures", "planeswalkers", "other spells", "sideboard cards", "Instant", "Land", "Enchantment", "Artifact", "Sorcery", "Planeswalker", "Creature"}; private static final Set IGNORE_NAMES = new HashSet<>(Arrays.asList(SET_VALUES)); - + private boolean sideboard = false; private boolean switchSideboardByEmptyLine = true; // all cards after first empty line will be sideboard (like mtgo format) private int nonEmptyLinesTotal = 0; @@ -97,9 +97,8 @@ public class TxtDeckImporter extends PlainTextDeckImporter { if (lineName.contains("//") && !lineName.contains(" // ")) { lineName = lineName.replace("//", " // "); } - if (lineName.contains(" / ")) { - lineName = lineName.replace(" / ", " // "); - } + lineName = lineName.replaceFirst("(?<=[^/])\\s*/\\s*(?=[^/])", " // "); + if (IGNORE_NAMES.contains(lineName) || IGNORE_NAMES.contains(lineNum)) { return; }