From d235b26ac39a9ee5c1b39ca430b0ed37b26f39d2 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Fri, 7 Oct 2016 19:43:54 +0200
Subject: [PATCH] Main class cleanup

---
 src/main/java/fr/xephi/authme/AuthMe.java | 70 ++++++++++-------------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 04922d4a9..8e9818bf2 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -5,7 +5,6 @@ import ch.jalu.injector.InjectorBuilder;
 import com.google.common.annotations.VisibleForTesting;
 import fr.xephi.authme.api.API;
 import fr.xephi.authme.api.NewAPI;
-import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.command.CommandHandler;
 import fr.xephi.authme.datasource.DataSource;
@@ -47,7 +46,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitScheduler;
 
 import java.io.File;
-import java.util.Date;
 
 import static fr.xephi.authme.service.BukkitService.TICKS_PER_MINUTE;
 import static fr.xephi.authme.util.Utils.isClassLoaded;
@@ -134,8 +132,12 @@ public class AuthMe extends JavaPlugin {
      */
     @Override
     public void onEnable() {
+        // Load the plugin version data from the plugin description file
+        loadPluginInfo();
+
+        // Initialize the plugin
         try {
-            initializeServices();
+            initialize();
         } catch (Exception e) {
             ConsoleLogger.logException("Aborting initialization of AuthMe:", e);
             stopOrUnload();
@@ -172,10 +174,27 @@ public class AuthMe extends JavaPlugin {
         cleanupTask.runTaskTimerAsynchronously(this, CLEANUP_INTERVAL, CLEANUP_INTERVAL);
     }
 
-    private void initializeServices() throws Exception {
-        // Set the plugin instance and load plugin info from the plugin description.
-        loadPluginInfo();
+    /**
+     * Load the version and build number of the plugin from the description file.
+     */
+    private void loadPluginInfo() {
+        String versionRaw = this.getDescription().getVersion();
+        int index = versionRaw.lastIndexOf("-");
+        if (index != -1) {
+            pluginVersion = versionRaw.substring(0, index);
+            pluginBuildNumber = versionRaw.substring(index + 1);
+            if (pluginBuildNumber.startsWith("b")) {
+                pluginBuildNumber = pluginBuildNumber.substring(1);
+            }
+        }
+    }
 
+    /**
+     * Initialize the plugin and all the services.
+     *
+     * @throws Exception if the initialization fails
+     */
+    private void initialize() throws Exception {
         // Set the Logger instance and log file path
         ConsoleLogger.setLogger(getLogger());
         ConsoleLogger.setLogFile(new File(getDataFolder(), LOG_FILENAME));
@@ -211,8 +230,11 @@ public class AuthMe extends JavaPlugin {
 
         instantiateServices(injector);
 
-        // Reload support hook
-        reloadSupportHook();
+        // TODO: does this still make sense? -sgdc3
+        // If the server is empty (fresh start) just set all the players as unlogged
+        if (bukkitService.getOnlinePlayers().size() == 0) {
+            database.purgeLogged();
+        }
 
         // Register event listeners
         registerEventListeners(injector);
@@ -221,19 +243,6 @@ public class AuthMe extends JavaPlugin {
         initializer.scheduleRecallEmailTask(settings, database, messages);
     }
 
-    // Get version and build number of the plugin
-    private void loadPluginInfo() {
-        String versionRaw = this.getDescription().getVersion();
-        int index = versionRaw.lastIndexOf("-");
-        if (index != -1) {
-            pluginVersion = versionRaw.substring(0, index);
-            pluginBuildNumber = versionRaw.substring(index + 1);
-            if (pluginBuildNumber.startsWith("b")) {
-                pluginBuildNumber = pluginBuildNumber.substring(1);
-            }
-        }
-    }
-
     /**
      * Instantiates all services.
      *
@@ -315,24 +324,6 @@ public class AuthMe extends JavaPlugin {
         }
     }
 
-    // TODO: check this, do we really need it? -sgdc3
-    private void reloadSupportHook() {
-        if (database != null) {
-            int playersOnline = bukkitService.getOnlinePlayers().size();
-            if (playersOnline == 0) {
-                database.purgeLogged();
-            } else if (settings.getProperty(SecuritySettings.USE_RELOAD_COMMAND_SUPPORT)) {
-                for (PlayerAuth auth : database.getLoggedPlayers()) {
-                    if (auth != null) {
-                        auth.setLastLogin(new Date().getTime());
-                        database.updateSession(auth);
-                        playerCache.addPlayer(auth);
-                    }
-                }
-            }
-        }
-    }
-
     @Override
     public void onDisable() {
         // onDisable is also called when we prematurely abort, so any field may be null
@@ -377,7 +368,6 @@ public class AuthMe extends JavaPlugin {
             .replace("{COUNTRY}", geoIpService.getCountryName(ipAddress));
     }
 
-
     /**
      * Handle Bukkit commands.
      *