From d3317fc7557ea4e1558dbe0a77e740c25bff4357 Mon Sep 17 00:00:00 2001 From: HappyPikachu Date: Sun, 15 Feb 2015 12:40:45 -0500 Subject: [PATCH] Correctly handle invalid dye colors, fixes #9 --- src/main/java/me/blackvein/quests/Quests.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java index 61b87d384..2935bd9fb 100644 --- a/src/main/java/me/blackvein/quests/Quests.java +++ b/src/main/java/me/blackvein/quests/Quests.java @@ -4986,9 +4986,14 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener, public static DyeColor getDyeColor(String s) { - String col = Lang.getKey(s); + String col = Lang.getKey(MiscUtil.getCapitalized(s)); col = col.replace("COLOR_", ""); - DyeColor color = DyeColor.valueOf(col); + DyeColor color = null; + try { + color = DyeColor.valueOf(col); + } catch (IllegalArgumentException e) { + //Do nothing + } return color != null ? color : getDyeColorLegacy(s);