Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix CITIZENS-454

This commit is contained in:
fullwall 2013-02-17 22:49:45 +08:00
parent cc61de6dbf
commit c3d98cccde
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
View File

@ -32,8 +32,9 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.util.Vector;
public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
private final Location cachedEquipmentLocation = new Location(null, 0, 0, 0);
private final CitizensNPC npc;
private final net.minecraft.server.v1_4_R1.ItemStack[] previousEquipment = { null, null, null, null, null };
public EntityHumanNPC(MinecraftServer minecraftServer, World world, String string,
PlayerInteractManager playerInteractManager, NPC npc) {
@ -181,13 +182,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
}
private void updateEquipment() {
for (int i = 0; i < previousEquipment.length; i++) {
net.minecraft.server.v1_4_R1.ItemStack previous = previousEquipment[i];
net.minecraft.server.v1_4_R1.ItemStack current = getEquipment(i);
if (previous != current) {
NMS.sendPacketNearby(getBukkitEntity().getLocation(), new Packet5EntityEquipment(id, i, current));
previousEquipment[i] = current;
}
for (int i = 0; i < 5; i++) {
NMS.sendPacketNearby(getBukkitEntity().getLocation(cachedEquipmentLocation), new Packet5EntityEquipment(id,
i, getEquipment(i)));
}
}