From b5cdcb3f9ef98d79661ea3f48d34f399fac8719c Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sun, 11 Sep 2011 14:53:18 +0000
Subject: [PATCH] fix for decks with cards in development (that have no valid
 setinfo)

---
 src/main/java/forge/card/CardDb.java      | 4 ++--
 src/main/java/forge/deck/DeckManager.java | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/forge/card/CardDb.java b/src/main/java/forge/card/CardDb.java
index c3cde519b04..06aa99db463 100644
--- a/src/main/java/forge/card/CardDb.java
+++ b/src/main/java/forge/card/CardDb.java
@@ -105,9 +105,9 @@ public final class CardDb {
         String cardName = name;
         if (pipePos >= 0) {
             cardName = name.substring(0, pipePos);
-            String setName = name.substring(pipePos + 1);
+            String setName = name.substring(pipePos + 1).trim();
             // only if set is not blank try to load it
-            if (StringUtils.isNotBlank(setName)) {
+            if (StringUtils.isNotBlank(setName) && !"???".equals(setName)) {
                 return getCard(cardName, setName);
             }
         }
diff --git a/src/main/java/forge/deck/DeckManager.java b/src/main/java/forge/deck/DeckManager.java
index 6a3aaea5d13..ee9085bb954 100644
--- a/src/main/java/forge/deck/DeckManager.java
+++ b/src/main/java/forge/deck/DeckManager.java
@@ -507,7 +507,13 @@ public class DeckManager {
         List<Entry<CardPrinted, Integer>> main2sort = pool.getOrderedList();
         Collections.sort(main2sort, TableSorter.byNameThenSet);
         for (Entry<CardPrinted, Integer> e : main2sort) {
-            out.write(format("%d %s|%s%n", e.getValue(), e.getKey().getName(), e.getKey().getSet()));
+            CardPrinted card = e.getKey();
+            boolean hasBadSetInfo = "???".equals(card.getSet()) || StringUtils.isBlank(card.getSet());
+            if (hasBadSetInfo) {
+                out.write(format("%d %s%n", e.getValue(), card.getName()));
+            } else {
+                out.write(format("%d %s|%s%n", e.getValue(), card.getName(), card.getSet()));
+            }
         }
     }