Get the right servername and player name

galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java

@@ -61,7 +61,7 @@ public class PlayerListener implements Listener {
 
         ChatUser user = ChatUserManager.getChatUser(uuid);
         if (user != null) {
-            updateServerState(user);
+            updateServerState();
             return;
         }
 
@@ -69,7 +69,7 @@ public class PlayerListener implements Listener {
         ChatUser chatUser = new ChatUser(uuid, -1, null);
         ChatUserManager.addUser(chatUser);
         Queries.saveUser(chatUser);
-        updateServerState(chatUser);
+        updateServerState();
         //TODO load player on other servers with plugin message?
     }
 
@@ -78,15 +78,15 @@ public class PlayerListener implements Listener {
         UUID uuid = event.getPlayer().getUniqueId();
         ChatUser user = ChatUserManager.getChatUser(uuid);
         ChatUserManager.removeUser(user);
-        updateServerState(user);
+        updateServerState();
     }
 
-    private void updateServerState(ChatUser chatUser) {
+    private void updateServerState() {
         Bukkit.getScheduler().runTaskLaterAsynchronously(chatPlugin, () -> {
                     ArrayList<Player> playerList = new ArrayList<>(Bukkit.getOnlinePlayers());
-                    String name = Bukkit.getServer().getName();
+                    String name = Bukkit.getServerName();
                     webHandler.updateServerState(name,
-                            playerList.stream().map(player -> WebPlayerMapper.fromPlayer(player, chatUser)).toList()
+                            playerList.stream().map(WebPlayerMapper::fromPlayer).toList()
                     );
                 }, 20
         );//20 ticks aka 1 second delay

galaxy/src/main/java/com/alttd/chat/listeners/WebPlayerMapper.java

@@ -1,5 +1,6 @@
 package com.alttd.chat.listeners;
 
+import com.alttd.chat.managers.ChatUserManager;
 import com.alttd.chat.objects.ChatUser;
 import com.alttd.chat.objects.chat_log.mapper.server_state.WebPlayer;
 import lombok.experimental.UtilityClass;
@@ -9,7 +10,8 @@ import org.bukkit.entity.Player;
 @UtilityClass
 public class WebPlayerMapper {
 
-    public static WebPlayer fromPlayer(Player player, ChatUser chatUser) {
+    public static WebPlayer fromPlayer(Player player) {
+        ChatUser chatUser = ChatUserManager.getChatUser(player.getUniqueId());
         WebPlayer webPlayer = new WebPlayer();
         webPlayer.setUuid(player.getUniqueId());
         webPlayer.setName(player.getName());