Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-19 05:42:04 +01:00
Code Issues Projects Releases Wiki Activity

Optimisation to packet sending

Browse Source
This commit is contained in:
fullwall 2013-02-20 22:56:28 +08:00
parent 7e20713f7c
commit 69d7db688c
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import net.minecraft.server.v1_4_R1.MathHelper;
import net.minecraft.server.v1_4_R1.MinecraftServer;
import net.minecraft.server.v1_4_R1.Navigation;
import net.minecraft.server.v1_4_R1.NetworkManager;
import net.minecraft.server.v1_4_R1.Packet;
import net.minecraft.server.v1_4_R1.Packet35EntityHeadRotation;
import net.minecraft.server.v1_4_R1.Packet5EntityEquipment;
import net.minecraft.server.v1_4_R1.PlayerInteractManager;
@ -34,10 +35,10 @@ 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 boolean gravity = true;
private int headYawCount;
private final CitizensNPC npc;
private final Location packetLocationCache = new Location(null, 0, 0, 0);
private int packetUpdateCount;
public EntityHumanNPC(MinecraftServer minecraftServer, World world, String string,
PlayerInteractManager playerInteractManager, NPC npc) {
@ -130,20 +131,13 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
if (npc == null)
return;
boolean navigating = npc.getNavigator().isNavigating();
if (!navigating && ++headYawCount >= 20) {
int i = MathHelper.d(az * 256.0F / 360.0F);
NMS.sendPacketNearby(getBukkitEntity().getLocation(cachedEquipmentLocation),
new Packet35EntityHeadRotation(id, (byte) i));
headYawCount = 0;
}
updatePackets(navigating);
if (gravity && !navigating && getBukkitEntity() != null
&& Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION)) && !NMS.inWater(getBukkitEntity())) {
move(0, -0.2, 0);
// gravity. also works around an entity.onGround not updating issue
// (onGround is normally updated by the client)
}
updateEquipment();
if (!npc.data().get("removefromplayerlist", true))
g();
if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON)
@ -191,10 +185,18 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
NMS.setHeadYaw(this, yaw);
}
private void updateEquipment() {
for (int i = 0; i < 5; i++) {
NMS.sendPacketNearby(getBukkitEntity().getLocation(cachedEquipmentLocation), new Packet5EntityEquipment(id,
i, getEquipment(i)));
private void updatePackets(boolean navigating) {
if (++packetUpdateCount >= 20) {
Location current = getBukkitEntity().getLocation(packetLocationCache);
Packet[] packets = new Packet[navigating ? 5 : 6];
if (!navigating) {
packets[5] = new Packet35EntityHeadRotation(id, (byte) MathHelper.d(az * 256.0F / 360.0F));
}
for (int i = 0; i < 5; i++) {
packets[i] = new Packet5EntityEquipment(id, i, getEquipment(i));
}
NMS.sendPacketsNearby(current, packets);
packetUpdateCount = 0;
}
}

16
src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -2,6 +2,8 @@ package net.citizensnpcs.util;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Random;
@ -219,11 +221,11 @@ public class NMS {
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
public static void sendPacketNearby(Location location, Packet packet) {
NMS.sendPacketNearby(location, packet, 64);
public static void sendPacketsNearby(Location location, Collection<Packet> packets) {
NMS.sendPacketsNearby(location, packets, 64);
}
public static void sendPacketNearby(Location location, Packet packet, double radius) {
public static void sendPacketsNearby(Location location, Collection<Packet> packets, double radius) {
radius *= radius;
final org.bukkit.World world = location.getWorld();
for (Player ply : Bukkit.getServer().getOnlinePlayers()) {
@ -233,10 +235,16 @@ public class NMS {
if (location.distanceSquared(ply.getLocation()) > radius) {
continue;
}
sendPacket(ply, packet);
for (Packet packet : packets) {
sendPacket(ply, packet);
}
}
}
public static void sendPacketsNearby(Location location, Packet... packets) {
NMS.sendPacketsNearby(location, Arrays.asList(packets), 64);
}
public static void sendToOnline(Packet... packets) {
Validate.notNull(packets, "packets cannot be null");
for (Player player : Bukkit.getOnlinePlayers()) {

4
src/main/java/net/citizensnpcs/util/PlayerAnimation.java
View File

@ -1,5 +1,7 @@
package net.citizensnpcs.util;
import java.util.Arrays;
import net.minecraft.server.v1_4_R1.EntityPlayer;
import net.minecraft.server.v1_4_R1.Packet;
import net.minecraft.server.v1_4_R1.Packet17EntityLocationAction;
@ -79,6 +81,6 @@ public enum PlayerAnimation {
}
protected void sendPacketNearby(Packet packet, EntityPlayer player, int radius) {
NMS.sendPacketNearby(player.getBukkitEntity().getLocation(), packet, radius);
NMS.sendPacketsNearby(player.getBukkitEntity().getLocation(), Arrays.asList(packet), radius);
}
}