external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when selecting a fake card in a list view

Browse Source
This commit is contained in:
drdev
2014-10-13 01:29:44 +00:00
parent f905903db1
commit 7a1313d332
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/src/main/java/forge/card/CardType.java
View File

@@ -41,6 +41,8 @@ import java.util.Set;
* @version $Id: java 9708 2011-08-09 19:34:12Z jendave $ * @version $Id: java 9708 2011-08-09 19:34:12Z jendave $
*/ */
public final class CardType implements Comparable<CardType>, CardTypeView { public final class CardType implements Comparable<CardType>, CardTypeView {
public static final CardTypeView EMPTY = new CardType();
public enum CoreType { public enum CoreType {
Artifact(true), Artifact(true),
Conspiracy(false), Conspiracy(false),

2
forge-game/src/main/java/forge/trackable/TrackableProperty.java
View File

@@ -59,7 +59,7 @@ public enum TrackableProperty {
Name(TrackableTypes.StringType), Name(TrackableTypes.StringType),
Colors(TrackableTypes.ColorSetType), Colors(TrackableTypes.ColorSetType),
ImageKey(TrackableTypes.StringType), ImageKey(TrackableTypes.StringType),
Type(TrackableTypes.CardTypeCollectionViewType), Type(TrackableTypes.CardTypeViewType),
ManaCost(TrackableTypes.ManaCostType), ManaCost(TrackableTypes.ManaCostType),
OracleText(TrackableTypes.StringType), OracleText(TrackableTypes.StringType),
SetCode(TrackableTypes.StringType), SetCode(TrackableTypes.StringType),

5
forge-game/src/main/java/forge/trackable/TrackableTypes.java
View File

@@ -7,6 +7,7 @@ import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import forge.card.CardType;
import forge.card.CardTypeView; import forge.card.CardTypeView;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.mana.ManaCost; 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 @Override
protected CardTypeView getDefaultValue() { protected CardTypeView getDefaultValue() {
return null; return CardType.EMPTY;
} }
@Override @Override