2020-05-06 11:48:49 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2016-05-17 05:21:26 +02:00
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 23:19:16 -0400
Subject: [PATCH] Avoid blocking on Network Manager creation
Per Paper issue 294
diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
2020-06-25 13:00:35 +02:00
index 6e7c5756a2338f5e901fff0e75fa42a494a2e8ee..7abb122943b8a5ce0e888d16d1592a127bb9bb6f 100644
2016-05-17 05:21:26 +02:00
--- a/src/main/java/net/minecraft/server/ServerConnection.java
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
2020-06-25 13:00:35 +02:00
@@ -38,6 +38,15 @@ public class ServerConnection {
2018-07-16 17:34:55 +02:00
public volatile boolean c;
2020-01-22 03:02:07 +01:00
private final List<ChannelFuture> listeningChannels = Collections.synchronizedList(Lists.newArrayList());
private final List<NetworkManager> connectedChannels = Collections.synchronizedList(Lists.newArrayList());
2016-05-17 05:21:26 +02:00
+ // Paper start - prevent blocking on adding a new network manager while the server is ticking
2020-03-14 12:20:50 +01:00
+ private final java.util.Queue<NetworkManager> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
2016-05-17 05:21:26 +02:00
+ private void addPending() {
2020-03-14 12:20:50 +01:00
+ NetworkManager manager = null;
+ while ((manager = pending.poll()) != null) {
+ connectedChannels.add(manager);
2016-05-17 05:21:26 +02:00
+ }
+ }
+ // Paper end
public ServerConnection(MinecraftServer minecraftserver) {
2018-07-16 17:34:55 +02:00
this.e = minecraftserver;
2020-06-25 13:00:35 +02:00
@@ -72,7 +81,7 @@ public class ServerConnection {
2018-07-19 20:14:27 +02:00
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));
2016-05-17 05:21:26 +02:00
NetworkManager networkmanager = new NetworkManager(EnumProtocolDirection.SERVERBOUND);
2020-01-22 03:02:07 +01:00
- ServerConnection.this.connectedChannels.add(networkmanager);
2016-05-17 05:21:26 +02:00
+ pending.add(networkmanager); // Paper
channel.pipeline().addLast("packet_handler", networkmanager);
2018-07-16 17:34:55 +02:00
networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.e, networkmanager));
2016-05-17 05:21:26 +02:00
}
2020-06-25 13:00:35 +02:00
@@ -111,6 +120,7 @@ public class ServerConnection {
2016-05-17 05:21:26 +02:00
2020-01-22 03:02:07 +01:00
synchronized (this.connectedChannels) {
2016-05-17 05:21:26 +02:00
// Spigot Start
2020-01-22 03:02:07 +01:00
+ this.addPending(); // Paper
2016-05-17 05:21:26 +02:00
// This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order
if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
{