mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-20 09:35:39 +01:00
d22f9071ff
Fixes #294 Use a pending list to handle new connections so that the netty threads do not block waiting for the main thread to finish ticking
50 lines
2.7 KiB
Diff
50 lines
2.7 KiB
Diff
From 35daee4c95827a178f1f80c336d4e100f64fa91f Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 4ab28e6..08634c3 100644
|
|
--- a/src/main/java/net/minecraft/server/ServerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
|
|
@@ -60,6 +60,17 @@ public class ServerConnection {
|
|
public volatile boolean d;
|
|
private final List<ChannelFuture> g = Collections.synchronizedList(Lists.<ChannelFuture>newArrayList());
|
|
private final List<NetworkManager> h = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
|
|
+ // Paper start - prevent blocking on adding a new network manager while the server is ticking
|
|
+ private final List<NetworkManager> pending = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
|
|
+ private void addPending() {
|
|
+ synchronized (pending) {
|
|
+ synchronized (this.h) { // Paper // OBFHELPER - List of network managers
|
|
+ this.h.addAll(pending);
|
|
+ pending.clear();
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
|
|
public ServerConnection(MinecraftServer minecraftserver) {
|
|
this.f = minecraftserver;
|
|
@@ -94,7 +105,7 @@ 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);
|
|
|
|
- ServerConnection.this.h.add(networkmanager);
|
|
+ pending.add(networkmanager); // Paper
|
|
channel.pipeline().addLast("packet_handler", networkmanager);
|
|
networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.f, networkmanager));
|
|
}
|
|
@@ -123,6 +134,7 @@ public class ServerConnection {
|
|
|
|
synchronized (this.h) {
|
|
// Spigot Start
|
|
+ addPending(); // Paper
|
|
// 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 )
|
|
{
|
|
--
|
|
2.8.2
|
|
|