Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-06-28 07:24:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CitizensDev/Citizens2

Browse Source
This commit is contained in:
fullwall 2013-03-17 22:41:18 +08:00
commit f55d5e845a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -139,7 +139,7 @@ public class NPCCommands {
min = 1,
max = 3,
permission = "citizens.npc.anchor")
@Requirements(selected = true, ownership = true, types = EntityType.PLAYER)
@Requirements(selected = true, ownership = true)
public void anchor(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
Anchors trait = npc.getTrait(Anchors.class);
if (args.hasValueFlag("save")) {
@ -746,7 +746,7 @@ public class NPCCommands {
min = 1,
max = 2,
permission = "citizens.npc.pose")
@Requirements(selected = true, ownership = true, types = EntityType.PLAYER)
@Requirements(selected = true, ownership = true)
public void pose(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
Poses trait = npc.getTrait(Poses.class);
if (args.hasValueFlag("save")) {
@ -1219,4 +1219,4 @@ public class NPCCommands {
npc.getName());
}
}
}
}

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

@ -64,6 +64,7 @@ permissions:
citizens.npc.controllable: true
citizens.npc.copy: true
citizens.npc.create: true
citizens.npc.create.*: true
citizens.npc.despawn: true
citizens.npc.edit.*:
children:
@ -101,4 +102,4 @@ permissions:
citizens.npc.trait: true
citizens.npc.trait-configure: true
citizens.npc.vulnerable: true
citizens.npc.wolf: true
citizens.npc.wolf: true