diff --git a/pom.xml b/pom.xml index e0b1fa0b..08a7d77a 100644 --- a/pom.xml +++ b/pom.xml @@ -784,7 +784,13 @@ true - + + + + + + + diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 18755250..9ba8cc63 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -208,33 +208,38 @@ public class AuthMe extends JavaPlugin { purgeService.runAutoPurge(); // 注册玩家加入事件监听 // if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS) || settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)/* || settings.getProperty(SecuritySettings.GUI_CAPTCHA)*/) { - if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) { - getServer().getPluginManager().registerEvents(new DoubleLoginFixListener((Plugin) this), this); - } - if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND) || settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) { - getServer().getPluginManager().registerEvents(new LoginLocationFixListener((Plugin) this), this); - } - if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && getServer().getPluginManager().isPluginEnabled("floodgate")) { - getServer().getPluginManager().registerEvents(new BedrockAutoLoginListener((Plugin) this), this); - } - if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().isPluginEnabled("ProtocolLib")) { - getServer().getPluginManager().registerEvents(new GuiCaptchaHandler((Plugin) this), this); - logger.info("(Beta)GUICaptcha is enabled successfully!"); - logger.info("These features are still in early development, if you encountered any problem, please report."); - } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && !getServer().getPluginManager().isPluginEnabled("ProtocolLib")) { - logger.warning("ProtocolLib is not loaded, we can't enable GUI Captcha."); - } + register3rdPartyListeners(); logger.info("GitHub: https://github.com/HaHaWTH/AuthMeReReloaded/"); if (settings.getProperty(SecuritySettings.CHECK_FOR_UPDATES)) { checkForUpdates(); } - if (SHAEnabled){ + if (SHAEnabled) { //shaChecker(); } } + public File pluginfile = getFile(); + + private void register3rdPartyListeners() { + if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) { + getServer().getPluginManager().registerEvents(new DoubleLoginFixListener((Plugin) this), this); + } + if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND) || settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) { + getServer().getPluginManager().registerEvents(new LoginLocationFixListener((Plugin) this), this); + } + if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && getServer().getPluginManager().getPlugin("floodgate") != null) { + getServer().getPluginManager().registerEvents(new BedrockAutoLoginListener((Plugin) this), this); + } + if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") != null) { + getServer().getPluginManager().registerEvents(new GuiCaptchaHandler((Plugin) this), this); + logger.info("(Beta)GUICaptcha is enabled successfully!"); + logger.info("These features are still in early development, if you encountered any problem, please report."); + } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") == null) { + logger.warning("ProtocolLib is not loaded, can't enable GUI Captcha."); + } + } /** * Load the version and build number of the plugin from the description file. * diff --git a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java index 9d433c97..27bf3f8f 100644 --- a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java +++ b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java @@ -38,7 +38,6 @@ public class GuiCaptchaHandler implements Listener{ private final AuthMeApi authmeApi = AuthMeApi.getInstance(); private final Plugin plugin; private PacketAdapter chatPacketListener; - private PacketAdapter windowPacketListener; //define timesLeft private int timesLeft = 3;