Cleanup.

DenizenScript · Jul 15, 2013 · 396f953 · 396f953
1 parent 3f9bd6a
commit 396f953
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/ListenerCancelEvent.java b/src/main/java/net/aufdemrand/denizen/events/ListenerCancelEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events;
 
 import net.aufdemrand.denizen.objects.dPlayer;
-import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 
 

diff --git a/src/main/java/net/aufdemrand/denizen/events/ListenerEvent.java b/src/main/java/net/aufdemrand/denizen/events/ListenerEvent.java
@@ -1,13 +1,12 @@
 package net.aufdemrand.denizen.events;
 
 import net.aufdemrand.denizen.objects.dPlayer;
-import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 
 /**
- * An event that pertains to a Denizen Listener.
+ * An event that pertains to a Denizen 'Player Listener'.
  *
  * @author Jeremy Schroeder
  *

diff --git a/src/main/java/net/aufdemrand/denizen/events/ListenerFinishEvent.java b/src/main/java/net/aufdemrand/denizen/events/ListenerFinishEvent.java
@@ -6,7 +6,7 @@
 
 
 /**
- * An event that fires on a Player finishing a Listener.
+ * An event that fires on a Player finishing a ' Player Listener'.
  *
  * @author Jeremy Schroeder
  *

diff --git a/src/main/java/net/aufdemrand/denizen/objects/Duration.java b/src/main/java/net/aufdemrand/denizen/objects/Duration.java
@@ -56,7 +56,7 @@ public static Duration valueOf(String string) {
             if (low != null && high != null
                     && low.getSecondsAsInt() < high.getSecondsAsInt()) {
                 int seconds = Utilities.getRandom()
-                        .nextInt((high.getSecondsAsInt() - low.getSecondsAsInt())
+                        .nextInt((high.getSecondsAsInt() - low.getSecondsAsInt() + 1)
                                 + low.getSecondsAsInt());
                 // Send the result to the debugger since it's probably good to know what is being chosen.
                 dB.echoDebug("Getting random duration between " + low.identify()

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java
@@ -9,7 +9,9 @@
 import net.aufdemrand.denizen.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
+import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
+import org.bukkit.entity.EntityType;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/main/resources/util.dscript b/src/main/resources/util.dscript
@@ -76,7 +76,10 @@ _util_dtime_command:
     - flag "list:|:<c.args>"
     - flag "list:<-:%command_name%"
     - define raw_args "<player.flag[list].as_list>"
-    - run 'ex it' path:<player.flag[list].size> instantly def:%command_name%
+    - if <player.selected_npc> != null
+      run 'ex it' as:<player.selected_npc> path:<player.flag[list].size> instantly def:%command_name%
+      else
+      run 'ex it' path:<player.flag[list].size> instantly def:%command_name%
     - if <player.flag[list].size> > 12 {
       - flag list:!
       - narrate '<red>Too many arguments!'