From 2b77607072ad99af42a6878aa610b1b69fc00eee Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Mon, 14 Feb 2022 01:25:51 +0100
Subject: [PATCH] Maybe fixed party

---
 api/src/main/java/com/alttd/chat/database/Queries.java | 6 ++++--
 api/src/main/java/com/alttd/chat/objects/Party.java    | 5 ++++-
 2 files changed, 8 insertions(+), 3 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 9cae57b..1ea3821 100755
--- a/api/src/main/java/com/alttd/chat/database/Queries.java
+++ b/api/src/main/java/com/alttd/chat/database/Queries.java
@@ -1,6 +1,5 @@
 package com.alttd.chat.database;
 
-import com.alttd.chat.managers.ChatUserManager;
 import com.alttd.chat.managers.PartyManager;
 import com.alttd.chat.objects.ChatUser;
 import com.alttd.chat.objects.Mail;
@@ -10,8 +9,10 @@ import com.alttd.chat.objects.channels.Channel;
 import com.alttd.chat.util.ALogger;
 
 import java.sql.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.UUID;
 
 public class Queries {
 
@@ -185,6 +186,7 @@ public class Queries {
                     ALogger.warn("Unable to retrieve party: " + id);
                     continue;
                 }
+                System.out.println("ADDING PARTY USER " + party.getPartyName() + " " + playerName);
                 party.putPartyUser(new PartyUser(uuid, displayName, playerName));
             }
 
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 076be33..7c58b74 100755
--- a/api/src/main/java/com/alttd/chat/objects/Party.java
+++ b/api/src/main/java/com/alttd/chat/objects/Party.java
@@ -14,7 +14,7 @@ public class Party {
     private UUID ownerUuid;
     private String partyName;
     private String partyPassword;
-    private static ArrayList<PartyUser> partyUsers;
+    private final ArrayList<PartyUser> partyUsers;
 
     public Party(int partyId, UUID ownerUuid, String partyName, String partyPassword) {
         this.partyId = partyId;
@@ -29,6 +29,9 @@ public class Party {
     }
 
     public void addUser(ChatUser chatUser, String playerName) {
+        Party party = PartyManager.getParty(chatUser.getPartyId());
+        if (party != null)
+            party.removeUser(chatUser);
         partyUsers.add(new PartyUser(chatUser.getUuid(), chatUser.getDisplayName(), playerName));
         chatUser.setPartyId(getPartyId());
         Queries.addPartyUser(chatUser);