0708fa363b
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance 989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving 2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
47 lines
2.6 KiB
Diff
47 lines
2.6 KiB
Diff
From 568f1455637b9a8c6eabd0f1bab621884689c23b 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 42c654a1d..e7ed6af9c 100644
|
|
--- a/src/main/java/net/minecraft/server/ServerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
|
|
@@ -39,6 +39,15 @@ public class ServerConnection {
|
|
public volatile boolean c;
|
|
private final List<ChannelFuture> f = Collections.synchronizedList(Lists.newArrayList());
|
|
private final List<NetworkManager> g = Collections.synchronizedList(Lists.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.g.addAll(pending); // Paper - OBFHELPER - List of network managers
|
|
+ pending.clear();
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
|
|
public ServerConnection(MinecraftServer minecraftserver) {
|
|
this.e = minecraftserver;
|
|
@@ -73,7 +82,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.g.add(networkmanager);
|
|
+ pending.add(networkmanager); // Paper
|
|
channel.pipeline().addLast("packet_handler", networkmanager);
|
|
networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.e, networkmanager));
|
|
}
|
|
@@ -102,6 +111,7 @@ public class ServerConnection {
|
|
|
|
synchronized (this.g) {
|
|
// 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.22.0
|
|
|