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-01-14 10:46:04 +01:00
|
|
|
index 55c15d942ddd230dec073039b7c5f95a14ff937c..d4e709b3e3df489d125ab20a98dc4b34bf61dcc9 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
|
2023-12-05 22:34:01 +01:00
|
|
|
@@ -49,6 +49,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
|
|
|
|
|
|
|
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 static final Component DISCONNECT_UNEXPECTED_QUERY = Component.translatable("multiplayer.disconnect.unexpected_query_response");
|
|
|
|
private final byte[] challenge;
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -140,7 +141,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
2022-12-07 19:52:24 +01:00
|
|
|
this.connection.send(new ClientboundHelloPacket("", this.server.getKeyPair().getPublic().getEncoded(), this.challenge));
|
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-01-14 10:46:04 +01:00
|
|
|
@@ -155,10 +157,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();
|
|
|
|
+ });
|
|
|
|
+ // Paper end
|
|
|
|
// CraftBukkit end
|
2022-06-07 21:55:39 +02:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -225,7 +225,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-01-14 10:46:04 +01:00
|
|
|
@@ -273,10 +274,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
|
|
|
|
}
|
|
|
|
|
2024-01-14 10:46:04 +01:00
|
|
|
// CraftBukkit start
|