From f10944db9cfca47ebe12be9fdab65e10fc04e6aa Mon Sep 17 00:00:00 2001 From: aPunch Date: Tue, 28 Feb 2012 07:27:33 -0600 Subject: [PATCH] fix --- lib/CitizensAPI.jar | Bin 47602 -> 48970 bytes .../citizensnpcs/editor/EquipmentEditor.java | 8 +++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar index 2a64d90a15bca41703add72b3ddf2fa6170f6944..85dc5011c221750833350579f28c594a50ede7d9 100644 GIT binary patch delta 11495 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 diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java index 0670e9230..ebe1f5a3e 100644 --- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java +++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java @@ -100,17 +100,15 @@ public class EquipmentEditor extends Editor { Messaging.send(player, "" + npc.getName() + " had all of its items removed."); } // Now edit the equipment based on the slot - if (trait.get(slot) != null) { + if (trait.get(slot) != null && trait.get(slot).getType() != Material.AIR) player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.get(slot)); - } ItemStack set = hand; if (set != null && set.getType() != Material.AIR) { - if (hand.getAmount() > 1) { + if (hand.getAmount() > 1) hand.setAmount(hand.getAmount() - 1); - } else { + else hand = null; - } player.setItemInHand(hand); set.setAmount(1); }