From a4d15b6b8644bcd840eb696b7090fbca8b740567 Mon Sep 17 00:00:00 2001
From: austinio7116 <austinio@hotmail.com>
Date: Thu, 11 May 2017 22:39:12 +0000
Subject: [PATCH] Fixed state loading issue where null DeckProxy edition
 prevents loading of saved state.

---
 .../src/main/java/forge/deck/CardThemedDeckGenerator.java   | 6 ++++++
 forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java  | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java b/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
index e3892e2eb83..90b30e3620c 100644
--- a/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
@@ -1,5 +1,6 @@
 package forge.deck;
 
+import forge.card.CardEdition;
 import forge.game.GameFormat;
 
 import java.util.ArrayList;
@@ -28,6 +29,11 @@ public class CardThemedDeckGenerator extends DeckProxy implements Comparable<Car
         format=format0;
     }
 
+    public CardEdition getEdition() {
+        return CardEdition.UNKNOWN;
+    }
+
+
     @Override
     public String getName() {
         return name;
diff --git a/forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java b/forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java
index 13b0250130b..c7e607d63af 100644
--- a/forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.google.common.base.Predicate;
+import forge.card.CardEdition;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.itemmanager.IItemManager;
@@ -35,6 +36,10 @@ public class ColorDeckGenerator extends DeckProxy implements Comparable<ColorDec
         formatFilter = formatFilter0;
     }
 
+    public CardEdition getEdition() {
+        return CardEdition.UNKNOWN;
+    }
+
     @Override
     public String getName() {
         return name;