Tiny fixes.

DenizenScript · Jul 31, 2013 · 80855b9 · 80855b9
1 parent 1bf2ffb
commit 80855b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -580,7 +580,7 @@ public void setSubtype (String entityName, String typeName, String method, Strin
         Class<?> typeClass = Class.forName(typeName);
         Object[] types = typeClass.getEnumConstants();
 
-        if (value.matches("RANDOM")) {
+        if (value.equalsIgnoreCase("RANDOM")) {
 
             entityClass.getMethod(method, typeClass).invoke(entity, types[Utilities.getRandom().nextInt(types.length)]);
         }

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
@@ -985,7 +985,9 @@ public String call() {
             return;
         if (determination.toUpperCase().startsWith("CANCELLED"))
             event.setCancelled(true);
-        else event.setMessage(determination);
+        else if (determination.equals("none") == false) {
+        	event.setMessage(determination);
+        }
     }
 
     @EventHandler