minor event cleaning

lolamar
DenizenScript · Oct 18, 2015 · 9e84428 · 9e84428
1 parent 40e7c56
commit 9e84428
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java b/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java
@@ -256,7 +256,7 @@ public void version(CommandContext args, CommandSender sender) throws CommandExc
 
 
     /*
-     * DENIZEN SCRIPTCHECK
+     * DENIZEN SCRIPTVERSIONS
      */
     @Command(
             aliases = {"denizen"}, usage = "scriptversions",

diff --git a/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java
@@ -51,8 +51,8 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) {
     @Override
     public boolean matches(ScriptContainer scriptContainer, String s) {
         String lower = CoreUtilities.toLowerCase(s);
-        return lower.equals("chunk unloads")
-                || lower.equals("chunk unloads in " + CoreUtilities.toLowerCase(world.getName()));
+        return (lower.startsWith("chunk unloads") && !lower.contains(" in "))
+                || lower.startsWith("chunk unloads in " + CoreUtilities.toLowerCase(world.getName()));
     }
 
     @Override

diff --git a/src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java
@@ -40,7 +40,9 @@ public WorldUnloadsScriptEvent() {
 
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {
-        return CoreUtilities.getXthArg(1, CoreUtilities.toLowerCase(s)).equals("unloads");
+        String lower = CoreUtilities.toLowerCase(s);
+        return CoreUtilities.getXthArg(1, lower).equals("unloads")
+                && !CoreUtilities.getXthArg(0, lower).equals("chunk");
     }
 
     @Override