diff --git a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java index b8d0970f..df233a14 100644 --- a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java +++ b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java @@ -85,7 +85,10 @@ public class GuiCaptchaHandler implements Listener { private final List 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; + if (getServer().getPluginManager().getPlugin("floodgate") != null) { + return settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid); + } + return false; } diff --git a/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java b/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java index b73cb463..30939b70 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java @@ -19,7 +19,9 @@ public final class HooksSettings implements SettingsHolder { public static final Property BUNGEECORD = newProperty("Hooks.bungeecord", false); - @Comment("Allow FloodGatePlayer Join Without checkIsValidName()") + @Comment({"Allow FloodGatePlayer Join Without checkIsValidName()", + "This must be true if you want to use other bedrock features." + }) public static final Property HOOK_FLOODGATE_PLAYER = newProperty("Hooks.floodgate", false);