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

Send movement updates more often

This commit is contained in:
fullwall 2013-10-27 18:01:28 +08:00
parent 64e33f234d
commit 133ea9e0db
2 changed files with 10 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/CitizensNPC.java
View File

@ -21,6 +21,7 @@ import net.citizensnpcs.util.Messages;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_6_R3.EntityLiving;
import net.minecraft.server.v1_6_R3.Packet34EntityTeleport;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@ -38,6 +39,7 @@ import com.google.common.base.Throwables;
public class CitizensNPC extends AbstractNPC {
private EntityController entityController;
private final CitizensNavigator navigator = new CitizensNavigator(this);
private int packetUpdateCount;
public CitizensNPC(int id, String name, EntityController entityController, NPCRegistry registry) {
super(id, name, registry);
@ -228,6 +230,13 @@ public class CitizensNPC extends AbstractNPC {
if (isSpawned()) {
NMS.trySwim(getBukkitEntity());
navigator.run();
if (++packetUpdateCount > 30) {
if (!getNavigator().isNavigating()) {
NMS.sendPacketNearby(getStoredLocation(),
new Packet34EntityTeleport(NMS.getHandle(getBukkitEntity())));
}
packetUpdateCount = 0;
}
}
} catch (Exception ex) {
Throwable error = Throwables.getRootCause(ex);

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

@ -30,7 +30,6 @@ import net.minecraft.server.v1_6_R3.Navigation;
import net.minecraft.server.v1_6_R3.NetworkManager;
import net.minecraft.server.v1_6_R3.Packet;
import net.minecraft.server.v1_6_R3.Packet201PlayerInfo;
import net.minecraft.server.v1_6_R3.Packet34EntityTeleport;
import net.minecraft.server.v1_6_R3.Packet35EntityHeadRotation;
import net.minecraft.server.v1_6_R3.Packet5EntityEquipment;
import net.minecraft.server.v1_6_R3.PlayerInteractManager;
@ -240,11 +239,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
private void updatePackets(boolean navigating) {
if (++packetUpdateCount >= 30) {
Location current = getBukkitEntity().getLocation(packetLocationCache);
Packet[] packets = new Packet[navigating ? 6 : 8];
Packet[] packets = new Packet[navigating ? 6 : 7];
if (!navigating) {
packets[6] = new Packet35EntityHeadRotation(id,
(byte) MathHelper.d(NMS.getHeadYaw(this) * 256.0F / 360.0F));
packets[7] = new Packet34EntityTeleport(this);
}
for (int i = 0; i < 5; i++) {
packets[i] = new Packet5EntityEquipment(id, i, getEquipment(i));