From 153310af5d2ecb333bd8fbeb2c218e4fcadf82b5 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Tue, 6 Sep 2011 00:22:48 +0000
Subject: [PATCH] deckmanager is now forced to store cards along with sets they
 belong to, cause ppl want customized decks

---
 src/main/java/forge/deck/DeckManager.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/deck/DeckManager.java b/src/main/java/forge/deck/DeckManager.java
index 9ccf7bdb9ed..21adbcc067c 100644
--- a/src/main/java/forge/deck/DeckManager.java
+++ b/src/main/java/forge/deck/DeckManager.java
@@ -375,13 +375,13 @@ public class DeckManager {
     // Precondition: iterator should point at the first line of cards list
     private static List<String> readCardList(final ListIterator<String> lineIterator) {
         List<String> result = new ArrayList<String>();
-        Pattern p = Pattern.compile("\\s*((\\d+)\\s+)?(.*?)\\s*");
+        Pattern p = Pattern.compile("((\\d+)\\s+)?(.*?)");
 
         while (lineIterator.hasNext()) {
             String line = lineIterator.next();
             if (line.startsWith("[")) { break; } // there comes another section
 
-            Matcher m = p.matcher(line);
+            Matcher m = p.matcher(line.trim());
             m.matches();
             String sCnt = m.group(2);
             String cardName = m.group(3);
@@ -474,11 +474,11 @@ public class DeckManager {
 
         out.write(format("%s%n", "[main]"));
         for (Entry<CardPrinted, Integer> e : d.getMain()) {
-            out.write(format("%d %s%n", e.getValue(), e.getKey().getName()));
+            out.write(format("%d %s|%s%n", e.getValue(), e.getKey().getName(), e.getKey().getSet()));
         }
         out.write(format("%s%n", "[sideboard]"));
         for (Entry<CardPrinted, Integer> e : d.getSideboard()) {
-            out.write(format("%d %s%n", e.getValue(), e.getKey().getName()));
+            out.write(format("%d %s|%s%n", e.getValue(), e.getKey().getName(), e.getKey().getSet()));
         }
     }