From ef8fe596a0d57744e17d845f91b8fa8a9a4b81ee Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Wed, 15 May 2013 12:00:27 +0800
Subject: [PATCH] Allow /npc spawn to use the selected NPC

---
 src/main/java/net/citizensnpcs/commands/NPCCommands.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index ab52540d8..83744ad2b 100644
--- a/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -922,15 +922,15 @@ public class NPCCommands {
 
     @Command(
             aliases = { "npc" },
-            usage = "spawn [id]",
+            usage = "spawn (id)",
             desc = "Spawn an existing NPC",
             modifiers = { "spawn" },
-            min = 2,
+            min = 1,
             max = 2,
             permission = "citizens.npc.spawn")
     @Requirements(ownership = true)
     public void spawn(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
-        NPC respawn = npcRegistry.getById(args.getInteger(1));
+        NPC respawn = args.argsLength() > 1 ? npcRegistry.getById(args.getInteger(1)) : npc;
         if (respawn == null)
             throw new CommandException(Messages.NO_NPC_WITH_ID_FOUND, args.getInteger(1));
         if (respawn.isSpawned())