From 42c3dcbbcbb1dac9ee25eb2844c7f4f05c4da0fe Mon Sep 17 00:00:00 2001 From: ljacqu Date: Tue, 12 Jul 2016 22:23:53 +0200 Subject: [PATCH] Revert code changes to single session --- .../authme/process/logout/AsynchronousLogout.java | 10 ---------- .../process/logout/ProcessSynchronousPlayerLogout.java | 3 +++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java b/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java index 1ed261ea..34a5b493 100644 --- a/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java @@ -1,6 +1,5 @@ package fr.xephi.authme.process.logout; -import fr.xephi.authme.cache.SessionManager; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.cache.limbo.LimboCache; @@ -9,7 +8,6 @@ import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.process.ProcessService; import fr.xephi.authme.process.SyncProcessManager; -import fr.xephi.authme.settings.properties.PluginSettings; import fr.xephi.authme.settings.properties.RestrictionSettings; import org.bukkit.entity.Player; @@ -29,9 +27,6 @@ public class AsynchronousLogout implements AsynchronousProcess { @Inject private LimboCache limboCache; - @Inject - private SessionManager sessionManager; - @Inject private SyncProcessManager syncProcessManager; @@ -52,11 +47,6 @@ public class AsynchronousLogout implements AsynchronousProcess { database.updateQuitLoc(auth); } - if (sessionManager.hasSession(name) || (service.getProperty(PluginSettings.SESSIONS_ENABLED) && database.isLogged(name))) { - sessionManager.cancelSession(name); - service.send(player, MessageKey.SESSION_EXPIRED); - } - limboCache.addPlayerData(player); playerCache.removePlayer(name); database.setUnlogged(name); diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java index acbd0425..ae7afe46 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSynchronousPlayerLogout.java @@ -51,6 +51,9 @@ public class ProcessSynchronousPlayerLogout implements SynchronousProcess { public void processSyncLogout(Player player) { final String name = player.getName().toLowerCase(); + if (sessionManager.hasSession(name)) { + sessionManager.cancelSession(name); + } if (service.getProperty(RestrictionSettings.PROTECT_INVENTORY_BEFORE_LOGIN)) { protocolLibService.sendBlankInventoryPacket(player); }