From 67eccd389d10e8023137253cb973baaa0d5f9c3b Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Sun, 8 Aug 2021 12:19:32 +0200
Subject: [PATCH] Switched to Username only (no nicknames) till colors can be
 fixed (for party users)

---
 api/src/main/java/com/alttd/chat/database/Queries.java   | 9 +++++----
 .../main/java/com/alttd/chat/managers/PartyManager.java  | 4 ----
 api/src/main/java/com/alttd/chat/objects/Party.java      | 7 +++++--
 .../main/java/com/alttd/chat/commands/PartyCommand.java  | 9 ++++++---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/api/src/main/java/com/alttd/chat/database/Queries.java b/api/src/main/java/com/alttd/chat/database/Queries.java
index 57247a0..72c13fe 100755
--- a/api/src/main/java/com/alttd/chat/database/Queries.java
+++ b/api/src/main/java/com/alttd/chat/database/Queries.java
@@ -177,10 +177,11 @@ public class Queries {
             while (resultSet.next()) {
                 int id = resultSet.getInt("party_id");
                 UUID uuid = UUID.fromString(resultSet.getString("uuid"));
-                String displayName = resultSet.getString("nickname");
-                if (displayName == null || displayName.isEmpty()) {
-                    displayName = resultSet.getString("Username");
-                }
+//                String displayName = resultSet.getString("nickname");
+//                if (displayName == null || displayName.isEmpty()) {
+//                    displayName = resultSet.getString("Username");
+//                }
+                String displayName = resultSet.getString("Username"); // FIXME: 08/08/2021 only using display name till we can fix nickname colors
 
                 Party party = PartyManager.getParty(id);
                 if (party == null) {
diff --git a/api/src/main/java/com/alttd/chat/managers/PartyManager.java b/api/src/main/java/com/alttd/chat/managers/PartyManager.java
index e6ee803..56aa49d 100644
--- a/api/src/main/java/com/alttd/chat/managers/PartyManager.java
+++ b/api/src/main/java/com/alttd/chat/managers/PartyManager.java
@@ -50,9 +50,5 @@ public class PartyManager {
 
     public static void loadParties() {
         Queries.loadParties();
-        for (ChatUser chatUser : ChatUserManager.getChatUsers()) {
-            Party party = getParty(chatUser.getPartyId());
-            if (party != null) party.addUser(chatUser);
-        }
     }
 }
diff --git a/api/src/main/java/com/alttd/chat/objects/Party.java b/api/src/main/java/com/alttd/chat/objects/Party.java
index 2d1e8a4..a99966d 100755
--- a/api/src/main/java/com/alttd/chat/objects/Party.java
+++ b/api/src/main/java/com/alttd/chat/objects/Party.java
@@ -28,8 +28,11 @@ public class Party {
         this.partyUsers.put(uuid, displayName);
     }
 
-    public void addUser(ChatUser partyUser) {
-        this.partyUsers.put(partyUser.getUuid(), PlainComponentSerializer.plain().serialize(partyUser.getDisplayName()));
+    public void addUser(ChatUser partyUser, String displayName) {
+//        this.partyUsers.put(partyUser.getUuid(), PlainComponentSerializer.plain().serialize(partyUser.getDisplayName()));
+//        partyUser.setPartyId(getPartyId());
+//        Queries.addPartyUser(partyUser);
+        this.partyUsers.put(partyUser.getUuid(), displayName);
         partyUser.setPartyId(getPartyId());
         Queries.addPartyUser(partyUser);
     }
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/PartyCommand.java b/galaxy/src/main/java/com/alttd/chat/commands/PartyCommand.java
index c1a03eb..9e04b0c 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/PartyCommand.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/PartyCommand.java
@@ -44,7 +44,8 @@ public class PartyCommand implements CommandExecutor {
                             break;
                         }
                         Party party = Queries.addParty(player.getUniqueId(), args[1], args[2]);
-                        party.addUser(ChatUserManager.getChatUser(player.getUniqueId()));
+//                        party.addUser(ChatUserManager.getChatUser(player.getUniqueId())); //Removed until we can get nicknames to translate to colors correctly
+                        party.addUser(ChatUserManager.getChatUser(player.getUniqueId()), player.getName());
                         PartyManager.addParty(party);
                         sender.sendMessage(MiniMessage.get().parse("<green>You created a party called: '<gold>" +
                                 party.getPartyName() + "</gold>' with the password: '<gold>" +
@@ -90,7 +91,8 @@ public class PartyCommand implements CommandExecutor {
                             break;
                         }
 
-                        party.addUser(ChatUserManager.getChatUser(player.getUniqueId()));
+//                        party.addUser(ChatUserManager.getChatUser(player.getUniqueId())); //Removed until we can get nicknames to translate to colors correctly
+                        party.addUser(ChatUserManager.getChatUser(player.getUniqueId()), player.getName());
                         sender.sendMessage(MiniMessage.get().parse("<green>You joined " + party.getPartyName() + "!</green>"));
                     }
                     case "leave" -> {
@@ -194,7 +196,8 @@ public class PartyCommand implements CommandExecutor {
         INVITE("<gold>/party invite <username></gold>"),
         JOIN("<gold>/party join <party name> <password></gold>"),
         LEAVE("<gold><hover:show_text:'<red>If the party owner leaves the server will choose a new party owner</red>'>/party leave</hover></gold>"),
-        REMOVE("<gold>/party remove <username></gold>");
+        REMOVE("<gold>/party remove <username></gold>"),
+        INFO("<gold>/party info</gold>");
 
         private final String message;