Fix Listener bug

And... the freakin... EoF newline...
DenizenScript · Aug 31, 2013 · 3c2aeb9 · 3c2aeb9
1 parent 0595087
commit 3c2aeb9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ListenCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ListenCommand.java
@@ -69,10 +69,6 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
                     && arg.matchesEnum(Action.values()))
                 scriptEntry.addObject("action", arg.asElement());
 
-                // <type>
-            else if (!scriptEntry.hasObject("type"))
-                scriptEntry.addObject("type", arg.asElement());
-
                 // <id:name>
             else if (!scriptEntry.hasObject("id")
                     && arg.matchesPrefix("id, i"))
@@ -84,6 +80,10 @@ else if (!scriptEntry.hasObject("finish_script")
                     && arg.matchesArgumentType(dScript.class))
                 scriptEntry.addObject("finish_script", arg.asType(dScript.class));
 
+                // <type>
+            else if (!scriptEntry.hasObject("type"))
+                scriptEntry.addObject("type", arg.asElement());
+
             arguments.add(arg);
         }
 
@@ -169,4 +169,4 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
 
 
 
-}
+}