diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java index 28c05466..1b0ca5c5 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java @@ -8,14 +8,10 @@ import com.lenis0012.bukkit.loginsecurity.session.PlayerSession; import com.lenis0012.bukkit.loginsecurity.session.action.LoginAction; import com.lenis0012.bukkit.loginsecurity.session.action.RegisterAction; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import org.bukkit.Bukkit; import org.bukkit.entity.Player; /** - * GitHub: https://github.com/lenis0012/LoginSecurity-2 + * GitHub: https://github.com/lenis0012/LoginSecurity-2 *

* Project page: *

@@ -33,18 +29,9 @@ public class LoginSecurityHook implements AuthPlugin { @Override public boolean forceLogin(Player player) { - Future future = Bukkit.getScheduler().callSyncMethod(plugin, () -> { - PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player); - return session.isAuthorized() - || session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess(); - }); - - try { - return future.get(); - } catch (InterruptedException | ExecutionException ex) { - plugin.getLog().error("Failed to forceLogin player: {}", player, ex); - return false; - } + PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player); + return session.isAuthorized() + || session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess(); } @Override @@ -55,16 +42,7 @@ public class LoginSecurityHook implements AuthPlugin { @Override public boolean forceRegister(Player player, String password) { - Future future = Bukkit.getScheduler().callSyncMethod(plugin, () -> { - PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player); - return session.performAction(new RegisterAction(AuthService.PLUGIN, plugin, password)).isSuccess(); - }); - - try { - return future.get(); - } catch (InterruptedException | ExecutionException ex) { - plugin.getLog().error("Failed to forceLogin player: {}", player, ex); - return false; - } + PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player); + return session.performAction(new RegisterAction(AuthService.PLUGIN, plugin, password)).isSuccess(); } }