Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup NetworkManager optimization patch #215

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Cleanup NetworkManager optimization patch #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c75d264
cleanup
uRyanxD Jul 26, 2024
9267cd0
more
uRyanxD Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions patches/server/0009-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Also avoids spamming closed channel exception by rechecking closed state in disp
and then catch exceptions and close if they fire.

diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..183414685a63990671212a01eb5aa79444c9e122 100644
index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..0d883b69367d1fe674a4cccc226d1d08d7e05c36 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -62,7 +62,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
Expand Down Expand Up @@ -161,7 +161,7 @@ index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..183414685a63990671212a01eb5aa794
+ // PandaSpigot end
}

+ private void dispatchPacket(Packet<?> packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) { this.a(packet, agenericfuturelistener); } // PandaSpigot - OBFHELPER
+ private void dispatchPacket(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) { this.a(packet, agenericfuturelistener); } // PandaSpigot - OBFHELPER
private void a(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) {
final EnumProtocol enumprotocol = EnumProtocol.a(packet);
final EnumProtocol enumprotocol1 = (EnumProtocol) this.channel.attr(NetworkManager.c).get();
Expand Down Expand Up @@ -280,7 +280,7 @@ index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..183414685a63990671212a01eb5aa794
+ return true;
}

+ Packet<?> packet = queued.getPacket();
+ Packet packet = queued.getPacket();
+ if (!packet.isReady()) {
+ return false;
+ } else {
Expand All @@ -302,7 +302,7 @@ index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..183414685a63990671212a01eb5aa794
+ public void clearPacketQueue() {
+ EntityPlayer player = getPlayer();
+ i.forEach(queuedPacket -> {
+ Packet<?> packet = queuedPacket.getPacket();
+ Packet packet = queuedPacket.getPacket();
+ if (packet.hasFinishListener()) {
+ packet.onPacketDispatchFinish(player, null);
+ }
Expand Down Expand Up @@ -342,7 +342,7 @@ index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..183414685a63990671212a01eb5aa794

- private final Packet a;
- private final GenericFutureListener<? extends Future<? super Void>>[] b;
+ private final Packet a; private final Packet<?> getPacket() { return this.a; } // PandaSpigot - OBFHELPER
+ private final Packet a; private final Packet getPacket() { return this.a; } // PandaSpigot - OBFHELPER
+ private final GenericFutureListener<? extends Future<? super Void>>[] b; private final GenericFutureListener<? extends Future<? super Void>>[] getGenericFutureListeners() { return this.b; } // PandaSpigot - OBFHELPER

public QueuedPacket(Packet packet, GenericFutureListener<? extends Future<? super Void>>... agenericfuturelistener) {
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0010-Allow-controlled-flushing-for-network-manager.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Only make one flush call when emptying the packet queue too.
This patch will be used to optimise out flush calls in later patches.

diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 183414685a63990671212a01eb5aa79444c9e122..e5673a5ed76949edc1e1c63c90b99a84e725dbc6 100644
index 0d883b69367d1fe674a4cccc226d1d08d7e05c36..46a76611bde6897d5b09b25bc7ca88e7deff7421 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -80,6 +80,38 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
Expand Down Expand Up @@ -52,7 +52,7 @@ index 183414685a63990671212a01eb5aa79444c9e122..e5673a5ed76949edc1e1c63c90b99a84
}
@@ -223,6 +255,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {

private void dispatchPacket(Packet<?> packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) { this.a(packet, agenericfuturelistener); } // PandaSpigot - OBFHELPER
private void dispatchPacket(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) { this.a(packet, agenericfuturelistener); } // PandaSpigot - OBFHELPER
private void a(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) {
+ // PandaSpigot start - add flush parameter
+ this.writePacket(packet, agenericfuturelistener, Boolean.TRUE);
Expand Down Expand Up @@ -102,7 +102,7 @@ index 183414685a63990671212a01eb5aa79444c9e122..e5673a5ed76949edc1e1c63c90b99a84
return true;
}

Packet<?> packet = queued.getPacket();
Packet packet = queued.getPacket();
if (!packet.isReady()) {
+ // PandaSpigot start - make only one flush call per sendPacketQueue() call
+ if (hasWrotePacket && (needsFlush || this.canFlush)) {
Expand Down
Loading