Proper fix for world script determinations.

DenizenScript · Jul 30, 2013 · bc46e0a · bc46e0a
1 parent b1221ab
commit bc46e0a
Showing 1 changed file with 8 additions and 5 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
@@ -194,13 +194,13 @@ public void blockBreak(BlockBreakEvent event) {
         if (determination.toUpperCase().startsWith("CANCELLED"))
         	event.setCancelled(true);
 
-        if (determination.length() > 0) {
+        else if (determination.equals("none") == false) {
 
         	// Cancel the event
         	event.setCancelled(true);
 
         	// If "drops:nothing" is used, clear the block's drops
-        	if (aH.getStringFrom(determination).equalsIgnoreCase("nothing")) {
+        	if (determination.equalsIgnoreCase("nothing")) {
         		block.getDrops().clear();
         	}
 
@@ -1092,8 +1092,9 @@ public void playerDeath(PlayerDeathEvent event) {
         		null, event.getEntity(), context);
 
         // Handle message
-        if (determination.length() > 0)
+        if (determination.equals("none") == false) {
             event.setDeathMessage(determination);
+        }
     }
 
     @EventHandler
@@ -1321,8 +1322,9 @@ public void joinEvent(PlayerJoinEvent event) {
         		null, event.getPlayer(), context);
 
         // Handle message
-        if (determination.length() > 0)
+        if (determination.equals("none") == false) {
             event.setJoinMessage(determination);
+        }
     }
 
     @EventHandler
@@ -1388,8 +1390,9 @@ public void quitEvent(PlayerQuitEvent event) {
         		null, event.getPlayer(), context).toUpperCase();
 
         // Handle determine message
-        if (determination.length() > 0)
+        if (determination.equals("none") == false) {
             event.setQuitMessage(determination);
+        }
     }
 
     @EventHandler