Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-01 23:23:31 +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 22:18:24 +08:00
commit 50b98ae39e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/CitizensAPI.jar
View File

Binary file not shown.

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

@ -27,10 +27,10 @@ public class EquipmentEditor extends Editor {
@Override @Override
public void begin() { public void begin() {
Messaging.send(player, "<a>Entered the equipment editor!"); Messaging.send(player, "<2>Entered the equipment editor!");
Messaging.send(player, "<a>Right click to equip armor and items."); Messaging.send(player, "<e>Right click <a>to equip armor and items.");
Messaging.send(player, "<a>Right click while crouching to equip armor in the NPC's hand."); Messaging.send(player, "<e>Right click <a>while <e>crouching <a>to equip armor in the NPC's hand.");
Messaging.send(player, "<a>Right click with an empty hand to remove all armor and items."); Messaging.send(player, "<e>Right click <a>with an <e>empty hand <a>to remove all armor and items.");
} }
@Override @Override
@ -100,17 +100,15 @@ public class EquipmentEditor extends Editor {
Messaging.send(player, "<e>" + npc.getName() + " <a>had all of its items removed."); Messaging.send(player, "<e>" + npc.getName() + " <a>had all of its items removed.");
} }
// Now edit the equipment based on the slot // 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)); player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.get(slot));
}
ItemStack set = hand; ItemStack set = hand;
if (set != null && set.getType() != Material.AIR) { if (set != null && set.getType() != Material.AIR) {
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); set.setAmount(1);
} }