Update B/CB/S

2018-07-23 09:39:55 +01:00
parent 6e3ef06255
commit aad194a32e
320 changed files with 790 additions and 882 deletions
--- a/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
@@ -0,0 +1,70 @@
+From 5932dddd728efb8aad079283e90ce638dfe95471 Mon Sep 17 00:00:00 2001
+From: vemacs <d@nkmem.es>
+Date: Wed, 23 Nov 2016 08:31:45 -0500
+Subject: [PATCH] Cache user authenticator threads
+
+
+diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
+index a22f4c55e9..b6e8296824 100644
+--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
+@@ -93,6 +93,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+ 
+     }
+ 
+    // Paper start - Cache authenticator threads
+    private static final AtomicInteger threadId = new AtomicInteger(0);
+    private static final java.util.concurrent.ExecutorService authenticatorPool = java.util.concurrent.Executors.newCachedThreadPool(
+            r -> new Thread(r, "User Authenticator #" + threadId.incrementAndGet())
+    );
+    // Paper end
+     // Spigot start
+     public void initUUID()
+     {
+@@ -169,8 +175,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+             this.networkManager.sendPacket(new PacketLoginOutEncryptionBegin("", this.server.G().getPublic(), this.e));
+         } else {
+             // Spigot start
+-            new Thread("User Authenticator #" + LoginListener.b.incrementAndGet()) {
+-
+            // Paper start - Cache authenticator threads
+            authenticatorPool.execute(new Runnable() {
+                 @Override
+                 public void run() {
+                     try {
+@@ -182,7 +188,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+                         server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + i.getName(), ex);
+                     }
+                 }
+-            }.start();
+            });
+            // Paper end
+             // Spigot end
+         }
+ 
+@@ -198,7 +205,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+             this.loginKey = packetlogininencryptionbegin.a(privatekey);
+             this.g = LoginListener.EnumProtocolState.AUTHENTICATING;
+             this.networkManager.a(this.loginKey);
+-            Thread thread = new Thread("User Authenticator #" + LoginListener.b.incrementAndGet()) {
+            // Paper start - Cache authenticator threads
+            authenticatorPool.execute(new Runnable() {
+                 public void run() {
+                     GameProfile gameprofile = LoginListener.this.i;
+ 
+@@ -245,10 +253,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+ 
+                     return LoginListener.this.server.U() && socketaddress instanceof InetSocketAddress ? ((InetSocketAddress) socketaddress).getAddress() : null;
+                 }
+-            };
+-
+-            thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(LoginListener.c));
+-            thread.start();
+            });
+            // Paper end
+         }
+     }
+ 
+-- 
+2.18.0
+