Merge remote-tracking branch 'origin/master'

This commit is contained in:
ljacqu
2016-07-12 22:15:28 +02:00
2 changed files with 1 additions and 4 deletions
@@ -52,7 +52,7 @@ public class AsynchronousLogout implements AsynchronousProcess {
database.updateQuitLoc(auth);
}
if (service.getProperty(PluginSettings.SESSIONS_ENABLED) && (sessionManager.hasSession(name) || database.isLogged(name))) {
if (sessionManager.hasSession(name) || (service.getProperty(PluginSettings.SESSIONS_ENABLED) && database.isLogged(name))) {
sessionManager.cancelSession(name);
service.send(player, MessageKey.SESSION_EXPIRED);
}
@@ -51,9 +51,6 @@ 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);
}