From 14c50671c727d7922acaa1a5ea398972feb49cc9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 17:00:04 -0500 Subject: [PATCH] Dont send useless entity packets --- .../minecraft/server/EntityTrackerEntry.java | 17 +++++++++++++++++ .../minecraft/server/PacketPlayOutEntity.java | 10 +++++----- src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index 3a88c9a67..1f7c8f7da 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -162,6 +162,7 @@ public class EntityTrackerEntry { this.o = 0; packet1 = new PacketPlayOutEntityTeleport(this.tracker); } + if (net.pl3x.purpur.PurpurConfig.dontSendUselessEntityPackets && isUselessPacket(packet1)) packet1 = null; // Purpur } if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) { @@ -248,6 +249,22 @@ public class EntityTrackerEntry { } + // Purpur start + private boolean isUselessPacket(Packet possibleUselessPacket) { + if (possibleUselessPacket instanceof PacketPlayOutEntity) { + PacketPlayOutEntity packet = (PacketPlayOutEntity) possibleUselessPacket; + if (possibleUselessPacket instanceof PacketPlayOutEntity.PacketPlayOutRelEntityMove) { + return packet.getX() == 0 && packet.getY() == 0 && packet.getZ() == 0; + } else if (possibleUselessPacket instanceof PacketPlayOutEntity.PacketPlayOutRelEntityMoveLook) { + return packet.getX() == 0 && packet.getY() == 0 && packet.getZ() == 0 && packet.getYaw() == 0 && packet.getPitch() == 0; + } else if (possibleUselessPacket instanceof PacketPlayOutEntity.PacketPlayOutEntityLook) { + return packet.getYaw() == 0 && packet.getPitch() == 0; + } + } + return false; + } + // Purpur end + public void a(EntityPlayer entityplayer) { this.tracker.c(entityplayer); entityplayer.c(this.tracker); diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java index e5da2b19c..5b1d95935 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java @@ -5,11 +5,11 @@ import java.io.IOException; public class PacketPlayOutEntity implements Packet { protected int a; - protected short b; - protected short c; - protected short d; - protected byte e; - protected byte f; + protected short b; public short getX() { return b; } // Purpur - OBFHELPER + protected short c; public short getY() { return c; } // Purpur - OBFHELPER + protected short d; public short getZ() { return d; } // Purpur - OBFHELPER + protected byte e; public byte getYaw() { return e; } // Purpur - OBFHELPER + protected byte f; public byte getPitch() { return f; } // Purpur - OBFHELPER protected boolean g; protected boolean h; protected boolean i; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index 15458be9d..9b2ec85b1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -139,4 +139,9 @@ public class PurpurConfig { loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError); loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError); } + + public static boolean dontSendUselessEntityPackets = false; + private static void dontSendUselessEntityPackets() { + dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); + } } -- 2.24.0