From 5975f8d83850de3883e0d3e46a3f15c02ffe273a Mon Sep 17 00:00:00 2001
From: themode <themode@outlook.fr>
Date: Mon, 28 Dec 2020 00:18:25 +0100
Subject: [PATCH] Stop creating a thread for each auth request

---
 .../login/EncryptionResponsePacket.java       | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java b/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java
index 2c219e166..7b17b4b5f 100644
--- a/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java
+++ b/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java
@@ -15,12 +15,10 @@ import org.jetbrains.annotations.NotNull;
 import javax.crypto.SecretKey;
 import java.math.BigInteger;
 import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.CompletableFuture;
 
 public class EncryptionResponsePacket implements ClientPreplayPacket {
 
-    private final static String THREAD_NAME = "Mojang Auth Thread";
-    private static final AtomicInteger UNIQUE_THREAD_ID = new AtomicInteger(0);
     private byte[] sharedSecret;
     private byte[] verifyToken;
 
@@ -33,38 +31,35 @@ public class EncryptionResponsePacket implements ClientPreplayPacket {
         }
         final NettyPlayerConnection nettyConnection = (NettyPlayerConnection) connection;
 
-        new Thread(THREAD_NAME + " #" + UNIQUE_THREAD_ID.incrementAndGet()) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                final String loginUsername = nettyConnection.getLoginUsername();
+                if (!Arrays.equals(nettyConnection.getNonce(), getNonce())) {
+                    MinecraftServer.LOGGER.error("{} tried to login with an invalid nonce!", loginUsername);
+                    return;
+                }
+                if (!loginUsername.isEmpty()) {
 
-            public void run() {
-                try {
-                    final String loginUsername = nettyConnection.getLoginUsername();
-                    if (!Arrays.equals(nettyConnection.getNonce(), getNonce())) {
-                        MinecraftServer.LOGGER.error("{} tried to login with an invalid nonce!", loginUsername);
+                    final byte[] digestedData = MojangCrypt.digestData("", MojangAuth.getKeyPair().getPublic(), getSecretKey());
+
+                    if (digestedData == null) {
+                        // Incorrect key, probably because of the client
+                        MinecraftServer.LOGGER.error("Connection {} failed initializing encryption.", nettyConnection.getRemoteAddress());
+                        connection.disconnect();
                         return;
                     }
-                    if (!loginUsername.isEmpty()) {
 
-                        final byte[] digestedData = MojangCrypt.digestData("", MojangAuth.getKeyPair().getPublic(), getSecretKey());
+                    final String string3 = new BigInteger(digestedData).toString(16);
+                    final GameProfile gameProfile = MojangAuth.getSessionService().hasJoinedServer(new GameProfile(null, loginUsername), string3);
+                    nettyConnection.setEncryptionKey(getSecretKey());
 
-                        if (digestedData == null) {
-                            // Incorrect key, probably because of the client
-                            MinecraftServer.LOGGER.error("Connection {} failed initializing encryption.", nettyConnection.getRemoteAddress());
-                            connection.disconnect();
-                            return;
-                        }
-
-                        final String string3 = new BigInteger(digestedData).toString(16);
-                        final GameProfile gameProfile = MojangAuth.getSessionService().hasJoinedServer(new GameProfile(null, loginUsername), string3);
-                        nettyConnection.setEncryptionKey(getSecretKey());
-
-                        MinecraftServer.LOGGER.info("UUID of player {} is {}", loginUsername, gameProfile.getId());
-                        CONNECTION_MANAGER.startPlayState(connection, gameProfile.getId(), gameProfile.getName());
-                    }
-                } catch (AuthenticationUnavailableException e) {
-                    e.printStackTrace();
+                    MinecraftServer.LOGGER.info("UUID of player {} is {}", loginUsername, gameProfile.getId());
+                    CONNECTION_MANAGER.startPlayState(connection, gameProfile.getId(), gameProfile.getName());
                 }
+            } catch (AuthenticationUnavailableException e) {
+                e.printStackTrace();
             }
-        }.start();
+        });
     }
 
     @Override