Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-24 09:58:00 +01:00
Code Issues Projects Releases Wiki Activity

Move another NetworkManager util into the inner class (#3303)

Browse Source 
Those poor souls running outdated ProtocolLib.
This commit is contained in:
Spottedleaf 2020-05-06 08:07:51 -07:00 committed by GitHub
parent 841c7d1879
commit fa87db6b91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/0346-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
View File

@ -23,7 +23,7 @@ This should solve some deadlock risks
Part of this commit was authored by: Spottedleaf Part of this commit was authored by: Spottedleaf
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index b1dededc15cce686ead74a99bee64c89ac1de22c..b529c8882491bad278570f322e8a13cfc3588e6c 100644 index b1dededc15cce686ead74a99bee64c89ac1de22c..f81014973a4cf50c1320f82c22ed1c19fd7d6ac9 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java --- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -64,6 +64,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> { @@ -64,6 +64,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -70,6 +70,14 @@ index b1dededc15cce686ead74a99bee64c89ac1de22c..b529c8882491bad278570f322e8a13cf
+ } + }
+ } + }
+ } + }
+ // Paper start
+ private static boolean canSendImmediate(NetworkManager networkManager, Packet<?> packet) {
+ return networkManager.isPending || networkManager.protocol == EnumProtocol.HANDSHAKING || networkManager.protocol == EnumProtocol.STATUS || networkManager.queueImmunity ||
+ packet instanceof PacketPlayOutKeepAlive ||
+ packet instanceof PacketPlayOutChat ||
+ packet instanceof PacketPlayOutTabComplete;
+ }
+ // Paper end
+ } + }
+ // Paper end + // Paper end
@ -77,14 +85,6 @@ index b1dededc15cce686ead74a99bee64c89ac1de22c..b529c8882491bad278570f322e8a13cf
this.sendPacket(packet, (GenericFutureListener) null); this.sendPacket(packet, (GenericFutureListener) null);
} }
+ // Paper start
+ private boolean canSendImmediate(Packet<?> packet) {
+ return isPending || protocol == EnumProtocol.HANDSHAKING || protocol == EnumProtocol.STATUS || queueImmunity ||
+ packet instanceof PacketPlayOutKeepAlive ||
+ packet instanceof PacketPlayOutChat ||
+ packet instanceof PacketPlayOutTabComplete;
+ }
+ // Paper end
public void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) { public void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
- if (this.isConnected()) { - if (this.isConnected()) {
- this.o(); - this.o();
@ -94,7 +94,7 @@ index b1dededc15cce686ead74a99bee64c89ac1de22c..b529c8882491bad278570f322e8a13cf
+ // Paper start - handle oversized packets better + // Paper start - handle oversized packets better
+ boolean connected = this.isConnected(); + boolean connected = this.isConnected();
+ if (!connected && !preparing) return; // Do nothing + if (!connected && !preparing) return; // Do nothing
+ if (connected && (canSendImmediate(packet) || ( + if (connected && (InnerUtil.canSendImmediate(this, packet) || (
+ MCUtil.isMainThread() && packet.isReady() && this.packetQueue.isEmpty() && + MCUtil.isMainThread() && packet.isReady() && this.packetQueue.isEmpty() &&
+ (packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty()) + (packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty())
+ ))) { + ))) {