Add 'offhand' for setting the NPC's offhand item

CitizensDev · Mar 6, 2016 · 49986de · 49986de
1 parent 3b3f477
commit 49986de
Showing 1 changed file with 35 additions and 17 deletions.
diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
@@ -44,24 +44,42 @@ 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"))
-            return;
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (!event.getPlayer().isValid())
-                    return;
-                ItemStack hand = event.getPlayer().getItemInHand();
-                if (hand.getType() == Material.AIR || hand.getAmount() <= 0) {
-                    return;
+        if (event.getMessage().equals("helmet")
+                && !event.getPlayer().hasPermission("citizens.npc.edit.equip.any-helmet")) {
+            Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
+                @Override
+                public void run() {
+                    if (!event.getPlayer().isValid())
+                        return;
+                    ItemStack hand = event.getPlayer().getInventory().getItemInMainHand();
+                    if (hand.getType() == Material.AIR || hand.getAmount() <= 0) {
+                        return;
+                    }
+                    npc.getTrait(Equipment.class).set(EquipmentSlot.HELMET,
+                            new ItemStack(event.getPlayer().getInventory().getItemInMainHand().getType(), 1));
+                    hand.setAmount(hand.getAmount() - 1);
+                    event.getPlayer().getInventory().setItemInMainHand(hand);
+                }
+            });
+        }
+        if (event.getMessage().equals("offhand")
+                && !event.getPlayer().hasPermission("citizens.npc.edit.equip.offhand")) {
+            Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
+                @Override
+                public void run() {
+                    if (!event.getPlayer().isValid())
+                        return;
+                    ItemStack hand = event.getPlayer().getInventory().getItemInMainHand();
+                    if (hand.getType() == Material.AIR || hand.getAmount() <= 0) {
+                        return;
+                    }
+                    npc.getTrait(Equipment.class).set(EquipmentSlot.OFF_HAND,
+                            new ItemStack(event.getPlayer().getInventory().getItemInMainHand().getType(), 1));
+                    hand.setAmount(hand.getAmount() - 1);
+                    event.getPlayer().getInventory().setItemInMainHand(hand);
                 }
-                npc.getTrait(Equipment.class).set(EquipmentSlot.HELMET,
-                        new ItemStack(event.getPlayer().getItemInHand().getType(), 1));
-                hand.setAmount(hand.getAmount() - 1);
-                event.getPlayer().setItemInHand(hand);
-            }
-        });
+            });
+        }
     }
 
     @EventHandler