mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
48 lines
2.7 KiB
Diff
48 lines
2.7 KiB
Diff
From 9be9a1881c645f1dbcc4c2f5a13486f13b4544ca 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 e7e2168508..37a22ba6f7 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> listeningChannels = Collections.synchronizedList(Lists.newArrayList());
|
|
private final List<NetworkManager> connectedChannels = Collections.synchronizedList(Lists.newArrayList());
|
|
+ // Paper start - prevent blocking on adding a new network manager while the server is ticking
|
|
+ private final java.util.Queue<NetworkManager> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
|
|
+ private void addPending() {
|
|
+ NetworkManager manager = null;
|
|
+ while ((manager = pending.poll()) != null) {
|
|
+ connectedChannels.add(manager);
|
|
+ }
|
|
+ }
|
|
+ // 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.connectedChannels.add(networkmanager);
|
|
+ pending.add(networkmanager); // Paper
|
|
channel.pipeline().addLast("packet_handler", networkmanager);
|
|
networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.e, networkmanager));
|
|
}
|
|
@@ -112,6 +121,7 @@ public class ServerConnection {
|
|
|
|
synchronized (this.connectedChannels) {
|
|
// Spigot Start
|
|
+ this.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.25.1
|
|
|