From ae43427e513fea07288586fe6b6608d56d4b9f99 Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 4 Apr 2016 15:08:00 +0800 Subject: [PATCH] Offhand/helmet should clone the item properly --- src/main/java/net/citizensnpcs/editor/EquipmentEditor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java index 833be49a1..fb99faa30 100644 --- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java +++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java @@ -70,8 +70,9 @@ public class EquipmentEditor extends Editor { if (old != null && old.getType() != Material.AIR) { event.getPlayer().getWorld().dropItemNaturally(event.getPlayer().getLocation(), old); } - npc.getTrait(Equipment.class).set(finalSlot, - new ItemStack(event.getPlayer().getInventory().getItemInMainHand().getType(), 1)); + ItemStack newStack = hand.clone(); + newStack.setAmount(1); + npc.getTrait(Equipment.class).set(finalSlot, newStack); hand.setAmount(hand.getAmount() - 1); event.getPlayer().getInventory().setItemInMainHand(hand); }