TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-30 10:47:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move autoLoginFloodgate check to a common function

Browse Source 
Reduces duplicate code.
Added missing check for "no-conflict".
This commit is contained in:
Smart123s
2022-02-25 18:00:21 +01:00
parent 033fdd55ae
commit 817eedd4ac
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
View File

@ -49,8 +49,7 @@ public class FloodgateAuthTask extends FloodgateManagement<Player, CommandSender
BukkitLoginSession session = new BukkitLoginSession(player.getName(), isRegistered, profile); BukkitLoginSession session = new BukkitLoginSession(player.getName(), isRegistered, profile);
// enable auto login based on the value of 'autoLoginFloodgate' in config.yml // enable auto login based on the value of 'autoLoginFloodgate' in config.yml
session.setVerified(autoLoginFloodgate.equals("true") session.setVerified(isAutoLoginAllowed());
|| (autoLoginFloodgate.equals("linked") && isLinked));
// run login task // run login task
Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, session); Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, session);

6
bungee/src/main/java/com/github/games647/fastlogin/bungee/task/FloodgateAuthTask.java
View File

@ -55,13 +55,9 @@ public class FloodgateAuthTask
BungeeLoginSession session = new BungeeLoginSession(player.getName(), isRegistered, profile); BungeeLoginSession session = new BungeeLoginSession(player.getName(), isRegistered, profile);
core.getPlugin().getSession().put(player.getPendingConnection(), session); core.getPlugin().getSession().put(player.getPendingConnection(), session);
// enable auto login based on the value of 'autoLoginFloodgate' in config.yml
boolean forcedOnlineMode = autoLoginFloodgate.equals("true")
|| (autoLoginFloodgate.equals("linked") && isLinked);
// run login task // run login task
Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, server, session, Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, server, session,
forcedOnlineMode); isAutoLoginAllowed());
core.getPlugin().getScheduler().runAsync(forceLoginTask); core.getPlugin().getScheduler().runAsync(forceLoginTask);
} }

11
core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java
View File

@ -145,6 +145,17 @@ public abstract class FloodgateManagement<P extends C, C, L extends LoginSession
|| ("linked".equals(autoRegisterFloodgate) && isLinked); || ("linked".equals(autoRegisterFloodgate) && isLinked);
} }
/**
* Decide if the player can be auto logged in.
* The config option 'non-conflicting' is ignored by this function.
* @return true if the Player can be logged in automatically
*/
protected boolean isAutoLoginAllowed() {
return "true".equals(autoLoginFloodgate)
|| "no-conflict".equals(autoRegisterFloodgate) // this was checked before
|| ("linked".equals(autoLoginFloodgate) && isLinked);
}
/** /**
* Decides wether checks for conflicting Java names should be made * Decides wether checks for conflicting Java names should be made
* @return ture if an API call to Mojang is needed * @return ture if an API call to Mojang is needed