mirror of
https://github.com/CitizensDev/Citizens2.git
synced 2024-08-20 04:43:24 +02:00
Delegate citizens.npc.text to citizens.npc.edit.text, move citizens.npc.remove.all permission to citizens.admin.remove.all (CITIZENS-276, CITIZENS-293)
This commit is contained in:
parent
8e13728f25
commit
fc5379825c
|
@ -774,7 +774,7 @@ public class NPCCommands {
|
||||||
if (args.argsLength() == 2) {
|
if (args.argsLength() == 2) {
|
||||||
if (!args.getString(1).equalsIgnoreCase("all"))
|
if (!args.getString(1).equalsIgnoreCase("all"))
|
||||||
throw new CommandException(Messages.REMOVE_INCORRECT_SYNTAX);
|
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();
|
throw new NoPermissionsException();
|
||||||
npcRegistry.deregisterAll();
|
npcRegistry.deregisterAll();
|
||||||
Messaging.sendTr(sender, Messages.REMOVED_ALL_NPCS);
|
Messaging.sendTr(sender, Messages.REMOVED_ALL_NPCS);
|
||||||
|
|
|
@ -6,12 +6,13 @@ main: net.citizensnpcs.Citizens
|
||||||
website: http://www.citizensnpcs.com
|
website: http://www.citizensnpcs.com
|
||||||
commands:
|
commands:
|
||||||
traitc:
|
traitc:
|
||||||
description: Configures traits
|
|
||||||
aliases: [trc, tc]
|
aliases: [trc, tc]
|
||||||
|
description: Configures traits
|
||||||
trait:
|
trait:
|
||||||
description: Trait commands
|
|
||||||
aliases: [tr]
|
aliases: [tr]
|
||||||
|
description: Trait commands
|
||||||
script:
|
script:
|
||||||
|
aliases: [sc]
|
||||||
description: Scripting commands
|
description: Scripting commands
|
||||||
citizens:
|
citizens:
|
||||||
aliases: [citizens2]
|
aliases: [citizens2]
|
||||||
|
@ -33,6 +34,7 @@ permissions:
|
||||||
children:
|
children:
|
||||||
citizens.admin: true
|
citizens.admin: true
|
||||||
citizens.admin.avoid-limits: true
|
citizens.admin.avoid-limits: true
|
||||||
|
citizens.admin.remove.all: true
|
||||||
citizens.help: true
|
citizens.help: true
|
||||||
citizens.script.*:
|
citizens.script.*:
|
||||||
children:
|
children:
|
||||||
|
@ -64,10 +66,7 @@ permissions:
|
||||||
citizens.npc.pose: true
|
citizens.npc.pose: true
|
||||||
citizens.npc.power: true
|
citizens.npc.power: true
|
||||||
citizens.npc.profession: true
|
citizens.npc.profession: true
|
||||||
citizens.npc.remove.*:
|
citizens.npc.remove: true
|
||||||
children:
|
|
||||||
citizens.npc.remove: true
|
|
||||||
citizens.npc.remove.all: true
|
|
||||||
citizens.npc.rename: true
|
citizens.npc.rename: true
|
||||||
citizens.npc.select: true
|
citizens.npc.select: true
|
||||||
citizens.npc.size: true
|
citizens.npc.size: true
|
||||||
|
@ -75,6 +74,9 @@ permissions:
|
||||||
citizens.npc.spawn: true
|
citizens.npc.spawn: true
|
||||||
citizens.npc.speed: true
|
citizens.npc.speed: true
|
||||||
citizens.npc.talk: true
|
citizens.npc.talk: true
|
||||||
|
citizens.npc.text:
|
||||||
|
children:
|
||||||
|
citizens.npc.edit.text: true
|
||||||
citizens.npc.tp: true
|
citizens.npc.tp: true
|
||||||
citizens.npc.tphere: true
|
citizens.npc.tphere: true
|
||||||
citizens.npc.trait.*:
|
citizens.npc.trait.*:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user