From 817eedd4ac036a92743f7c785b552da6a8e2d414 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Fri, 25 Feb 2022 18:00:21 +0100
Subject: [PATCH] Move autoLoginFloodgate check to a common function

Reduces duplicate code.
Added missing check for "no-conflict".
---
 .../fastlogin/bukkit/task/FloodgateAuthTask.java      |  3 +--
 .../fastlogin/bungee/task/FloodgateAuthTask.java      |  6 +-----
 .../fastlogin/core/shared/FloodgateManagement.java    | 11 +++++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
index 2df2305b..bc8f4993 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
@@ -49,8 +49,7 @@ public class FloodgateAuthTask extends FloodgateManagement<Player, CommandSender
         BukkitLoginSession session = new BukkitLoginSession(player.getName(), isRegistered, profile);
 
         // enable auto login based on the value of 'autoLoginFloodgate' in config.yml
-        session.setVerified(autoLoginFloodgate.equals("true")
-                || (autoLoginFloodgate.equals("linked") && isLinked));
+        session.setVerified(isAutoLoginAllowed());
 
         // run login task
         Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, session);
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/FloodgateAuthTask.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/FloodgateAuthTask.java
index 4d0825a9..b81cb6c6 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/FloodgateAuthTask.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/FloodgateAuthTask.java
@@ -55,13 +55,9 @@ public class FloodgateAuthTask
         BungeeLoginSession session = new BungeeLoginSession(player.getName(), isRegistered, profile);
         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
         Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, server, session,
-                forcedOnlineMode);
+                isAutoLoginAllowed());
         core.getPlugin().getScheduler().runAsync(forceLoginTask);
     }
 
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java
index 9469467b..573749a8 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java
@@ -145,6 +145,17 @@ public abstract class FloodgateManagement<P extends C, C, L extends LoginSession
                 || ("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
      * @return ture if an API call to Mojang is needed