Fixed CrazyLogin hook

This commit is contained in:
games647
2016-05-22 18:34:21 +02:00
parent 2838c06ab3
commit 87aa9dd668

View File

@ -9,6 +9,7 @@ import com.github.games647.fastlogin.bukkit.commands.CrackedCommand;
import com.github.games647.fastlogin.bukkit.commands.PremiumCommand; import com.github.games647.fastlogin.bukkit.commands.PremiumCommand;
import com.github.games647.fastlogin.bukkit.hooks.AuthMeHook; import com.github.games647.fastlogin.bukkit.hooks.AuthMeHook;
import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin; import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin;
import com.github.games647.fastlogin.bukkit.hooks.CrazyLoginHook;
import com.github.games647.fastlogin.bukkit.hooks.LogItHook; import com.github.games647.fastlogin.bukkit.hooks.LogItHook;
import com.github.games647.fastlogin.bukkit.hooks.LoginSecurityHook; import com.github.games647.fastlogin.bukkit.hooks.LoginSecurityHook;
import com.github.games647.fastlogin.bukkit.hooks.UltraAuthHook; import com.github.games647.fastlogin.bukkit.hooks.UltraAuthHook;
@ -20,7 +21,6 @@ import com.github.games647.fastlogin.bukkit.listener.ProtocolSupportListener;
import com.github.games647.fastlogin.bukkit.listener.StartPacketListener; import com.github.games647.fastlogin.bukkit.listener.StartPacketListener;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import de.st_ddt.crazylogin.CrazyLogin;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.security.KeyPair; import java.security.KeyPair;
@ -230,15 +230,15 @@ public class FastLoginBukkit extends JavaPlugin {
private boolean registerHooks() { private boolean registerHooks() {
BukkitAuthPlugin authPluginHook = null; BukkitAuthPlugin authPluginHook = null;
try { try {
List<Class<?>> supportedHooks = Lists.newArrayList(AuthMeHook.class, CrazyLogin.class List<Class<? extends BukkitAuthPlugin>> supportedHooks = Lists.newArrayList(AuthMeHook.class
, LogItHook.class, LoginSecurityHook.class, UltraAuthHook.class, xAuthHook.class); , CrazyLoginHook.class, LogItHook.class, LoginSecurityHook.class, UltraAuthHook.class
for (Class<?> clazz : supportedHooks) { , xAuthHook.class);
for (Class<? extends BukkitAuthPlugin> clazz : supportedHooks) {
String pluginName = clazz.getSimpleName().replace("Hook", ""); String pluginName = clazz.getSimpleName().replace("Hook", "");
//uses only member classes which uses AuthPlugin interface (skip interfaces) //uses only member classes which uses AuthPlugin interface (skip interfaces)
if (BukkitAuthPlugin.class.isAssignableFrom(clazz) if (getServer().getPluginManager().isPluginEnabled(pluginName)) {
//check only for enabled plugins. A single plugin could be disabled by plugin managers //check only for enabled plugins. A single plugin could be disabled by plugin managers
&& getServer().getPluginManager().isPluginEnabled(pluginName)) { authPluginHook = clazz.newInstance();
authPluginHook = (BukkitAuthPlugin) clazz.newInstance();
getLogger().log(Level.INFO, "Hooking into auth plugin: {0}", pluginName); getLogger().log(Level.INFO, "Hooking into auth plugin: {0}", pluginName);
break; break;
} }