Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-01 14:08:08 +01:00
Code Issues Projects Releases Wiki Activity

Delegate citizens.npc.text to citizens.npc.edit.text, move citizens.npc.remove.all permission to citizens.admin.remove.all (CITIZENS-276, CITIZENS-293)

Browse Source
This commit is contained in:
fullwall 2012-11-11 15:24:02 +08:00
parent 8e13728f25
commit fc5379825c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/citizensnpcs/command/command/NPCCommands.java
View File

@ -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);

14
src/main/resources/plugin.yml
View File

@ -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.*: