From 7a1313d3320d5a05ffda6c0cc40766e96cf2094b Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Mon, 13 Oct 2014 01:29:44 +0000
Subject: [PATCH] Fix crash when selecting a fake card in a list view

---
 forge-core/src/main/java/forge/card/CardType.java            | 2 ++
 .../src/main/java/forge/trackable/TrackableProperty.java     | 2 +-
 forge-game/src/main/java/forge/trackable/TrackableTypes.java | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java
index affe9e80646..57186ba0be0 100644
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -41,6 +41,8 @@ import java.util.Set;
  * @version $Id: java 9708 2011-08-09 19:34:12Z jendave $
  */
 public final class CardType implements Comparable<CardType>, CardTypeView {
+    public static final CardTypeView EMPTY = new CardType();
+
     public enum CoreType {
         Artifact(true),
         Conspiracy(false),
diff --git a/forge-game/src/main/java/forge/trackable/TrackableProperty.java b/forge-game/src/main/java/forge/trackable/TrackableProperty.java
index e405193e1fd..65419b4f151 100644
--- a/forge-game/src/main/java/forge/trackable/TrackableProperty.java
+++ b/forge-game/src/main/java/forge/trackable/TrackableProperty.java
@@ -59,7 +59,7 @@ public enum TrackableProperty {
     Name(TrackableTypes.StringType),
     Colors(TrackableTypes.ColorSetType),
     ImageKey(TrackableTypes.StringType),
-    Type(TrackableTypes.CardTypeCollectionViewType),
+    Type(TrackableTypes.CardTypeViewType),
     ManaCost(TrackableTypes.ManaCostType),
     OracleText(TrackableTypes.StringType),
     SetCode(TrackableTypes.StringType),
diff --git a/forge-game/src/main/java/forge/trackable/TrackableTypes.java b/forge-game/src/main/java/forge/trackable/TrackableTypes.java
index 3ffa67f558b..864abf4f84a 100644
--- a/forge-game/src/main/java/forge/trackable/TrackableTypes.java
+++ b/forge-game/src/main/java/forge/trackable/TrackableTypes.java
@@ -7,6 +7,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 
+import forge.card.CardType;
 import forge.card.CardTypeView;
 import forge.card.ColorSet;
 import forge.card.mana.ManaCost;
@@ -168,10 +169,10 @@ public class TrackableTypes {
             }
         }
     };
-    public static final TrackableType<CardTypeView> CardTypeCollectionViewType = new TrackableType<CardTypeView>() {
+    public static final TrackableType<CardTypeView> CardTypeViewType = new TrackableType<CardTypeView>() {
         @Override
         protected CardTypeView getDefaultValue() {
-            return null;
+            return CardType.EMPTY;
         }
 
         @Override