Fix sheep-dying exception, fixes #428

Seriously, test things you commit!
DenizenScript · Sep 23, 2013 · dcc2b9c · dcc2b9c
1 parent e139d15
commit dcc2b9c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
@@ -2436,8 +2436,14 @@ public void sheepDyeWool(SheepDyeWoolEvent event) {
 
         if (determination.toUpperCase().startsWith("CANCELLED"))
             event.setCancelled(true);
-        else if (DyeColor.valueOf(determination) != null)
-            event.setColor(DyeColor.valueOf(determination));
+        else if (determination.equals(determination.toUpperCase())) {
+            try {
+                event.setColor(DyeColor.valueOf(determination));
+            }
+            catch (IllegalArgumentException e) {
+                dB.echoError("Unknown dye color " + determination);
+            }
+        }
     }
 
     // <--[event]