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
|
2024-04-25 23:21:18 +02:00
|
|
|
index 7beda9a16addb2dbcd4bdc45e58b343e91323af5..d342d569eb93707bc683c3373ea88ae6b885a476 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
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -69,6 +69,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
|
|
|
// CraftBukkit end
|
2023-12-05 22:34:01 +01:00
|
|
|
private static final AtomicInteger UNIQUE_THREAD_ID = new AtomicInteger(0);
|
|
|
|
static final Logger LOGGER = LogUtils.getLogger();
|
|
|
|
+ private static final java.util.concurrent.ExecutorService authenticatorPool = java.util.concurrent.Executors.newCachedThreadPool(new com.google.common.util.concurrent.ThreadFactoryBuilder().setNameFormat("User Authenticator #%d").setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(LOGGER)).build()); // Paper - Cache authenticator threads
|
|
|
|
private static final int MAX_TICKS_BEFORE_LOGIN = 600;
|
|
|
|
private final byte[] challenge;
|
2024-04-24 03:25:14 +02:00
|
|
|
final MinecraftServer server;
|
|
|
|
@@ -167,7 +168,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
|
|
|
this.connection.send(new ClientboundHelloPacket("", this.server.getKeyPair().getPublic().getEncoded(), this.challenge, true));
|
2022-06-07 21:55:39 +02:00
|
|
|
} else {
|
2024-01-14 10:46:04 +01:00
|
|
|
// CraftBukkit start
|
|
|
|
- Thread thread = new Thread("User Authenticator #" + ServerLoginPacketListenerImpl.UNIQUE_THREAD_ID.incrementAndGet()) {
|
|
|
|
+ // Paper start - Cache authenticator threads
|
|
|
|
+ authenticatorPool.execute(new Runnable() {
|
|
|
|
|
2022-06-07 21:55:39 +02:00
|
|
|
@Override
|
|
|
|
public void run() {
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -182,10 +184,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
2023-10-27 01:34:58 +02:00
|
|
|
ServerLoginPacketListenerImpl.this.server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + ServerLoginPacketListenerImpl.this.requestedUsername, ex);
|
2022-06-07 21:55:39 +02:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
2024-01-14 10:46:04 +01:00
|
|
|
- };
|
|
|
|
-
|
|
|
|
- thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(ServerLoginPacketListenerImpl.LOGGER));
|
|
|
|
- thread.start();
|
|
|
|
+ });
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper end - Cache authenticator threads
|
2024-01-14 10:46:04 +01:00
|
|
|
// CraftBukkit end
|
2022-06-07 21:55:39 +02:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -264,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() {
|
2023-09-21 22:35:39 +02:00
|
|
|
String s1 = (String) Objects.requireNonNull(ServerLoginPacketListenerImpl.this.requestedUsername, "Player name not initialized");
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -312,10 +313,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();
|
|
|
|
+ });
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper end - Cache authenticator threads
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2024-01-14 10:46:04 +01:00
|
|
|
// CraftBukkit start
|