diff --git a/forge-core/src/main/java/forge/item/PaperCard.java b/forge-core/src/main/java/forge/item/PaperCard.java index 32e9550b253..b835109f866 100644 --- a/forge-core/src/main/java/forge/item/PaperCard.java +++ b/forge-core/src/main/java/forge/item/PaperCard.java @@ -240,6 +240,9 @@ public class PaperCard implements Comparable, InventoryItemFromSet, // cannot still decide, if this "name|set" format is needed anymore // return String.format("%s|%s", name, cardSet); } + public String getCardName() { + return name; + } /* * This (utility) method transform a collectorNumber String into a key string for sorting. diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java index 5f889736ddf..60cb60b8a06 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java @@ -189,7 +189,7 @@ public class FDeckViewer extends FDialog { sectionCards = new TreeMap<>(); deckList.append(nl); for (final Entry ev : cp) { - cardName = ev.getKey().toString(); + cardName = ev.getKey().getCardName(); if (sectionCards.containsKey(cardName)) { sectionCards.put(cardName, (int)sectionCards.get(cardName) + ev.getValue()); } diff --git a/forge-gui-mobile/src/forge/deck/FDeckViewer.java b/forge-gui-mobile/src/forge/deck/FDeckViewer.java index 16b359a8766..ddb0894a722 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckViewer.java +++ b/forge-gui-mobile/src/forge/deck/FDeckViewer.java @@ -99,7 +99,7 @@ public class FDeckViewer extends FScreen { deckList.append(s.toString()).append(": "); deckList.append(nl); for (final Entry ev : cp) { - deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl); + deckList.append(ev.getValue()).append(" ").append(ev.getKey().getCardName()).append(nl); } deckList.append(nl); }