prepare for b34

src/main/java/fr/xephi/authme/AuthMe.java

@@ -74,7 +74,7 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.6.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "33";
+    private static String pluginBuildNumber = "34";
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;

src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java

@@ -30,10 +30,10 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import javax.inject.Inject;
 import java.io.File;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
@@ -57,6 +57,7 @@ public class GuiCaptchaHandler implements Listener {
     @Inject
     private Settings settings;
 
+
     private PacketAdapter chatPacketListener;
     private PacketAdapter windowPacketListener;
 
@@ -64,30 +65,35 @@ public class GuiCaptchaHandler implements Listener {
     private int timesLeft = 3;
     //Use ConcurrentHashMap to store player and their close reason
     /* We used many async tasks so there is concurrent**/
-    public static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
+    public static HashMap<Player, String> closeReasonMap = new HashMap<>();
     //define randomStringSet
     String randomSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@#%&*()_+";
     String randomString = "";
     Random randomItemSet = new Random();
     Random howManyRandom = new Random();
+    private boolean isPacketListenersActive = false;
 
-
-    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;
     }
 
 
-    private void removePacketListeners() {
-        ProtocolLibrary.getProtocolManager().removePacketListener(windowPacketListener);
-        ProtocolLibrary.getProtocolManager().removePacketListener(chatPacketListener);
+    private void addPacketListeners() {
+        if (!isPacketListenersActive) {
+            ProtocolLibrary.getProtocolManager().addPacketListener(windowPacketListener);
+            ProtocolLibrary.getProtocolManager().addPacketListener(chatPacketListener);
+            isPacketListenersActive = true;
+        }
     }
 
+
     @EventHandler
     public void onInventoryClick(InventoryClickEvent event) {
         if (event.getWhoClicked() instanceof Player) {
@@ -113,115 +119,113 @@ public class GuiCaptchaHandler implements Listener {
         Player playerunreg = event.getPlayer();
         String name = playerunreg.getName();
         if (!authmeApi.isRegistered(name) && !isNpc(playerunreg)) {
-            String ip = getPlayerIp(playerunreg);
-            if (whiteList.isEmpty() || !whiteList.contains(authmeApi.getCountryCode(ip))) {
-                if (isBedrockPlayer(playerunreg.getUniqueId())) {
-                    closeReasonMap.put(playerunreg, "verified");
-                    messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK);
+            if (!whiteList.isEmpty()) {
+                String ip = getPlayerIp(playerunreg);
+                if (whiteList.contains(authmeApi.getCountryCode(ip)) && ip != null) {
                     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);
-                    }
-
-                    bukkitService.runTask(() -> {
-                        randomString = sb.toString();
-                        Random random_blockpos = new Random();
-                        AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(26));
-                        Inventory menu = Bukkit.createInventory(playerunreg, 27, messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_WINDOW_NAME, randomString));
-                        ItemStack item = new ItemStack(Material.REDSTONE_BLOCK);
-                        ItemMeta meta = item.getItemMeta();
-                        try {
-                            if (meta != null) {
-                                meta.setDisplayName(messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_CLICKABLE_NAME, randomString));
-                                item.setItemMeta(meta);
-                            }
-                        } catch (NullPointerException e) {
-                            getLogger().log(Level.WARNING, "Unexpected error occurred while setting item meta.");
-                        }
-                        menu.setItem(random_num.get(), item);
-                        playerunreg.openInventory(menu);
-                        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > 0) {
-                            long timeOut = settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT);
-                            if (settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > settings.getProperty(RestrictionSettings.TIMEOUT)) {
-                                bukkitService.runTask(() -> {
-                                    getLogger().warning("AuthMe detected that your GUI captcha timeout seconds(" + settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) + ") is bigger than the Login timeout seconds(" +
-                                        settings.getProperty(RestrictionSettings.TIMEOUT) + "). To prevent issues, we will let the GUI captcha follow the Login timeout seconds, please check and modify your config.");
-                                });
-                                timeOut = settings.getProperty(RestrictionSettings.TIMEOUT);
-                            }
-                            long finalTimeOut = timeOut;
-                            bukkitService.runTask(() -> {
-                                bukkitService.runTaskLater(() -> {
-                                    if (!closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
-                                        playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_TIMEOUT));
-                                        timesLeft = 3; // Reset the attempt counter
-                                    }
-                                }, finalTimeOut * 20L);
-                            });
-                        }
-
-                        bukkitService.runTask(() -> {
-                            windowPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
-                                @Override
-                                public void onPacketReceiving(PacketEvent event) {
-                                    if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
-                                        if (timesLeft <= 0) {
-                                            bukkitService.runTask(() -> {
-                                                playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_FAILED));
-                                            });
-                                            timesLeft = 3;
-                                        } else {
-                                            --timesLeft;
-                                            if (timesLeft <= 0) {
-                                                bukkitService.runTask(() -> {
-                                                    playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_FAILED));
-                                                });
-                                                timesLeft = 3;
-                                                return;
-                                            }
-                                            messages.send(playerunreg, MessageKey.GUI_CAPTCHA_RETRY_MESSAGE, String.valueOf(timesLeft));
-                                            event.setCancelled(true);
-                                            random_num.set(random_blockpos.nextInt(26));
-                                            bukkitService.runTask(() -> {
-                                                menu.clear();
-                                                menu.setItem(random_num.get(), item);
-                                                playerunreg.openInventory(menu);
-                                            });
-                                        }
-                                    }
-                                }
-                            };
-                            ProtocolLibrary.getProtocolManager().addPacketListener(windowPacketListener);
-                        });
-                        bukkitService.runTask(() -> {
-                            chatPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
-                                @Override
-                                public void onPacketReceiving(PacketEvent event) {
-                                    if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
-                                        messages.send(playerunreg, MessageKey.GUI_CAPTCHA_DENIED_MESSAGE);
-                                        event.setCancelled(true);
-                                    }
-                                }
-                            };
-                            ProtocolLibrary.getProtocolManager().addPacketListener(chatPacketListener);
-                        });
-                    });
-                });
             }
+            if (isBedrockPlayer(playerunreg.getUniqueId())) {
+                closeReasonMap.put(playerunreg, "verified");
+                messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK);
+                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);
+                }
+                bukkitService.runTask(() -> {
+                    randomString = sb.toString();
+                    Random random_blockpos = new Random();
+                    AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(26));
+                    Inventory menu = Bukkit.createInventory(playerunreg, 27, messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_WINDOW_NAME, randomString));
+                    ItemStack item = new ItemStack(Material.REDSTONE_BLOCK);
+                    ItemMeta meta = item.getItemMeta();
+                    try {
+                        if (meta != null) {
+                            meta.setDisplayName(messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_CLICKABLE_NAME, randomString));
+                            item.setItemMeta(meta);
+                        }
+                    } catch (NullPointerException e) {
+                        getLogger().log(Level.WARNING, "Unexpected error occurred while setting item meta.");
+                    }
+                    windowPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
+                        @Override
+                        public void onPacketReceiving(PacketEvent event) {
+                            if (!closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                if (timesLeft <= 0) {
+                                    bukkitService.runTask(() -> {
+                                        playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_FAILED));
+                                    });
+                                    timesLeft = 3;
+                                } else {
+                                    --timesLeft;
+                                    if (timesLeft <= 0) {
+                                        bukkitService.runTask(() -> {
+                                            playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_FAILED));
+                                        });
+                                        timesLeft = 3;
+                                        return;
+                                    }
+                                    messages.send(playerunreg, MessageKey.GUI_CAPTCHA_RETRY_MESSAGE, String.valueOf(timesLeft));
+                                    event.setCancelled(true);
+                                    random_num.set(random_blockpos.nextInt(26));
+                                    bukkitService.runTask(() -> {
+                                        menu.clear();
+                                        menu.setItem(random_num.get(), item);
+                                        playerunreg.openInventory(menu);
+                                    });
+                                }
+                            }
+                        }
+                    };
+                    chatPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
+                        @Override
+                        public void onPacketReceiving(PacketEvent event) {
+                            if (!closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                messages.send(playerunreg, MessageKey.GUI_CAPTCHA_DENIED_MESSAGE);
+                                event.setCancelled(true);
+                            }
+                        }
+                    };
+                    addPacketListeners();
+                    //Open captcha inventory
+                    menu.setItem(random_num.get(), item);
+                    playerunreg.openInventory(menu);
+                    if (settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > 0) {
+                        long timeOut = settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT);
+                        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > settings.getProperty(RestrictionSettings.TIMEOUT)) {
+                            bukkitService.runTask(() -> {
+                                getLogger().warning("AuthMe detected that your GUI captcha timeout seconds(" + settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) + ") is bigger than the Login timeout seconds(" +
+                                    settings.getProperty(RestrictionSettings.TIMEOUT) + "). To prevent issues, we will let the GUI captcha follow the Login timeout seconds, please check and modify your config.");
+                            });
+                            timeOut = settings.getProperty(RestrictionSettings.TIMEOUT);
+                        }
+                        long finalTimeOut = timeOut;
+                        bukkitService.runTask(() -> {
+                            bukkitService.runTaskLater(() -> {
+                                if (!closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                    playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_TIMEOUT));
+                                    timesLeft = 3; // Reset the attempt counter
+                                }
+                            }, finalTimeOut * 20L);
+                        });
+                    }
+                });
+            });
         }
     }
 
+
     private void deletePlayerData(UUID playerUUID) {
         // 获取服务器的存储文件夹路径
         File serverFolder = Bukkit.getServer().getWorldContainer();
@@ -268,7 +272,6 @@ public class GuiCaptchaHandler implements Listener {
         UUID playerUUID = event.getPlayer().getUniqueId();
         if (!authmeApi.isRegistered(name)) {
             if (settings.getProperty(SecuritySettings.DELETE_UNVERIFIED_PLAYER_DATA) && !closeReasonMap.containsKey(player)) {
-                closeReasonMap.remove(player);
                 bukkitService.runTaskLater(() -> {
                     if (!player.isOnline()) {
                         deletePlayerData(playerUUID);
@@ -276,10 +279,8 @@ public class GuiCaptchaHandler implements Listener {
                         deleteAuthMePlayerData(playerUUID);
                     }
                 }, 100L);
-                removePacketListeners();
                 return;
             }
-            removePacketListeners();
             closeReasonMap.remove(player);
         }
     }

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ authors: [${pluginDescription.authors}]
 website: http://github.com/HaHaWTH/AuthMeReReloaded/
 description: A fork of AuthMeReloaded that contains bug fixes
 main: ${pluginDescription.main}
-version: 5.6.0-FORK-b33
+version: 5.6.0-FORK-b34
 api-version: 1.13
 softdepend:
     - Vault