Check permissions properly for offhand/helmet equipping

CitizensDev · Mar 16, 2016 · 893eb4b · 893eb4b
1 parent 7fbe1db
commit 893eb4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -916,7 +916,6 @@ public void npc(CommandContext args, CommandSender sender, NPC npc) {
             Messaging.send(sender,
                     String.format(format, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), loc.getWorld().getName()));
         }
-        npc.getNavigator().setTarget(Bukkit.getPlayerExact("fullwall"), true);
         Messaging.send(sender, "    <a>Traits<e>");
         for (Trait trait : npc.getTraits()) {
             if (CitizensAPI.getTraitFactory().isInternalTrait(trait))

diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
@@ -45,7 +45,7 @@ public void end() {
     @EventHandler(ignoreCancelled = true)
     public void onPlayerChat(final AsyncPlayerChatEvent event) {
         if (event.getMessage().equals("helmet")
-                && !event.getPlayer().hasPermission("citizens.npc.edit.equip.any-helmet")) {
+                && event.getPlayer().hasPermission("citizens.npc.edit.equip.any-helmet")) {
             Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
                 @Override
                 public void run() {
@@ -61,9 +61,10 @@ public void run() {
                     event.getPlayer().getInventory().setItemInMainHand(hand);
                 }
             });
+            event.setCancelled(true);
         }
         if (event.getMessage().equals("offhand")
-                && !event.getPlayer().hasPermission("citizens.npc.edit.equip.offhand")) {
+                && event.getPlayer().hasPermission("citizens.npc.edit.equip.offhand")) {
             Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
                 @Override
                 public void run() {
@@ -79,6 +80,7 @@ public void run() {
                     event.getPlayer().getInventory().setItemInMainHand(hand);
                 }
             });
+            event.setCancelled(true);
         }
     }