From 772103d81dc91dc688b12daf8849ce255b1fd8e7 Mon Sep 17 00:00:00 2001 From: HaHaWTH Date: Tue, 26 Mar 2024 23:52:22 +0800 Subject: [PATCH] Fix BedrockAutoLogin --- .../authme/listener/BedrockAutoLoginListener.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java b/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java index 16f2f5ea..52d39daa 100644 --- a/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java +++ b/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java @@ -3,7 +3,6 @@ package fr.xephi.authme.listener; import fr.xephi.authme.AuthMe; import fr.xephi.authme.api.v3.AuthMeApi; -import fr.xephi.authme.events.RestoreSessionEvent; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; import fr.xephi.authme.service.BukkitService; @@ -40,7 +39,7 @@ public class BedrockAutoLoginListener implements Listener { return settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null; } - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); String name = event.getPlayer().getName(); @@ -50,13 +49,4 @@ public class BedrockAutoLoginListener implements Listener { messages.send(player, MessageKey.BEDROCK_AUTO_LOGGED_IN); } } - - @EventHandler(priority = EventPriority.HIGHEST) - public void onPlayerAuthMeSessionRestore(RestoreSessionEvent event) { - Player player = event.getPlayer(); - UUID uuid = player.getUniqueId(); - if (isBedrockPlayer(uuid)) { - event.setCancelled(true); - } - } }