From 80855b93f48255b43350edba92ecca0b80c6b611 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Wed, 31 Jul 2013 03:30:25 +0300
Subject: [PATCH] Tiny fixes.

---
 src/main/java/net/aufdemrand/denizen/objects/dEntity.java     | 2 +-
 .../denizen/scripts/containers/core/WorldScriptHelper.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
index f611a77e02..b2ea52afc1 100644
--- 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
index f481e3bd4c..031b85bb18 100644
--- 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