Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9267cd0

Browse files
committedJul 26, 2024·
more
1 parent c75d264 commit 9267cd0

2 files changed

+4
-4
lines changed
 

‎patches/server/0009-Optimize-Network-Manager-and-add-advanced-packet-sup.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Also avoids spamming closed channel exception by rechecking closed state in disp
2626
and then catch exceptions and close if they fire.
2727

2828
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
29-
index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..23e41a4eb4def6e29c16aef12481eee6b90e1539 100644
29+
index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..0d883b69367d1fe674a4cccc226d1d08d7e05c36 100644
3030
--- a/src/main/java/net/minecraft/server/NetworkManager.java
3131
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
3232
@@ -62,7 +62,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
@@ -161,7 +161,7 @@ index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..23e41a4eb4def6e29c16aef12481eee6
161161
+ // PandaSpigot end
162162
}
163163

164-
+ private void dispatchPacket(Packet<?> packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) { this.a(packet, agenericfuturelistener); } // PandaSpigot - OBFHELPER
164+
+ private void dispatchPacket(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) { this.a(packet, agenericfuturelistener); } // PandaSpigot - OBFHELPER
165165
private void a(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) {
166166
final EnumProtocol enumprotocol = EnumProtocol.a(packet);
167167
final EnumProtocol enumprotocol1 = (EnumProtocol) this.channel.attr(NetworkManager.c).get();

‎patches/server/0010-Allow-controlled-flushing-for-network-manager.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Only make one flush call when emptying the packet queue too.
88
This patch will be used to optimise out flush calls in later patches.
99

1010
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
11-
index 23e41a4eb4def6e29c16aef12481eee6b90e1539..19eebeae07105c10adc3c1df8c1ea119350be766 100644
11+
index 0d883b69367d1fe674a4cccc226d1d08d7e05c36..46a76611bde6897d5b09b25bc7ca88e7deff7421 100644
1212
--- a/src/main/java/net/minecraft/server/NetworkManager.java
1313
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
1414
@@ -80,6 +80,38 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
@@ -52,7 +52,7 @@ index 23e41a4eb4def6e29c16aef12481eee6b90e1539..19eebeae07105c10adc3c1df8c1ea119
5252
}
5353
@@ -223,6 +255,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
5454

55-
private void dispatchPacket(Packet<?> packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) { this.a(packet, agenericfuturelistener); } // PandaSpigot - OBFHELPER
55+
private void dispatchPacket(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) { this.a(packet, agenericfuturelistener); } // PandaSpigot - OBFHELPER
5656
private void a(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) {
5757
+ // PandaSpigot start - add flush parameter
5858
+ this.writePacket(packet, agenericfuturelistener, Boolean.TRUE);

0 commit comments

Comments
 (0)
Please sign in to comment.