Filter player lists with counts

closes #161 Co-authored-by: ens-gijs <ens.gijs@gmail.com>
jpenilla · Jan 14, 2024 · b97ebcb · b97ebcb
1 parent 2abf0c1
commit b97ebcb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/common/src/main/java/xyz/jpenilla/minimotd/common/config/MOTDConfig.java b/common/src/main/java/xyz/jpenilla/minimotd/common/config/MOTDConfig.java
@@ -123,9 +123,9 @@ public static final class PlayerCountSettings {
       + "If false, the online player count will be capped at the maximum player count")
     private boolean allowExceedingMaximum = false;
 
-    @Comment("The list of server names that affect player counts.\n"
+    @Comment("The list of server names that affect player counts/listing.\n"
       + "Only applicable when running the plugin on a proxy (Velocity or Waterfall/Bungeecord).\n"
-      + "When set to an empty list, the default count determined by the proxy will be used.")
+      + "When set to an empty list, the default count & list as determined by the proxy will be used.")
     private final List<String> servers = new ArrayList<>();
 
     @ConfigSerializable

diff --git a/platform/velocity/src/main/java/xyz/jpenilla/minimotd/velocity/PingListener.java b/platform/velocity/src/main/java/xyz/jpenilla/minimotd/velocity/PingListener.java
@@ -31,7 +31,10 @@
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.framework.qual.DefaultQualifier;
@@ -64,12 +67,18 @@ private void handle(final ProxyPingEvent event) {
     if (targetServers.isEmpty()) {
       playersCount = pong.getOnlinePlayers();
     } else {
+      final Set<ServerPing.SamplePlayer> players = new HashSet<>();
       for (final String serverName : targetServers) {
         final @Nullable RegisteredServer server = this.proxy.getServer(serverName).orElse(null);
         if (server != null) {
           playersCount += server.getPlayersConnected().size();
+          players.addAll(server.getPlayersConnected().stream()
+            .map(p -> new ServerPing.SamplePlayer(p.getGameProfile().getName(), p.getUniqueId()))
+            .collect(Collectors.toList()));
         }
       }
+      pong.clearSamplePlayers();
+      pong.samplePlayers(players.toArray(new ServerPing.SamplePlayer[0]));
     }
 
     final PingResponse<Favicon> response = this.miniMOTD.createMOTD(config, playersCount, pong.getMaximumPlayers());