diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java index b1ba697a..679e687d 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java @@ -1,18 +1,21 @@ package com.github.games647.fastlogin.bukkit.hooks; -import com.avaje.ebeaninternal.api.ClassUtil; import com.github.games647.fastlogin.core.hooks.AuthPlugin; import fr.xephi.authme.api.API; import fr.xephi.authme.api.NewAPI; +import java.util.logging.Level; +import java.util.logging.Logger; import org.bukkit.entity.Player; /** * Github: https://github.com/Xephi/AuthMeReloaded/ + * * Project page: * * Bukkit: http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ + * * Spigot: https://www.spigotmc.org/resources/authme-reloaded.6269/ */ public class AuthMeHook implements AuthPlugin { @@ -20,7 +23,15 @@ public class AuthMeHook implements AuthPlugin { private final boolean isNewAPIAvailable; public AuthMeHook() { - this.isNewAPIAvailable = ClassUtil.isPresent("fr.​xephi.​authme.​api.NewAPI"); + boolean apiAvailable = false; + try { + Class.forName("fr.xephi.authme.api.NewAPI"); + apiAvailable = true; + } catch (ClassNotFoundException ex) { + Logger.getLogger(AuthMeHook.class.getName()).log(Level.SEVERE, null, ex); + } + + this.isNewAPIAvailable = apiAvailable; } @Override @@ -28,13 +39,15 @@ public class AuthMeHook implements AuthPlugin { public boolean forceLogin(Player player) { //skips registration and login if (isNewAPIAvailable) { - if (!NewAPI.getInstance().isAuthenticated(player)) { + if (NewAPI.getInstance().isAuthenticated(player)) { + return false; + } else { NewAPI.getInstance().forceLogin(player); } } else if (!API.isAuthenticated(player)) { API.forceLogin(player); } - + return true; } diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java index d81010b4..c6eb8d48 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java @@ -18,6 +18,7 @@ import ultraauth.managers.PlayerManager; * Project page: * * Bukkit: http://dev.bukkit.org/bukkit-plugins/ultraauth-aa/ + * * Spigot: https://www.spigotmc.org/resources/ultraauth.17044/ */ public class UltraAuthHook implements AuthPlugin { diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginMangement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginMangement.java index e77ed355..99860fa0 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginMangement.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginMangement.java @@ -52,7 +52,6 @@ public abstract class ForceLoginMangement