From 1c5338665964bc00272db5ef6962e52960da3a5d Mon Sep 17 00:00:00 2001 From: drdev Date: Fri, 18 Jul 2014 05:33:33 +0000 Subject: [PATCH] Prevent crashing if quest pet images fail to load --- .../forge/quest/bazaar/QuestPetController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java index 2ef883520a2..339ca40b1d2 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java @@ -21,6 +21,7 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import forge.GuiBase; +import forge.assets.FSkinProp; import forge.assets.ISkinImage; import forge.item.PaperToken; import forge.properties.ForgeConstants; @@ -122,7 +123,19 @@ public class QuestPetController implements IQuestBazaarItem { public final ISkinImage getIcon(final QuestAssets qA) { final String path = ForgeConstants.CACHE_TOKEN_PICS_DIR; final int level = this.getPetLevel(qA); - return GuiBase.getInterface().getUnskinnedIcon(path + this.levels.get(level < this.maxLevel ? level + 1 : level).getPicture() + ".jpg"); + try { + return GuiBase.getInterface().getUnskinnedIcon(path + this.levels.get(level < this.maxLevel ? level + 1 : level).getPicture() + ".jpg"); + } + catch (Exception e) { + e.printStackTrace(); + } + try { + return GuiBase.getInterface().getUnskinnedIcon(ForgeConstants.NO_CARD_FILE); + } + catch (Exception e) { + e.printStackTrace(); + } + return GuiBase.getInterface().getSkinIcon(FSkinProp.ICO_UNKNOWN); } /**