Merge pull request #28 from ModdedMinecraftClub/feature/online-cmd-improvements

!online - add IPs, change colour to green, don't show empty string

Author: TraceLD

server/src/main/java/club/moddedminecraft/polychat/server/discordcommands/OnlineCommand.java

@@ -7,6 +7,7 @@
 
 import java.awt.Color;
 import java.util.HashMap;
+import java.util.List;
 
 public class OnlineCommand extends Command {
 
@@ -28,7 +29,7 @@ protected void execute(CommandEvent event) {
             EmbedBuilder errEb = new EmbedBuilder()
                     .setTitle("Error")
                     .setDescription("No online servers found!")
-                    .setColor(Color.RED);
+                    .setColor(Color.GREEN);
             event.reply(errEb.build());
             return;
         }
@@ -39,9 +40,16 @@ protected void execute(CommandEvent event) {
         int totalOnline = 0;
         for (OnlineServer server : onlineServers.values()) {
             totalOnline += server.getPlayersOnline();
-            eb.addField("[" + server.getServerId() + "] " + server.getServerName() + " [" + server.getPlayersOnline() + "/" + server.getMaxPlayers() + "]",
-                    String.join(", ", server.getOnlinePlayerNames()),
-                    false);
+
+            String mainMsg = "[" + server.getServerId() + "] " + server.getServerName() + " [" + server.getPlayersOnline() + "/" + server.getMaxPlayers() + "]";
+            String secondaryMsg = "*" + server.getServerAddress() + "*";
+            List<String> onlinePlayersOnCurrentServer = server.getOnlinePlayerNames();
+
+            if (onlinePlayersOnCurrentServer.size() != 0) {
+                secondaryMsg += "\n" + String.join(", ", onlinePlayersOnCurrentServer);
+            }
+
+            eb.addField(mainMsg, secondaryMsg, false);
         }
 
         String description = "**Total players online:** " + totalOnline + "\n**Servers online:** " + onlineServers.keySet().size();