#762 Use timestamps for session + #816 Logout should invalidate a player's session

src/main/java/fr/xephi/authme/process/Management.java

@@ -88,11 +88,11 @@ public class Management {
         });
     }
 
-    public void performQuit(final Player player, final boolean isKick) {
+    public void performQuit(final Player player) {
         runTask(new Runnable() {
             @Override
             public void run() {
-                asynchronousQuit.processQuit(player, isKick);
+                asynchronousQuit.processQuit(player);
             }
         });
     }

src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java

@@ -135,9 +135,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
             }
 
             // Session logic
-            if (service.getProperty(PluginSettings.SESSIONS_ENABLED) && (sessionManager.hasSession(name) || database.isLogged(name))) {
-                sessionManager.cancelSession(name);
-
+            if (sessionManager.hasSession(name) || database.isLogged(name)) {
                 PlayerAuth auth = database.getAuth(name);
                 database.setUnlogged(name);
                 playerCache.removePlayer(name);

src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java

@@ -51,9 +51,8 @@ public class ProcessSynchronousPlayerLogout implements SynchronousProcess {
 
     public void processSyncLogout(Player player) {
         final String name = player.getName().toLowerCase();
-        if (sessionManager.hasSession(name)) {
-            sessionManager.cancelSession(name);
-        }
+
+        sessionManager.removeSession(name);
         if (service.getProperty(RestrictionSettings.PROTECT_INVENTORY_BEFORE_LOGIN)) {
             protocolLibService.sendBlankInventoryPacket(player);
         }

src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java

@@ -10,18 +10,14 @@ import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.process.ProcessService;
 import fr.xephi.authme.process.SyncProcessManager;
 import fr.xephi.authme.settings.SpawnLoader;
-import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.util.BukkitService;
 import fr.xephi.authme.util.Utils;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitTask;
 
 import javax.inject.Inject;
 
-import static fr.xephi.authme.util.BukkitService.TICKS_PER_MINUTE;
-
 public class AsynchronousQuit implements AsynchronousProcess {
 
     @Inject
@@ -52,13 +48,12 @@ public class AsynchronousQuit implements AsynchronousProcess {
     }
 
 
-    public void processQuit(Player player, boolean isKick) {
+    public void processQuit(Player player) {
         if (player == null || Utils.isUnrestricted(player)) {
             return;
         }
         final String name = player.getName().toLowerCase();
 
-        String ip = Utils.getPlayerIp(player);
         if (playerCache.isAuthenticated(name)) {
             if (service.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
                 Location loc = spawnLoader.getPlayerLocationOrSpawn(player);
@@ -67,6 +62,8 @@ public class AsynchronousQuit implements AsynchronousProcess {
                     .realName(player.getName()).build();
                 database.updateQuitLoc(auth);
             }
+
+            final String ip = Utils.getPlayerIp(player);
             PlayerAuth auth = PlayerAuth.builder()
                 .name(name)
                 .realName(player.getName())
@@ -74,27 +71,13 @@ public class AsynchronousQuit implements AsynchronousProcess {
                 .lastLogin(System.currentTimeMillis())
                 .build();
             database.updateSession(auth);
+
+            sessionManager.addSession(name);
         }
 
         //always unauthenticate the player - use session only for auto logins on the same ip
         playerCache.removePlayer(name);
 
-        if (plugin.isEnabled() && service.getProperty(PluginSettings.SESSIONS_ENABLED)) {
-            BukkitTask task = bukkitService.runTaskLaterAsynchronously(new Runnable() {
-
-                @Override
-                public void run() {
-                    postLogout(name);
-                }
-
-            }, service.getProperty(PluginSettings.SESSIONS_TIMEOUT) * TICKS_PER_MINUTE);
-
-            sessionManager.addSession(name, task);
-        } else {
-            //plugin is disabled; we cannot schedule more tasks so run it directly here
-            postLogout(name);
-        }
-
         //always update the database when the player quit the game
         database.setUnlogged(name);
 
@@ -107,7 +90,4 @@ public class AsynchronousQuit implements AsynchronousProcess {
         }
     }
 
-    private void postLogout(String name) {
-        sessionManager.removeSession(name);
-    }
 }