From 6b5e0b82ba5898ab15a7b383ce0004f9dfcb5f03 Mon Sep 17 00:00:00 2001
From: HaHaWTH <id_cn00@outlook.com>
Date: Thu, 23 Nov 2023 22:19:23 +0800
Subject: [PATCH] Code improvement

---
 .../authme/listener/GuiCaptchaHandler.java    | 50 ++++++++++++++-----
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
index a6739305..4b88be03 100644
--- a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
+++ b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
@@ -23,6 +23,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -45,6 +46,7 @@ import static org.bukkit.Bukkit.getServer;
 public class GuiCaptchaHandler implements Listener {
     //define AuthMeApi
     private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+    StringBuilder sb = new StringBuilder();
     @Inject
     private BukkitService bukkitService;
     @Inject
@@ -72,12 +74,13 @@ public class GuiCaptchaHandler implements Listener {
     Random howManyRandom = new Random();
 
 
-    int howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+    int howLongIsRandomString;
 
     public GuiCaptchaHandler() {
     }
 
     protected List<String> whiteList = AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_COUNTRY_WHITELIST);
+
     private boolean isBedrockPlayer(UUID uuid) {
         return settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null;
     }
@@ -88,6 +91,27 @@ public class GuiCaptchaHandler implements Listener {
         ProtocolLibrary.getProtocolManager().removePacketListener(chatPacketListener);
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        bukkitService.runTaskAsynchronously(() -> {
+            randomString = "";
+            howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+            sb = new StringBuilder();
+
+            for (int i = 0; i < howLongIsRandomString; i++) {
+                //生成随机索引号
+                int index = randomItemSet.nextInt(randomSet.length());
+
+                // 从字符串中获取由索引 index 指定的字符
+                char randomChar = randomSet.charAt(index);
+
+                // 将字符追加到字符串生成器
+                sb.append(randomChar);
+            }
+
+        });
+    }
+
     @EventHandler
     public void onInventoryClick(InventoryClickEvent event) {
         if (event.getWhoClicked() instanceof Player) {
@@ -121,18 +145,18 @@ public class GuiCaptchaHandler implements Listener {
                     return;
                 }
                 bukkitService.runTaskAsynchronously(() -> {
-                    StringBuilder sb = new StringBuilder();
-                    howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
-                    for (int i = 0; i < howLongIsRandomString; i++) {
-                        //生成随机索引号
-                        int index = randomItemSet.nextInt(randomSet.length());
-
-                        // 从字符串中获取由索引 index 指定的字符
-                        char randomChar = randomSet.charAt(index);
-
-                        // 将字符追加到字符串生成器
-                        sb.append(randomChar);
-                    }
+//                    StringBuilder sb = new StringBuilder();
+//                    howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+//                    for (int i = 0; i < howLongIsRandomString; i++) {
+//                        //生成随机索引号
+//                        int index = randomItemSet.nextInt(randomSet.length());
+//
+//                        // 从字符串中获取由索引 index 指定的字符
+//                        char randomChar = randomSet.charAt(index);
+//
+//                        // 将字符追加到字符串生成器
+//                        sb.append(randomChar);
+//                    }
 
                     bukkitService.runTask(() -> {
                         randomString = sb.toString();