This commit is contained in:
HaHaWTH 2023-11-27 22:14:55 +08:00
parent 6d7c928197
commit 2734c3e58e

View File

@ -125,12 +125,16 @@ public class GuiCaptchaHandler implements Listener {
if (!whiteList.isEmpty()) { if (!whiteList.isEmpty()) {
String ip = getPlayerIp(playerunreg); String ip = getPlayerIp(playerunreg);
if (whiteList.contains(authmeApi.getCountryCode(ip)) && ip != null) { if (whiteList.contains(authmeApi.getCountryCode(ip)) && ip != null) {
closeReasonMap.put(playerunreg, "whiteListed"); if (!closeReasonMap.containsKey(playerunreg)) {
closeReasonMap.put(playerunreg, "verified:whitelist");
}
return; return;
} }
} }
if (isBedrockPlayer(playerunreg.getUniqueId())) { if (isBedrockPlayer(playerunreg.getUniqueId())) {
closeReasonMap.put(playerunreg, "bedrock"); if (!closeReasonMap.containsKey(playerunreg)) {
closeReasonMap.put(playerunreg, "verified:bedrock");
}
messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK); messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK);
return; return;
} }
@ -236,7 +240,7 @@ public class GuiCaptchaHandler implements Listener {
public void onPlayerAuthMeLogin(LoginEvent event) { public void onPlayerAuthMeLogin(LoginEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (!closeReasonMap.containsKey(player)) { if (!closeReasonMap.containsKey(player)) {
closeReasonMap.put(player, "loggedButUnregistered"); closeReasonMap.put(player, "verified:loggedIn");
} }
} }