mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
b62dfa0bf9
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 Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
47 lines
2.6 KiB
Diff
47 lines
2.6 KiB
Diff
From 0e18207b7777c6f0c30703a5bf999b373c5e831e 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 9cff011dac..f04ce2fb03 100644
|
|
--- a/src/main/java/net/minecraft/server/ServerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
|
|
@@ -40,6 +40,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;
|
|
@@ -74,7 +83,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));
|
|
}
|
|
@@ -103,6 +112,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.19.0
|
|
|