Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-27 05:05:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2

Browse Source
This commit is contained in:
fullwall 2012-02-28 20:11:37 +08:00
commit 96ea7fe363
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
View File

@ -102,11 +102,13 @@ public class EquipmentEditor extends Editor {
// Now edit the equipment based on the slot // Now edit the equipment based on the slot
if (trait.getEquipment(slot) != null && trait.getEquipment(slot).getType() != Material.AIR) if (trait.getEquipment(slot) != null && trait.getEquipment(slot).getType() != Material.AIR)
player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.getEquipment(slot)); player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.getEquipment(slot));
trait.setEquipment(slot, hand); ItemStack set = hand;
if (hand.getAmount() > 1) if (hand.getAmount() > 1)
hand.setAmount(hand.getAmount() - 1); hand.setAmount(hand.getAmount() - 1);
else else
hand = null; hand = null;
player.setItemInHand(hand); player.setItemInHand(hand);
set.setAmount(1);
trait.setEquipment(slot, set);
} }
} }