diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java index 44c4894a6b4..3b0c602ee08 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java @@ -470,7 +470,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab try { StringBuilder filePath = new StringBuilder(); filePath.append(Constants.IO.imageBaseDir).append(File.separator); - filePath.append(card.hashCode()).append(".").append(card.getName().replace(":", "")).append(".jpg"); + filePath.append(card.hashCode()).append(".").append(card.getName().replace(":", "").replace("//", "-")).append(".jpg"); File temporaryFile = new File(filePath.toString()); String imagePath = CardImageUtils.getImagePath(card, imagesPath); TFile outputFile = new TFile(imagePath); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java index 566030a5479..9634efb0770 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java @@ -134,7 +134,7 @@ public class CardImageUtils { String imageName; String type = card.getType() != 0 ? " " + Integer.toString(card.getType()) : ""; - String name = card.getName().replace(":", ""); + String name = card.getName().replace(":", "").replace("//", "-"); if (card.getUsesVariousArt()) { imageName = name + "." + card.getCollectorId() + ".full.jpg"; diff --git a/Mage/src/mage/cards/SplitCard.java b/Mage/src/mage/cards/SplitCard.java index fae71ecb532..a560e218659 100644 --- a/Mage/src/mage/cards/SplitCard.java +++ b/Mage/src/mage/cards/SplitCard.java @@ -53,7 +53,7 @@ public abstract class SplitCard> extends CardImpl { private Card rightHalfCard; public SplitCard(UUID ownerId, int cardNumber, String nameLeft, String nameRight, Rarity rarity, CardType[] cardTypes, String costsLeft, String costsRight, boolean fused) { - super(ownerId, cardNumber, new StringBuilder(nameLeft).append(" - ").append(nameRight).toString(), rarity, cardTypes, costsLeft + costsRight, (fused ?SpellAbilityType.SPLIT_FUSED:SpellAbilityType.SPLIT)); + super(ownerId, cardNumber, new StringBuilder(nameLeft).append(" // ").append(nameRight).toString(), rarity, cardTypes, costsLeft + costsRight, (fused ?SpellAbilityType.SPLIT_FUSED:SpellAbilityType.SPLIT)); this.createLeftHalfCard(nameLeft, costsLeft); this.createRightHalfCard(nameRight, costsRight); this.splitCard = true; diff --git a/Mage/src/mage/cards/decks/importer/TxtDeckImporter.java b/Mage/src/mage/cards/decks/importer/TxtDeckImporter.java index 68c209223ea..620d4046306 100644 --- a/Mage/src/mage/cards/decks/importer/TxtDeckImporter.java +++ b/Mage/src/mage/cards/decks/importer/TxtDeckImporter.java @@ -58,7 +58,7 @@ public class TxtDeckImporter extends DeckImporter { int delim = line.indexOf(' '); String lineNum = line.substring(0, delim).trim(); - String lineName = line.substring(delim).trim(); + String lineName = line.substring(delim).replace("’","\'").trim(); try { int num = Integer.parseInt(lineNum); List cards = CardRepository.instance.findCards(lineName);