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

Update to 1.12.2, May the Tacos be with you

Browse Source
This commit is contained in:
Shane Freeder
2017-09-18 12:04:01 +01:00
parent 9f7b45a945
commit 5ce5ef1c9f
35 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,13 +6,13 @@ 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 43421649..447d54d9 100644
index 567edb300..4a629aaa1 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 d;
private final List<ChannelFuture> g = Collections.synchronizedList(Lists.<ChannelFuture>newArrayList());
private final List<NetworkManager> h = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
private final List<ChannelFuture> g = Collections.synchronizedList(Lists.newArrayList());
private final List<NetworkManager> h = 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() {