61 lines
3.1 KiB
Diff
61 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Etil <81570777+etil2jz@users.noreply.github.com>
|
|
Date: Sun, 12 Dec 2021 22:06:06 +0100
|
|
Subject: [PATCH] Dont send useless entity packets
|
|
|
|
Original code by PurpurMC, licensed under MIT
|
|
You can find the original code on https://github.com/PurpurMC/Purpur
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
index e80176708db486190dd527e3ade5fc690ceb39f7..2d0c8d6f8677e289befde5ada4ae702eed73754d 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 (wtf.etil.mirai.MiraiConfig.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 ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
|
|
diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
|
|
index d6bc7e52e01bc6877fc96f0948dcbc192e64e2b0..01511376b5548468d63893bf8d69bae7f8f5f521 100644
|
|
--- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
|
|
+++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
|
|
@@ -206,6 +206,11 @@ public class MiraiConfig {
|
|
checkVehicleFlying = getBoolean("checks.vehicle-flight", checkVehicleFlying);
|
|
}
|
|
|
|
+ public static boolean dontSendUselessEntityPackets = true;
|
|
+ private static void dontSendUselessEntityPackets() {
|
|
+ dontSendUselessEntityPackets = getBoolean("dont-send-useless-entity-packets", dontSendUselessEntityPackets);
|
|
+ }
|
|
+
|
|
|
|
|
|
}
|
|
\ No newline at end of file
|