Fix queue speed handling, probably fixes #1004

DenizenScript · Apr 4, 2015 · a581a50 · a581a50
1 parent e6bde9d
commit a581a50
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Settings.java b/src/main/java/net/aufdemrand/denizen/Settings.java
@@ -64,8 +64,14 @@ public static String scriptQueueSpeed() {
                 .getString("Scripts.Queue speed", "0.5s");
 
         // Check for users setting delay to 0, which will in turn lock up the server
-        try { if (Double.valueOf(delay) < 1) delay = "1t"; }
-        catch (Exception e) { delay = "0.5s"; }
+        try {
+            if (Duration.valueOf(delay).getTicks() < 1) {
+                delay = "1t";
+            }
+        }
+        catch (Exception e) {
+            delay = "0.5s";
+        }
 
         return delay;
     }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java
@@ -2363,11 +2363,11 @@ public void registerCoreMembers() {
 
         // <--[command]
         // @Name ShowFake
-        // @Syntax showfake [<material>/cancel] [<location>|...] (players:<player>|...) (d:<duration>{10s})
+        // @Syntax showfake [<material>|.../cancel] [<location>|...] (players:<player>|...) (d:<duration>{10s})
         // @Required 2
         // @Stable stable
         // @Short Makes the player see a block change that didn't actually happen.
-        // @Author aufdemrand, Morphan1
+        // @Author aufdemrand, Morphan1, mcmonkey
         // @Group player
         // @Description
         // TODO: Document Command Details
@@ -2377,7 +2377,7 @@ public void registerCoreMembers() {
         // TODO: Document Command Details
         // -->
         registerCoreMember(ShowFakeCommand.class,
-                "SHOWFAKE", "showfake [<material>/cancel] [<location>|...] (players:<player>|...) (d:<duration>{10s})", 2);
+                "SHOWFAKE", "showfake [<material>|.../cancel] [<location>|...] (players:<player>|...) (d:<duration>{10s})", 2);
 
 
         // <--[command]