From b9aa42873fe923d48d6f71d2d587aed3b5f4f133 Mon Sep 17 00:00:00 2001 From: aPunch Date: Wed, 29 Feb 2012 07:23:22 -0600 Subject: [PATCH] added ability to list all NPCs --- .../net/citizensnpcs/command/command/NPCCommands.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java index bfc3842f0..ea633ef29 100644 --- a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java +++ b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java @@ -289,8 +289,9 @@ public class NPCCommands { @Command( aliases = { "npc" }, - usage = "list (page) (--owner (owner) --type (type) --char (char))", + usage = "list (page) ((-a) --owner (owner) --type (type) --char (char))", desc = "List NPCs", + flags = "a", modifiers = { "list" }, min = 1, max = 2, @@ -299,7 +300,10 @@ public class NPCCommands { public void list(CommandContext args, Player player, NPC npc) throws CommandException { List npcs = new ArrayList(); - if (args.getValueFlags().size() == 0 && args.argsLength() == 1 || args.argsLength() == 2) { + if (args.hasFlag('a')) { + for (NPC add : npcManager) + npcs.add(add); + } else if (args.getValueFlags().size() == 0 && args.argsLength() == 1 || args.argsLength() == 2) { for (NPC add : npcManager) if (add.getTrait(Owner.class).getOwner().equalsIgnoreCase(player.getName())) npcs.add(add);