From fc5379825c2573a99810156e647d36f25cc58cb5 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sun, 11 Nov 2012 15:24:02 +0800
Subject: [PATCH] Delegate citizens.npc.text to citizens.npc.edit.text, move
 citizens.npc.remove.all permission to citizens.admin.remove.all
 (CITIZENS-276, CITIZENS-293)

---
 .../citizensnpcs/command/command/NPCCommands.java  |  2 +-
 src/main/resources/plugin.yml                      | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
index 3435d7c10..80fad7ecf 100644
--- a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
@@ -774,7 +774,7 @@ public class NPCCommands {
         if (args.argsLength() == 2) {
             if (!args.getString(1).equalsIgnoreCase("all"))
                 throw new CommandException(Messages.REMOVE_INCORRECT_SYNTAX);
-            if (!sender.hasPermission("citizens.npc.remove.all") && !sender.hasPermission("citizens.admin"))
+            if (!sender.hasPermission("citizens.admin.remove.all") && !sender.hasPermission("citizens.admin"))
                 throw new NoPermissionsException();
             npcRegistry.deregisterAll();
             Messaging.sendTr(sender, Messages.REMOVED_ALL_NPCS);
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 8141b8c09..7071dace3 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -6,12 +6,13 @@ main: net.citizensnpcs.Citizens
 website: http://www.citizensnpcs.com
 commands:
   traitc:
-    description: Configures traits
     aliases: [trc, tc]
+    description: Configures traits
   trait:
-    description: Trait commands
     aliases: [tr]
+    description: Trait commands
   script:
+    aliases: [sc]
     description: Scripting commands
   citizens:
     aliases: [citizens2]
@@ -33,6 +34,7 @@ permissions:
         children:
             citizens.admin: true
             citizens.admin.avoid-limits: true
+            citizens.admin.remove.all: true
       citizens.help: true
       citizens.script.*:
         children:
@@ -64,10 +66,7 @@ permissions:
           citizens.npc.pose: true
           citizens.npc.power: true
           citizens.npc.profession: true
-          citizens.npc.remove.*:
-            children:
-                citizens.npc.remove: true
-                citizens.npc.remove.all: true
+          citizens.npc.remove: true
           citizens.npc.rename: true
           citizens.npc.select: true
           citizens.npc.size: true
@@ -75,6 +74,9 @@ permissions:
           citizens.npc.spawn: true
           citizens.npc.speed: true
           citizens.npc.talk: true
+          citizens.npc.text:
+            children:
+              citizens.npc.edit.text: true
           citizens.npc.tp: true
           citizens.npc.tphere: true
           citizens.npc.trait.*: