From dec594f7d0abfc58c042bfea1be92adc95ed166f Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 1 Apr 2013 18:35:45 +0000 Subject: [PATCH] Won't crash if precon deck didn't have the 'set' value --- src/main/java/forge/item/PreconDeck.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/item/PreconDeck.java b/src/main/java/forge/item/PreconDeck.java index f5966a3054d..c35f0b9c602 100644 --- a/src/main/java/forge/item/PreconDeck.java +++ b/src/main/java/forge/item/PreconDeck.java @@ -77,17 +77,14 @@ public class PreconDeck implements InventoryItemFromSet { final Map> sections = FileSection.parseSections(deckLines); this.deck = Deck.fromSections(sections); - String setProxy = "n/a"; + FileSection kv = FileSection.parse(sections.get("metadata"), "="); imageFilename = kv.get("Image"); description = kv.get("Description"); - if (Singletons.getModel().getEditions().get(kv.get("set").toUpperCase()) != null) { - setProxy = kv.get("set"); - } - - this.set = setProxy; + String deckEdition = kv.get("set"); + this.set = deckEdition == null || Singletons.getModel().getEditions().get(deckEdition.toUpperCase()) == null ? "n/a" : deckEdition; this.recommendedDeals = new SellRules(sections.get("shop")); }