mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-22 08:29:22 +00:00
Update 1.20.2 (#139)
This commit is contained in:
53
patches/server/0020-Dont-send-useless-entity-packets.patch
Normal file
53
patches/server/0020-Dont-send-useless-entity-packets.patch
Normal file
@@ -0,0 +1,53 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
||||
Date: Sun, 14 Aug 2022 00:00:51 +0800
|
||||
Subject: [PATCH] Dont send useless entity packets
|
||||
|
||||
This patch is Powered by Purpur(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 892a334d1b1c0784ed6838d1aa066403998b9a9f..c5bec163e5b9a389e278d7074faa006a5eeb8149 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
||||
@@ -191,6 +191,7 @@ public class ServerEntity {
|
||||
flag4 = true;
|
||||
flag5 = true;
|
||||
}
|
||||
+ // Leaves end - Better checking
|
||||
} else {
|
||||
this.wasOnGround = this.entity.onGround();
|
||||
this.teleportDelay = 0;
|
||||
@@ -198,6 +199,11 @@ public class ServerEntity {
|
||||
flag4 = true;
|
||||
flag5 = true;
|
||||
}
|
||||
+ // Leaves start - dont send useless entity packets
|
||||
+ if (top.leavesmc.leaves.LeavesConfig.dontSendUselessEntityPackets && isUselessPacket(packet1)) {
|
||||
+ packet1 = null;
|
||||
+ }
|
||||
+ // Leaves end - dont send useless entity packets
|
||||
}
|
||||
|
||||
if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
|
||||
@@ -270,6 +276,21 @@ public class ServerEntity {
|
||||
});
|
||||
}
|
||||
|
||||
+ // Leaves start - dont send useless entity packets
|
||||
+ private boolean isUselessPacket(Packet<?> possibleUselessPacket) {
|
||||
+ if (possibleUselessPacket instanceof ClientboundMoveEntityPacket packet) {
|
||||
+ 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;
|
||||
+ }
|
||||
+ // Leaves end - dont send useless entity packets
|
||||
+
|
||||
public void removePairing(ServerPlayer player) {
|
||||
this.entity.stopSeenByPlayer(player);
|
||||
player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
|
||||
Reference in New Issue
Block a user