Add getSelectedNPC() to dPlayer.

DenizenScript · Jul 26, 2013 · 27eb9ef · 27eb9ef
1 parent 25a9431
commit 27eb9ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 85 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -126,6 +126,12 @@ public dEntity getDenizenEntity() {
         return new dEntity(getPlayerEntity());
     }
 
+    public dNPC getSelectedNPC() {
+        if (getPlayerEntity().hasMetadata("selected"))
+            return dNPC.valueOf(getPlayerEntity().getMetadata("selected").get(0).asString());
+        else return null;
+    }
+
     public String getName() {
         return player_name;
     }
@@ -701,7 +707,7 @@ else if (attribute.getAttribute(2).startsWith("world"))
         if (attribute.startsWith("selected_npc")) {
             if (getPlayerEntity().hasMetadata("selected"))
                 return dNPC.valueOf(getPlayerEntity().getMetadata("selected").get(0).asString())
-                        .getAttribute(attribute.fulfill(1));
+                    .getAttribute(attribute.fulfill(1));
             else return "null";
         }
 

diff --git a/src/main/resources/util.dscript b/src/main/resources/util.dscript
@@ -64,87 +64,3 @@ _util_dtime_command:
       else flag global "Iterator %id%:!"
 
 
-# ex command
-
-"ex command":
-  type: world
-
-  events:
-    on ex command:
-    - if <player> == null queue clear
-    - if !<player.is_op> queue clear
-    - define command_name <c.args.get[1]>
-    - flag npc:<player.selected_npc> "list:|:<c.args>"
-    - flag "list:<-:%command_name%"
-    - define raw_args "<player.flag[list].as_list>"
-    - 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!'
-      }
-    - determine fulfilled
-
-"ex it":
-  type: task
-
-  1:
-    - "%1% <player.flag[list].get[1]>"
-
-  2:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]>"
-
-  3:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>"
-
-  4:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]>"
-
-  5:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]> <player.flag[list].get[5]>"
-
-  6:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]> <player.flag[list].get[5]> <player.flag[list].get[6]>"
-
-  7:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]> <player.flag[list].get[5]> <player.flag[list].get[6]>
-           <player.flag[list].get[7]>"
-
-  8:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]> <player.flag[list].get[5]> <player.flag[list].get[6]>
-           <player.flag[list].get[7]> <player.flag[list].get[8]>"
-
-  9:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]> <player.flag[list].get[5]> <player.flag[list].get[6]>
-           <player.flag[list].get[7]> <player.flag[list].get[8]> <player.flag[list].get[9]>"
-
-  10:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]> <player.flag[list].get[5]> <player.flag[list].get[6]>
-           <player.flag[list].get[7]> <player.flag[list].get[8]> <player.flag[list].get[9]>
-           <player.flag[list].get[10]>"
-
-  11:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]> <player.flag[list].get[5]> <player.flag[list].get[6]>
-           <player.flag[list].get[7]> <player.flag[list].get[8]> <player.flag[list].get[9]>
-           <player.flag[list].get[10]> <player.flag[list].get[11]>"
-
-  12:
-    - "%1% <player.flag[list].get[1]> <player.flag[list].get[2]> <player.flag[list].get[3]>
-           <player.flag[list].get[4]> <player.flag[list].get[5]> <player.flag[list].get[6]>
-           <player.flag[list].get[7]> <player.flag[list].get[8]> <player.flag[list].get[9]>
-           <player.flag[list].get[10]> <player.flag[list].get[11]> <player.flag[list].get[12]>"
-
-  on queue completes:
-  - flag list:!
-
-