2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Alfie Cleveland <alfeh@me.com>
|
|
|
|
Date: Fri, 25 Nov 2016 13:22:40 +0000
|
2021-06-12 08:24:50 +02:00
|
|
|
Subject: [PATCH] Cache user authenticator threads
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
2021-11-23 14:22:49 +01:00
|
|
|
index 4ae61a810c63a259490dde53e7bdb862ed4df5ad..58617412e4759fe6c1c975f352c0c8281b744de1 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
2021-06-12 08:24:50 +02:00
|
|
|
@@ -117,6 +117,18 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // 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(
|
2021-06-12 08:24:50 +02:00
|
|
|
+ r -> {
|
|
|
|
+ Thread ret = new Thread(r, "User Authenticator #" + threadId.incrementAndGet());
|
|
|
|
+
|
|
|
|
+ ret.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(LOGGER));
|
|
|
|
+
|
|
|
|
+ return ret;
|
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+ );
|
|
|
|
+ // Paper end
|
|
|
|
// Spigot start
|
|
|
|
public void initUUID()
|
|
|
|
{
|
2021-11-23 14:22:49 +01:00
|
|
|
@@ -210,8 +222,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
|
2021-06-11 14:02:28 +02:00
|
|
|
this.connection.send(new ClientboundHelloPacket("", this.server.getKeyPair().getPublic().getEncoded(), this.nonce));
|
|
|
|
} else {
|
|
|
|
// Spigot start
|
|
|
|
- new Thread("User Authenticator #" + ServerLoginPacketListenerImpl.UNIQUE_THREAD_ID.incrementAndGet()) {
|
|
|
|
-
|
|
|
|
+ // Paper start - Cache authenticator threads
|
|
|
|
+ authenticatorPool.execute(new Runnable() {
|
|
|
|
@Override
|
|
|
|
public void run() {
|
|
|
|
try {
|
2021-11-23 14:22:49 +01:00
|
|
|
@@ -222,7 +234,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
|
2021-06-12 08:24:50 +02:00
|
|
|
server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + ServerLoginPacketListenerImpl.this.gameProfile.getName(), ex);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
- }.start();
|
|
|
|
+ });
|
|
|
|
+ // Paper end
|
|
|
|
// Spigot end
|
|
|
|
}
|
|
|
|
|
2021-11-23 14:22:49 +01:00
|
|
|
@@ -251,7 +264,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
|
2021-06-11 14:02:28 +02:00
|
|
|
throw new IllegalStateException("Protocol error", cryptographyexception);
|
|
|
|
}
|
|
|
|
|
|
|
|
- Thread thread = new Thread("User Authenticator #" + ServerLoginPacketListenerImpl.UNIQUE_THREAD_ID.incrementAndGet()) {
|
|
|
|
+ // Paper start - Cache authenticator threads
|
|
|
|
+ authenticatorPool.execute(new Runnable() {
|
|
|
|
public void run() {
|
|
|
|
GameProfile gameprofile = ServerLoginPacketListenerImpl.this.gameProfile;
|
|
|
|
|
2021-11-23 14:22:49 +01:00
|
|
|
@@ -296,10 +310,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
return ServerLoginPacketListenerImpl.this.server.getPreventProxyConnections() && socketaddress instanceof InetSocketAddress ? ((InetSocketAddress) socketaddress).getAddress() : null;
|
|
|
|
}
|
|
|
|
- };
|
|
|
|
-
|
|
|
|
- thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(ServerLoginPacketListenerImpl.LOGGER));
|
|
|
|
- thread.start();
|
|
|
|
+ });
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
// Spigot start
|