From 0000000000000000000000000000000000000000 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 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java index 8ea4209400489116823eced292d8cd9654a1c809..d19a025337c4b0a2965184b4c872f23d15a4a60b 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -189,6 +189,7 @@ public class ServerEntity { this.teleportDelay = 0; packet1 = new ClientboundTeleportEntityPacket(this.entity); } + if (net.pl3x.purpur.PurpurConfig.dontSendUselessEntityPackets && isUselessPacket(packet1)) packet1 = null; // Purpur } if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) { @@ -257,6 +258,22 @@ public class ServerEntity { } + // Purpur start + private boolean isUselessPacket(Packet possibleUselessPacket) { + if (possibleUselessPacket instanceof ClientboundMoveEntityPacket) { + ClientboundMoveEntityPacket packet = (ClientboundMoveEntityPacket) possibleUselessPacket; + if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.Pos) { + return packet.getXa() == 0 && packet.getYa() == 0 && packet.getZa() == 0; + } else if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.PosRot) { + return packet.getXa() == 0 && packet.getYa() == 0 && packet.getZa() == 0 && packet.getyRot() == 0 && packet.getxRot() == 0; + } else if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.Rot) { + return packet.getyRot() == 0 && packet.getxRot() == 0; + } + } + return false; + } + // Purpur end + public void removePairing(ServerPlayer player) { this.entity.stopSeenByPlayer(player); player.connection.send(new ClientboundRemoveEntityPacket(this.entity.getId())); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index 4e8f346cfe09b5806f53ae85729b3597b2e7c9eb..561c27bc5c23e3761018b8475ad1512d880418fc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -177,6 +177,11 @@ public class PurpurConfig { enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); } + public static boolean dontSendUselessEntityPackets = false; + private static void dontSendUselessEntityPackets() { + dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); + } + public static boolean loggerSuppressInitLegacyMaterialError = false; public static boolean loggerSuppressIgnoredAdvancementWarnings = false; private static void loggerSettings() {