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

Fix CITIZENS-335

Browse Source
This commit is contained in:
fullwall 2012-12-18 20:38:39 +08:00
parent 6cc965f108
commit fc0bbc7866
5 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/citizensnpcs/editor/EndermanEquipper.java
View File

@ -36,6 +36,7 @@ public class EndermanEquipper implements Equipper {
if (set.getType() != Material.AIR) { if (set.getType() != Material.AIR) {
set.setAmount(1); set.setAmount(1);
hand.setAmount(hand.getAmount() - 1); hand.setAmount(hand.getAmount() - 1);
equipper.setItemInHand(hand);
} }
npc.getTrait(Equipment.class).set(0, set); npc.getTrait(Equipment.class).set(0, set);
} }

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

@ -14,7 +14,6 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -52,9 +51,7 @@ public class EquipmentEditor extends Editor {
Equipper equipper = EQUIPPERS.get(npc.getBukkitEntity().getType()); Equipper equipper = EQUIPPERS.get(npc.getBukkitEntity().getType());
if (equipper == null) if (equipper == null)
equipper = new GenericEquipper(); equipper = new GenericEquipper();
ItemStack hand = event.getPlayer().getItemInHand();
equipper.equip(event.getPlayer(), npc); equipper.equip(event.getPlayer(), npc);
event.getPlayer().setItemInHand(hand.getAmount() > 0 ? hand : null);
} }
private static final Map<EntityType, Equipper> EQUIPPERS = Maps.newEnumMap(EntityType.class); private static final Map<EntityType, Equipper> EQUIPPERS = Maps.newEnumMap(EntityType.class);

1
src/main/java/net/citizensnpcs/editor/GenericEquipper.java
View File

@ -78,6 +78,7 @@ public class GenericEquipper implements Equipper {
clone.setAmount(1); clone.setAmount(1);
trait.set(slot, clone); trait.set(slot, clone);
hand.setAmount(hand.getAmount() - 1); hand.setAmount(hand.getAmount() - 1);
equipper.setItemInHand(hand);
} }
} }
} }

1
src/main/java/net/citizensnpcs/editor/PigEquipper.java
View File

@ -26,5 +26,6 @@ public class PigEquipper implements Equipper {
toEquip.getTrait(Saddle.class).toggle(); toEquip.getTrait(Saddle.class).toggle();
Messaging.sendTr(equipper, Messages.SADDLED_STOPPED, toEquip.getName()); Messaging.sendTr(equipper, Messages.SADDLED_STOPPED, toEquip.getName());
} }
equipper.setItemInHand(hand);
} }
} }

1
src/main/java/net/citizensnpcs/editor/SheepEquipper.java
View File

@ -34,5 +34,6 @@ public class SheepEquipper implements Equipper {
toEquip.getTrait(WoolColor.class).setColor(DyeColor.WHITE); toEquip.getTrait(WoolColor.class).setColor(DyeColor.WHITE);
Messaging.sendTr(equipper, Messages.EQUIPMENT_EDITOR_SHEEP_COLOURED, toEquip.getName(), "white"); Messaging.sendTr(equipper, Messages.EQUIPMENT_EDITOR_SHEEP_COLOURED, toEquip.getName(), "white");
} }
equipper.setItemInHand(hand);
} }
} }