Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-12 10:21:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix for equipment

Browse Source
This commit is contained in:
fullwall 2012-11-01 09:17:13 +08:00
parent 79160706bb
commit 6290ea977f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package net.citizensnpcs.npc.entity;
import java.io.IOException; import java.io.IOException;
import java.net.Socket; import java.net.Socket;
import java.util.Arrays;
import java.util.List; import java.util.List;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
@ -33,7 +32,7 @@ import org.bukkit.util.Vector;
public class EntityHumanNPC extends EntityPlayer implements NPCHolder { public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
private final CitizensNPC npc; private final CitizensNPC npc;
private net.minecraft.server.ItemStack[] previousEquipment = { null, null, null, null, null }; private final net.minecraft.server.ItemStack[] previousEquipment = { null, null, null, null, null };
public EntityHumanNPC(MinecraftServer minecraftServer, World world, String string, public EntityHumanNPC(MinecraftServer minecraftServer, World world, String string,
ItemInWorldManager itemInWorldManager, NPC npc) { ItemInWorldManager itemInWorldManager, NPC npc) {
@ -116,8 +115,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
} catch (IOException ex) { } catch (IOException ex) {
// swallow // swallow
} }
for (int i = 0; i < previousEquipment.length; i++)
previousEquipment[i] = getEquipment(i);
} }
@Override @Override
@ -172,18 +169,15 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
} }
private void updateEquipment() { private void updateEquipment() {
int changes = 0;
for (int i = 0; i < previousEquipment.length; i++) { for (int i = 0; i < previousEquipment.length; i++) {
net.minecraft.server.ItemStack previous = previousEquipment[i]; net.minecraft.server.ItemStack previous = previousEquipment[i];
net.minecraft.server.ItemStack current = getEquipment(i); net.minecraft.server.ItemStack current = getEquipment(i);
if (!net.minecraft.server.ItemStack.equals(previous, current)) { if (previous != current) {
Util.sendPacketNearby(getBukkitEntity().getLocation(), new Packet5EntityEquipment(id, i, Util.sendPacketNearby(getBukkitEntity().getLocation(), new Packet5EntityEquipment(id, i,
current)); current));
++changes; previousEquipment[i] = current;
} }
} }
if (changes > 0)
previousEquipment = Arrays.copyOf(getEquipment(), previousEquipment.length);
} }
public static class PlayerNPC extends CraftPlayer implements NPCHolder { public static class PlayerNPC extends CraftPlayer implements NPCHolder {