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

Fix equip NPE. This fixes CITIZENS-62.

Browse Source
This commit is contained in:
aPunch 2012-05-03 15:53:35 -05:00
parent 37ba042c29
commit b12b9e11ba
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
View File

@ -83,19 +83,22 @@ public class CitizensHumanNPC extends CitizensNPC implements Equipable {
} }
Messaging.send(equipper, "<e>" + getName() + " <a>had all of its items removed."); Messaging.send(equipper, "<e>" + getName() + " <a>had all of its items removed.");
} }
// Now edit the equipment based on the slot // Drop any previous equipment on the ground
if (trait.get(slot) != null && trait.get(slot).getType() != Material.AIR) if (trait.get(slot) != null && trait.get(slot).getType() != Material.AIR)
equipper.getWorld().dropItemNaturally(getBukkitEntity().getLocation(), trait.get(slot)); equipper.getWorld().dropItemNaturally(getBukkitEntity().getLocation(), trait.get(slot));
// Now edit the equipment based on the slot
if (type != Material.AIR) { if (type != Material.AIR) {
// Set the proper slot with one of the item
hand.setAmount(1);
trait.set(slot, 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;
equipper.setItemInHand(hand); equipper.setItemInHand(hand);
hand.setAmount(1);
} }
trait.set(slot, hand);
} }
@Override @Override