From 004364ca618b88c60873dfaa2fda5563d6ac3f9e Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sun, 15 Sep 2019 15:37:20 +0300 Subject: [PATCH] Fixed Session list displaying UUIDs for online sessions --- .../listeners/bukkit/PlayerOnlineListener.java | 6 +++++- .../listeners/bungee/PlayerOnlineListener.java | 2 ++ .../listeners/sponge/PlayerOnlineListener.java | 6 +++++- .../listeners/velocity/PlayerOnlineListener.java | 11 +++++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/PlayerOnlineListener.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/PlayerOnlineListener.java index 4ba269a92..da63b98d9 100644 --- a/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/PlayerOnlineListener.java +++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/PlayerOnlineListener.java @@ -17,6 +17,7 @@ package com.djrapitops.plan.gathering.listeners.bukkit; import com.djrapitops.plan.delivery.domain.Nickname; +import com.djrapitops.plan.delivery.domain.keys.SessionKeys; import com.djrapitops.plan.delivery.export.Exporter; import com.djrapitops.plan.delivery.webserver.cache.DataID; import com.djrapitops.plan.delivery.webserver.cache.JSONCache; @@ -174,7 +175,10 @@ public class PlayerOnlineListener implements Listener { } database.executeTransaction(new PlayerServerRegisterTransaction(playerUUID, player::getFirstPlayed, playerName, serverUUID)); - sessionCache.cacheSession(playerUUID, new Session(playerUUID, serverUUID, time, world, gm)) + Session session = new Session(playerUUID, serverUUID, time, world, gm); + session.putRawData(SessionKeys.NAME, playerName); + session.putRawData(SessionKeys.SERVER_NAME, serverInfo.getServer().getIdentifiableName()); + sessionCache.cacheSession(playerUUID, session) .ifPresent(previousSession -> database.executeTransaction(new SessionEndTransaction(previousSession))); database.executeTransaction(new NicknameStoreTransaction( diff --git a/Plan/bungeecord/src/main/java/com/djrapitops/plan/gathering/listeners/bungee/PlayerOnlineListener.java b/Plan/bungeecord/src/main/java/com/djrapitops/plan/gathering/listeners/bungee/PlayerOnlineListener.java index 10a98bda0..3455c8fe8 100644 --- a/Plan/bungeecord/src/main/java/com/djrapitops/plan/gathering/listeners/bungee/PlayerOnlineListener.java +++ b/Plan/bungeecord/src/main/java/com/djrapitops/plan/gathering/listeners/bungee/PlayerOnlineListener.java @@ -104,6 +104,7 @@ public class PlayerOnlineListener implements Listener { long time = System.currentTimeMillis(); Session session = new Session(playerUUID, serverInfo.getServerUUID(), time, null, null); + session.putRawData(SessionKeys.NAME, playerName); session.putRawData(SessionKeys.SERVER_NAME, "Proxy Server"); sessionCache.cacheSession(playerUUID, session); Database database = dbSystem.getDatabase(); @@ -189,6 +190,7 @@ public class PlayerOnlineListener implements Listener { long time = System.currentTimeMillis(); // Replaces the current session in the cache. Session session = new Session(playerUUID, serverInfo.getServerUUID(), time, null, null); + session.putRawData(SessionKeys.NAME, playerName); session.putRawData(SessionKeys.SERVER_NAME, "Proxy Server"); sessionCache.cacheSession(playerUUID, session); if (config.get(ExportSettings.EXPORT_ON_ONLINE_STATUS_CHANGE)) { diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/sponge/PlayerOnlineListener.java b/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/sponge/PlayerOnlineListener.java index 253a8ec1c..afcfc4666 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/sponge/PlayerOnlineListener.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/sponge/PlayerOnlineListener.java @@ -17,6 +17,7 @@ package com.djrapitops.plan.gathering.listeners.sponge; import com.djrapitops.plan.delivery.domain.Nickname; +import com.djrapitops.plan.delivery.domain.keys.SessionKeys; import com.djrapitops.plan.delivery.export.Exporter; import com.djrapitops.plan.delivery.webserver.cache.DataID; import com.djrapitops.plan.delivery.webserver.cache.JSONCache; @@ -177,7 +178,10 @@ public class PlayerOnlineListener { } database.executeTransaction(new PlayerServerRegisterTransaction(playerUUID, () -> time, playerName, serverUUID)); - sessionCache.cacheSession(playerUUID, new Session(playerUUID, serverUUID, time, world, gm)) + Session session = new Session(playerUUID, serverUUID, time, world, gm); + session.putRawData(SessionKeys.NAME, playerName); + session.putRawData(SessionKeys.SERVER_NAME, serverInfo.getServer().getIdentifiableName()); + sessionCache.cacheSession(playerUUID, session) .ifPresent(previousSession -> database.executeTransaction(new SessionEndTransaction(previousSession))); database.executeTransaction(new NicknameStoreTransaction( diff --git a/Plan/velocity/src/main/java/com/djrapitops/plan/gathering/listeners/velocity/PlayerOnlineListener.java b/Plan/velocity/src/main/java/com/djrapitops/plan/gathering/listeners/velocity/PlayerOnlineListener.java index 1128e1412..25cda54d2 100644 --- a/Plan/velocity/src/main/java/com/djrapitops/plan/gathering/listeners/velocity/PlayerOnlineListener.java +++ b/Plan/velocity/src/main/java/com/djrapitops/plan/gathering/listeners/velocity/PlayerOnlineListener.java @@ -16,6 +16,7 @@ */ package com.djrapitops.plan.gathering.listeners.velocity; +import com.djrapitops.plan.delivery.domain.keys.SessionKeys; import com.djrapitops.plan.delivery.export.Exporter; import com.djrapitops.plan.delivery.webserver.cache.DataID; import com.djrapitops.plan.delivery.webserver.cache.JSONCache; @@ -105,7 +106,10 @@ public class PlayerOnlineListener { InetAddress address = player.getRemoteAddress().getAddress(); long time = System.currentTimeMillis(); - sessionCache.cacheSession(playerUUID, new Session(playerUUID, serverInfo.getServerUUID(), time, null, null)); + Session session = new Session(playerUUID, serverInfo.getServerUUID(), time, null, null); + session.putRawData(SessionKeys.NAME, playerName); + session.putRawData(SessionKeys.SERVER_NAME, "Proxy Server"); + sessionCache.cacheSession(playerUUID, session); Database database = dbSystem.getDatabase(); @@ -190,7 +194,10 @@ public class PlayerOnlineListener { long time = System.currentTimeMillis(); // Replaces the current session in the cache. - sessionCache.cacheSession(playerUUID, new Session(playerUUID, serverInfo.getServerUUID(), time, null, null)); + Session session = new Session(playerUUID, serverInfo.getServerUUID(), time, null, null); + session.putRawData(SessionKeys.NAME, playerName); + session.putRawData(SessionKeys.SERVER_NAME, "Proxy Server"); + sessionCache.cacheSession(playerUUID, session); if (config.get(ExportSettings.EXPORT_ON_ONLINE_STATUS_CHANGE)) { processing.submitNonCritical(() -> exporter.exportPlayerPage(playerUUID, playerName));