Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-06 23:52:31 +01:00
Code Issues Projects Releases Wiki Activity

Avoid adding NetworkManager twice

Browse Source 
The removal of `ServerConnection.this.h.add(networkmanager);` got
lost in the 1.13 update, causing network managers to be registered
twice.

Fixes "handleDisconnection() called twice" warning spam in console.
This commit is contained in:
Minecrell 2018-07-19 20:14:27 +02:00
parent 9a1643dab4
commit 391324437a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
Per Paper issue 294 Per Paper issue 294
diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
index be8d07f41..ad49673c1 100644 index be8d07f41..9808561eb 100644
--- a/src/main/java/net/minecraft/server/ServerConnection.java --- a/src/main/java/net/minecraft/server/ServerConnection.java
+++ b/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java
@@ -0,0 +0,0 @@ public class ServerConnection { @@ -0,0 +0,0 @@ public class ServerConnection {
@ -26,9 +26,10 @@ index be8d07f41..ad49673c1 100644
public ServerConnection(MinecraftServer minecraftserver) { public ServerConnection(MinecraftServer minecraftserver) {
this.e = minecraftserver; this.e = minecraftserver;
@@ -0,0 +0,0 @@ public class ServerConnection { @@ -0,0 +0,0 @@ public class ServerConnection {
channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new LegacyPingHandler(ServerConnection.this)).addLast("splitter", new PacketSplitter()).addLast("decoder", new PacketDecoder(EnumProtocolDirection.SERVERBOUND)).addLast("prepender", new PacketPrepender()).addLast("encoder", new PacketEncoder(EnumProtocolDirection.CLIENTBOUND));
NetworkManager networkmanager = new NetworkManager(EnumProtocolDirection.SERVERBOUND); NetworkManager networkmanager = new NetworkManager(EnumProtocolDirection.SERVERBOUND);
ServerConnection.this.g.add(networkmanager); - ServerConnection.this.g.add(networkmanager);
+ pending.add(networkmanager); // Paper + pending.add(networkmanager); // Paper
channel.pipeline().addLast("packet_handler", networkmanager); channel.pipeline().addLast("packet_handler", networkmanager);
networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.e, networkmanager)); networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.e, networkmanager));