Patch up /ex a little

DenizenScript · Sep 23, 2013 · beb944b · beb944b
1 parent 6bec3e5
commit beb944b
Showing 1 changed file with 9 additions and 20 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -31,6 +31,7 @@
 import net.aufdemrand.denizen.utilities.packets.PacketHelper;
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.TraitInfo;
 
 import org.bukkit.Bukkit;
@@ -328,35 +329,23 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdName, Stri
         if (citizens == null)
             citizens = (Citizens) getServer().getPluginManager().getPlugin("Citizens");
 
-        // /EX command for console
-        if (!(sender instanceof Player) &&
-                cmdName.equalsIgnoreCase("ex")) {
+        if (cmdName.equalsIgnoreCase("ex")) {
             List<String> entries = new ArrayList<String>();
             String entry = "";
             for (String arg : args)
                 entry = entry + arg + " ";
 
-            entries.add(entry);
-            InstantQueue queue = InstantQueue.getQueue(null);
-            List<ScriptEntry> scriptEntries = ScriptBuilder.buildScriptEntries(entries, null,
-                    null, null);
-
-            queue.addEntries(scriptEntries);
-            queue.start();
-            return true;
-
-        } else if ((sender instanceof Player) &&
-                cmdName.equalsIgnoreCase("ex")) {
-            List<String> entries = new ArrayList<String>();
-            String entry = "";
-            for (String arg : args)
-                entry = entry + arg + " ";
+            if (entry.length() < 2) {
+                sender.sendMessage("/ex <dCommand> (arguments)");
+                return true;
+            }
 
             entries.add(entry);
             InstantQueue queue = InstantQueue.getQueue(null);
+            NPC npc = citizens.getNPCSelector().getSelected(sender);
             List<ScriptEntry> scriptEntries = ScriptBuilder.buildScriptEntries(entries, null,
-                    dPlayer.mirrorBukkitPlayer((Player) sender),
-                    dPlayer.mirrorBukkitPlayer((Player) sender).getSelectedNPC());
+                    (sender instanceof Player)?dPlayer.mirrorBukkitPlayer((Player) sender):null,
+                    npc != null ? new dNPC(npc) : null);
 
             queue.addEntries(scriptEntries);
             queue.start();