From 1bded295e2b95806f433171bde9588e713e8d5e5 Mon Sep 17 00:00:00 2001
From: Risto Lahtela <24460436+AuroraLS3@users.noreply.github.com>
Date: Thu, 15 Apr 2021 09:42:43 +0300
Subject: [PATCH] Fixed "Plan" appearing as server name on session accordion

---
 .../storage/database/queries/objects/SessionQueries.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java
index 0cc8c26b4..690c0e0b6 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java
@@ -58,6 +58,7 @@ public class SessionQueries {
             "u." + UsersTable.USER_NAME + " as name," +
             "u_info." + UserInfoTable.REGISTERED + " as registered," +
             "server." + ServerTable.NAME + " as server_name," +
+            "server." + ServerTable.SERVER_ID + " as server_id," +
             SessionsTable.SESSION_START + ',' +
             SessionsTable.SESSION_END + ',' +
             SessionsTable.MOB_KILLS + ',' +
@@ -218,7 +219,11 @@ public class SessionQueries {
             if (!existingPlayerKills.isPresent()) extraData.put(PlayerKills.class, playerKills);
 
             extraData.put(PlayerName.class, new PlayerName(set.getString("name")));
-            extraData.put(ServerName.class, new ServerName(set.getString("server_name")));
+            extraData.put(ServerName.class, new ServerName(
+                    Server.getIdentifiableName(
+                            set.getString("server_name"),
+                            set.getInt("server_id")
+                    )));
 
             session.setAsFirstSessionIfMatches(set.getLong("registered"));