Merge pull request #25 from oloflarsson/betterperms

Superperms compliant plugin.yml. Fixes CITIZENS-705.
2024-11-23 19:16:34 +01:00 · 2013-10-03 02:42:21 -07:00 · 2013-10-03 02:42:21 -07:00 · a34b78c9e5
commit a34b78c9e5
parent cac5a5387d ccce8a249a
2 changed files with 1297 additions and 74 deletions
--- a/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@ -212,7 +212,7 @@ public class NPCCommands {
            flags = "myn")
    public void controllable(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
        if ((npc.isSpawned() && !sender.hasPermission("citizens.npc.controllable."
-                + npc.getBukkitEntity().getType().toString().toLowerCase()))
+                + npc.getBukkitEntity().getType().name().toLowerCase().replace("_", "")))
                || !sender.hasPermission("citizens.npc.controllable"))
            throw new NoPermissionsException();
        if (!npc.hasTrait(Controllable.class)) {
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml