From a4d4b6b1d8947bf9ecf48391790ad2fcf1f43a82 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Tue, 6 Sep 2011 00:05:06 +0000 Subject: [PATCH] QuestMode crashed with old decks (no difficulty and displayname metadata in dck files), doesn't crash now at least. --- src/main/java/forge/quest/gui/main/QuestBattle.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/quest/gui/main/QuestBattle.java b/src/main/java/forge/quest/gui/main/QuestBattle.java index 4790481f4fb..2ca8e212e10 100644 --- a/src/main/java/forge/quest/gui/main/QuestBattle.java +++ b/src/main/java/forge/quest/gui/main/QuestBattle.java @@ -7,6 +7,8 @@ import forge.quest.data.QuestEvent; import javax.swing.*; +import org.apache.commons.lang3.StringUtils; + import java.util.ArrayList; import java.util.List; @@ -62,14 +64,13 @@ public class QuestBattle extends QuestSelectablePanel { String oppIconAddress = event1.getIcon(); ImageIcon icon; - // If non-default icon defined, use it - if(oppIconAddress.equals("")) { + // If non-default icon defined, use it + if (StringUtils.isBlank(oppIconAddress)) { icon = GuiUtils.getIconFromFile(oppName + ".jpg"); } else icon = GuiUtils.getIconFromFile(oppIconAddress + ".jpg"); - - + // Add to list of current quest opponents. opponentList.add( new QuestBattle(oppName, oppDeckName, oppDiff, oppDesc, icon)