diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 32c28593..d5f631da 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -107,7 +107,7 @@ fr.xephi authme - 5.2-SNAPSHOT + 5.3.1 true 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 679e687d..bebd7ce4 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 @@ -2,10 +2,7 @@ package com.github.games647.fastlogin.bukkit.hooks; 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; @@ -20,58 +17,27 @@ import org.bukkit.entity.Player; */ public class AuthMeHook implements AuthPlugin { - private final boolean isNewAPIAvailable; - - public AuthMeHook() { - 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 - @SuppressWarnings("deprecation") public boolean forceLogin(Player player) { //skips registration and login - if (isNewAPIAvailable) { - if (NewAPI.getInstance().isAuthenticated(player)) { - return false; - } else { - NewAPI.getInstance().forceLogin(player); - } - } else if (!API.isAuthenticated(player)) { - API.forceLogin(player); + if (NewAPI.getInstance().isAuthenticated(player)) { + return false; + } else { + NewAPI.getInstance().forceLogin(player); } return true; } @Override - @SuppressWarnings("deprecation") public boolean isRegistered(String playerName) throws Exception { - if (isNewAPIAvailable) { - return NewAPI.getInstance().isRegistered(playerName); - } else { - return API.isRegistered(playerName); - } + return NewAPI.getInstance().isRegistered(playerName); } @Override - @SuppressWarnings("deprecation") public boolean forceRegister(Player player, String password) { - if (isNewAPIAvailable) { - //this automatically registers the player too - NewAPI.getInstance().forceRegister(player, password); - } else { - API.registerPlayer(player.getName(), password); - forceLogin(player); - } - + //this automatically registers the player too + NewAPI.getInstance().forceRegister(player, password); return true; } }