From 9a9ca9676d3263c5a578b7cc066f003f9b6309a0 Mon Sep 17 00:00:00 2001
From: EnZaXD <florian.michael07@gmail.com>
Date: Sat, 15 Jun 2024 15:53:09 +0200
Subject: [PATCH] Cleanup /viaversion list and pps command (#3933)

---
 .../commands/defaultsubs/ListSubCmd.java      |  8 +++---
 .../commands/defaultsubs/PPSSubCmd.java       | 28 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ListSubCmd.java b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ListSubCmd.java
index 81d9002b3..257ca9601 100644
--- a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ListSubCmd.java
+++ b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ListSubCmd.java
@@ -20,6 +20,7 @@ package com.viaversion.viaversion.commands.defaultsubs;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.api.command.ViaSubCommand;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import java.util.HashSet;
 import java.util.Map;
@@ -46,10 +47,9 @@ public class ListSubCmd implements ViaSubCommand {
     public boolean execute(ViaCommandSender sender, String[] args) {
         Map<ProtocolVersion, Set<String>> playerVersions = new TreeMap<>(ProtocolVersion::compareTo);
 
-        for (ViaCommandSender p : Via.getPlatform().getOnlinePlayers()) {
-            int playerVersion = Via.getAPI().getPlayerVersion(p.getUUID());
-            ProtocolVersion key = ProtocolVersion.getProtocol(playerVersion);
-            playerVersions.computeIfAbsent(key, s -> new HashSet<>()).add(p.getName());
+        for (UserConnection p : Via.getManager().getConnectionManager().getConnections()) {
+            ProtocolVersion version = p.getProtocolInfo().protocolVersion();
+            playerVersions.computeIfAbsent(version, s -> new HashSet<>()).add(p.getProtocolInfo().getUsername());
         }
 
         for (Map.Entry<ProtocolVersion, Set<String>> entry : playerVersions.entrySet()) {
diff --git a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java
index a3eb9b555..63e5c39e3 100644
--- a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java
+++ b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java
@@ -46,26 +46,25 @@ public class PPSSubCmd implements ViaSubCommand {
 
     @Override
     public boolean execute(ViaCommandSender sender, String[] args) {
-        Map<Integer, Set<String>> playerVersions = new HashMap<>();
+        Map<ProtocolVersion, Set<String>> playerVersions = new TreeMap<>(ProtocolVersion::compareTo);
         int totalPackets = 0;
         int clients = 0;
         long max = 0;
 
-        for (ViaCommandSender p : Via.getPlatform().getOnlinePlayers()) {
-            int playerVersion = Via.getAPI().getPlayerVersion(p.getUUID());
-            if (!playerVersions.containsKey(playerVersion))
+        for (UserConnection p : Via.getManager().getConnectionManager().getConnections()) {
+            ProtocolVersion playerVersion = p.getProtocolInfo().protocolVersion();
+            if (!playerVersions.containsKey(playerVersion)) {
                 playerVersions.put(playerVersion, new HashSet<>());
-            UserConnection uc = Via.getManager().getConnectionManager().getConnectedClient(p.getUUID());
-            if (uc != null && uc.getPacketTracker().getPacketsPerSecond() > -1) {
-                playerVersions.get(playerVersion).add(p.getName() + " (" + uc.getPacketTracker().getPacketsPerSecond() + " PPS)");
-                totalPackets += uc.getPacketTracker().getPacketsPerSecond();
-                if (uc.getPacketTracker().getPacketsPerSecond() > max) {
-                    max = uc.getPacketTracker().getPacketsPerSecond();
+            }
+            if (p.getPacketTracker().getPacketsPerSecond() > -1) {
+                playerVersions.get(playerVersion).add(p.getProtocolInfo().getUsername() + " (" + p.getPacketTracker().getPacketsPerSecond() + " PPS)");
+                totalPackets += p.getPacketTracker().getPacketsPerSecond();
+                if (p.getPacketTracker().getPacketsPerSecond() > max) {
+                    max = p.getPacketTracker().getPacketsPerSecond();
                 }
                 clients++;
             }
         }
-        Map<Integer, Set<String>> sorted = new TreeMap<>(playerVersions);
         sendMessage(sender, "&4Live Packets Per Second");
         if (clients > 1) {
             sendMessage(sender, "&cAverage: &f" + (totalPackets / clients));
@@ -74,9 +73,10 @@ public class PPSSubCmd implements ViaSubCommand {
         if (clients == 0) {
             sendMessage(sender, "&cNo clients to display.");
         }
-        for (Map.Entry<Integer, Set<String>> entry : sorted.entrySet())
-            sendMessage(sender, "&8[&6%s&8]: &b%s", ProtocolVersion.getProtocol(entry.getKey()).getName(), entry.getValue());
-        sorted.clear();
+        for (Map.Entry<ProtocolVersion, Set<String>> entry : playerVersions.entrySet()) {
+            sendMessage(sender, "&8[&6%s&8]: &b%s", entry.getKey().getName(), entry.getValue());
+        }
+        playerVersions.clear();
         return true;
     }
 }