This commit is contained in:
HaHaWTH 2023-11-27 15:56:24 +08:00
parent b4df964d79
commit 6d7c928197

View File

@ -106,7 +106,9 @@ public class GuiCaptchaHandler implements Listener {
} }
if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)) { if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)) {
event.setCancelled(true); event.setCancelled(true);
closeReasonMap.put(player, "verified"); if (!closeReasonMap.containsKey(player)) {
closeReasonMap.put(player, "verified");
}
player.closeInventory(); player.closeInventory();
messages.send(player, MessageKey.GUI_CAPTCHA_VERIFIED); messages.send(player, MessageKey.GUI_CAPTCHA_VERIFIED);
} }
@ -123,12 +125,12 @@ 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, "verified"); closeReasonMap.put(playerunreg, "whiteListed");
return; return;
} }
} }
if (isBedrockPlayer(playerunreg.getUniqueId())) { if (isBedrockPlayer(playerunreg.getUniqueId())) {
closeReasonMap.put(playerunreg, "verified"); closeReasonMap.put(playerunreg, "bedrock");
messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK); messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK);
return; return;
} }
@ -229,6 +231,15 @@ public class GuiCaptchaHandler implements Listener {
} }
} }
//This prevents players from unregistering by Admins
@EventHandler
public void onPlayerAuthMeLogin(LoginEvent event) {
Player player = event.getPlayer();
if (!closeReasonMap.containsKey(player)) {
closeReasonMap.put(player, "loggedButUnregistered");
}
}
private void deletePlayerData(UUID playerUUID) { private void deletePlayerData(UUID playerUUID) {
// 获取服务器的存储文件夹路径 // 获取服务器的存储文件夹路径
@ -269,16 +280,6 @@ public class GuiCaptchaHandler implements Listener {
} }
} }
//This prevents players from unregistering by Admins
@EventHandler
public void onPlayerAuthMeLogin(LoginEvent event) {
Player player = event.getPlayer();
if (!closeReasonMap.containsKey(player)) {
closeReasonMap.put(player, "verified");
}
}
@EventHandler @EventHandler
public void onPlayerQuit(PlayerQuitEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();