61 lines
3.0 KiB
Diff
61 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 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] (Purpur) Don't send useless entity packets
|
|
|
|
Original code by pl3xgaming, licensed under MIT
|
|
You can find the original code on https://github.com/pl3xgaming/Purpur
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
index c71bc00973899feec0ec5530bf3d237928810cf4..d175a41fd8c24813904019e25432c4a796db0b7b 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
@@ -190,6 +190,7 @@ public class ServerEntity {
|
|
this.teleportDelay = 0;
|
|
packet1 = new ClientboundTeleportEntityPacket(this.entity);
|
|
}
|
|
+ if (xyz.arthurb.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);
|
|
diff --git a/src/main/java/xyz/arthurb/mirai/MiraiConfig.java b/src/main/java/xyz/arthurb/mirai/MiraiConfig.java
|
|
index ca2aeb64b1ff8a52800fdf7279b7e2bc697472ea..696d94ebe10c16d482c8c9b072ad22f1b46db67f 100644
|
|
--- a/src/main/java/xyz/arthurb/mirai/MiraiConfig.java
|
|
+++ b/src/main/java/xyz/arthurb/mirai/MiraiConfig.java
|
|
@@ -204,5 +204,11 @@ public class MiraiConfig {
|
|
private static void protocolLib() {
|
|
fixProtocolLib = getBoolean("settings.fix-protocollib", fixProtocolLib);
|
|
}
|
|
+
|
|
+ public static boolean dontSendUselessEntityPackets = true;
|
|
+
|
|
+ private static void dontSendUselessEntityPackets() {
|
|
+ dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
|
|
+ }
|
|
|
|
}
|
|
\ No newline at end of file
|