From f6f655b15c739081c6f28b99f796852fa9f1344f Mon Sep 17 00:00:00 2001 From: aPunch Date: Tue, 28 Feb 2012 05:53:47 -0600 Subject: [PATCH 1/2] fix duping bug --- src/main/java/net/citizensnpcs/editor/EquipmentEditor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java index 98b90a5c2..e9f7a356c 100644 --- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java +++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java @@ -102,7 +102,9 @@ public class EquipmentEditor extends Editor { // Now edit the equipment based on the slot if (trait.getEquipment(slot) != null && trait.getEquipment(slot).getType() != Material.AIR) player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.getEquipment(slot)); - trait.setEquipment(slot, hand); + ItemStack set = hand; + set.setAmount(1); + trait.setEquipment(slot, set); if (hand.getAmount() > 1) hand.setAmount(hand.getAmount() - 1); else From 1bb90ae533b64f549713ee63939643caf8e862ba Mon Sep 17 00:00:00 2001 From: aPunch Date: Tue, 28 Feb 2012 06:09:40 -0600 Subject: [PATCH 2/2] fix another bug --- src/main/java/net/citizensnpcs/editor/EquipmentEditor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java index e9f7a356c..d934f0fc1 100644 --- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java +++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java @@ -103,12 +103,12 @@ public class EquipmentEditor extends Editor { if (trait.getEquipment(slot) != null && trait.getEquipment(slot).getType() != Material.AIR) player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.getEquipment(slot)); ItemStack set = hand; - set.setAmount(1); - trait.setEquipment(slot, set); if (hand.getAmount() > 1) hand.setAmount(hand.getAmount() - 1); else hand = null; player.setItemInHand(hand); + set.setAmount(1); + trait.setEquipment(slot, set); } } \ No newline at end of file