SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.15.2 update (#2887)

Browse Source 
Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf
2020-01-21 18:02:07 -08:00
parent 5141569293
commit 9774f1ff47
519 changed files with 960 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch
View File

@@ -6,18 +6,18 @@ 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 bd5563577..e6fac155d 100644
index e7e216850..9cd7c9064 100644
--- a/src/main/java/net/minecraft/server/ServerConnection.java
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
@@ -0,0 +0,0 @@ public class ServerConnection {
public volatile boolean c;
private final List<ChannelFuture> f = Collections.synchronizedList(Lists.newArrayList());
private final List<NetworkManager> listeningChannels = Collections.synchronizedList(Lists.newArrayList());
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 List<NetworkManager> pending = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
+ private void addPending() {
+ synchronized (pending) {
+ this.listeningChannels.addAll(pending);
+ connectedChannels.addAll(pending);
+ pending.clear();
+ }
+ }
@@ -29,16 +29,16 @@ index bd5563577..e6fac155d 100644
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.listeningChannels.add(networkmanager);
- ServerConnection.this.connectedChannels.add(networkmanager);
+ pending.add(networkmanager); // Paper
channel.pipeline().addLast("packet_handler", networkmanager);
networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.e, networkmanager));
}
@@ -0,0 +0,0 @@ public class ServerConnection {
synchronized (this.listeningChannels) {
synchronized (this.connectedChannels) {
// Spigot Start
+ addPending(); // Paper
+ 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 )
{