Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched to Username only (no nicknames) till colors can be fixed (for party users)

Browse Source
This commit is contained in:
auto
2021-08-08 12:19:32 +02:00
parent 2cb843b68c
commit 67eccd389d
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/com/alttd/chat/database/Queries.java
+5 -4
View File
@@ -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) {
api/src/main/java/com/alttd/chat/managers/PartyManager.java
-4
View File
@@ -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);
}
}
}
api/src/main/java/com/alttd/chat/objects/Party.java
+5 -2
View File
@@ -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);
}