aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch')
-rw-r--r--Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch
new file mode 100644
index 0000000000..2318b30dd6
--- /dev/null
+++ b/Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch
@@ -0,0 +1,47 @@
+From fe563a5eab9483cb69f2b7bfc2c750fafe263b50 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+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 6a71ebbd2..faf7b60af 100644
+--- a/src/main/java/net/minecraft/server/ServerConnection.java
++++ b/src/main/java/net/minecraft/server/ServerConnection.java
+@@ -60,6 +60,15 @@ 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) {
++ this.h.addAll(pending); // Paper - OBFHELPER - List of network managers
++ pending.clear();
++ }
++ }
++ // Paper end
+
+ public ServerConnection(MinecraftServer minecraftserver) {
+ this.f = minecraftserver;
+@@ -94,7 +103,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 +132,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.12.2.windows.2
+