fix: issues with the global user list

WiIIiam278 · Feb 4, 2024 · 8e8e112 · 8e8e112
1 parent 7f7ea8f
commit 8e8e112
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/common/src/main/java/net/william278/husktowns/HuskTowns.java b/common/src/main/java/net/william278/husktowns/HuskTowns.java
@@ -68,7 +68,7 @@
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public interface HuskTowns extends Task.Supplier, ConfigProvider, EventDispatcher, GlobalUserList,
+public interface HuskTowns extends Task.Supplier, ConfigProvider, EventDispatcher, UserListProvider,
         AdvancementProvider, DataPruner, GsonProvider, OperationHandler, UserListener {
 
     int SPIGOT_RESOURCE_ID = 92672;

diff --git a/...iam278/husktowns/util/GlobalUserList.java → ...m278/husktowns/util/UserListProvider.java b/...iam278/husktowns/util/GlobalUserList.java → ...m278/husktowns/util/UserListProvider.java
@@ -19,25 +19,35 @@
 
 package net.william278.husktowns.util;
 
-import com.google.common.collect.Multimap;
 import net.william278.husktowns.HuskTowns;
 import net.william278.husktowns.user.User;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
 
-public interface GlobalUserList {
+public interface UserListProvider {
 
     @NotNull
-    Multimap<String, User> getGlobalUserList();
+    Map<String, List<User>> getGlobalUserList();
 
+    @NotNull
     default List<User> getUserList() {
-        return getGlobalUserList().values().stream().toList();
+        return Stream.concat(
+                getGlobalUserList().values().stream().flatMap(Collection::stream),
+                getPlugin().getOnlineUsers().stream()
+        ).distinct().sorted().toList();
     }
 
     default void setUserList(@NotNull String server, @NotNull List<User> players) {
-        getGlobalUserList().replaceValues(server, players);
+        getGlobalUserList().values().forEach(list -> {
+            list.removeAll(players);
+            list.removeAll(getPlugin().getOnlineUsers());
+        });
+        getGlobalUserList().put(server, players);
     }
 
     @NotNull