Allow FastLogin to respect AuthMe pre IP register limit, fixes #458
This commit is contained in:
3 files changed
+45
-11
No files matched your search
@@ -3,15 +3,18 @@ package com.github.games647.fastlogin.bukkit.hook;
|
||||
import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
|
||||
import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
|
||||
import com.github.games647.fastlogin.core.hooks.AuthPlugin;
|
||||
|
||||
import fr.xephi.authme.api.v3.AuthMeApi;
|
||||
import fr.xephi.authme.events.RestoreSessionEvent;
|
||||
|
||||
import fr.xephi.authme.process.Management;
|
||||
import fr.xephi.authme.process.register.executors.ApiPasswordRegisterParams;
|
||||
import fr.xephi.authme.process.register.executors.RegistrationMethod;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
/**
|
||||
* GitHub: https://github.com/Xephi/AuthMeReloaded/
|
||||
* <p>
|
||||
@@ -25,8 +28,22 @@ public class AuthMeHook implements AuthPlugin<Player>, Listener {
|
||||
|
||||
private final FastLoginBukkit plugin;
|
||||
|
||||
private final AuthMeApi authmeAPI;
|
||||
private Management authmeManagement;
|
||||
|
||||
public AuthMeHook(FastLoginBukkit plugin) {
|
||||
this.plugin = plugin;
|
||||
this.authmeAPI = AuthMeApi.getInstance();
|
||||
|
||||
if (plugin.getConfig().getBoolean("respectIpLimit", false)) {
|
||||
try {
|
||||
Field managementField = this.authmeAPI.getClass().getDeclaredField("management");
|
||||
managementField.setAccessible(true);
|
||||
this.authmeManagement = (Management) managementField.get(this.authmeAPI);
|
||||
} catch (NoSuchFieldException | IllegalAccessException exception) {
|
||||
this.authmeManagement = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
@@ -41,25 +58,32 @@ public class AuthMeHook implements AuthPlugin<Player>, Listener {
|
||||
|
||||
@Override
|
||||
public boolean forceLogin(Player player) {
|
||||
if (AuthMeApi.getInstance().isAuthenticated(player)) {
|
||||
if (authmeAPI.isAuthenticated(player)) {
|
||||
plugin.getLog().warn(ALREADY_AUTHENTICATED, player);
|
||||
return false;
|
||||
}
|
||||
|
||||
//skips registration and login
|
||||
AuthMeApi.getInstance().forceLogin(player);
|
||||
authmeAPI.forceLogin(player);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRegistered(String playerName) {
|
||||
return AuthMeApi.getInstance().isRegistered(playerName);
|
||||
return authmeAPI.isRegistered(playerName);
|
||||
}
|
||||
|
||||
@Override
|
||||
//this automatically login the player too
|
||||
public boolean forceRegister(Player player, String password) {
|
||||
//this automatically login the player too
|
||||
AuthMeApi.getInstance().forceRegister(player, password);
|
||||
return true;
|
||||
//if we have the management - we can trigger register with IP limit checks
|
||||
if (authmeManagement != null) {
|
||||
authmeManagement.performRegister(RegistrationMethod.PASSWORD_REGISTRATION,
|
||||
ApiPasswordRegisterParams.of(player, password, true));
|
||||
} else {
|
||||
authmeAPI.forceRegister(player, password);
|
||||
}
|
||||
|
||||
return authmeAPI.isRegistered(player.getName());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user