From 04d58cc1908e9823eba1e48bfa52683d9e650a02 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
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 b4d3c4a4f..1dc29d7cd 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -168,6 +168,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) {
@@ -254,6 +255,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
+
     // Tuinity end - optimise entity tracking
     // TODO make use of this in second pass rewrite
     final void resetState() {
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<PacketListenerPlayOut> {
 
     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 345404c3a..e21931216 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -142,6 +142,11 @@ public class PurpurConfig {
         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);
+    }
+
     private static void timingsSettings() {
         getString("settings.timings.url", "https://timings.pl3x.net");
     }
-- 
2.24.0