Changeset 103 for binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs

Timestamp:

Jul 24, 2014, 3:25:58 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

• binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs (modified) (4 diffs)

binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs

@@ -4 +4 @@
 public class ListPlayersExtended : ConsoleCommand
 {
-        public ListPlayersExtended(ConsoleSdtd cons) : base(cons) {
+        public ListPlayersExtended (ConsoleSdtd cons) : base(cons)
+        {
         }
 
@@ -12 +13 @@
         }
 
-        public override string[] Names () {
+        public override string[] Names ()
+        {
                 return new string[] { "listplayersextended", "lpe" };
         }
@@ -18 +20 @@
         public override void Run (string[] _params)
         {
-                World w = this.m_Console.gameManager.World;
-                int num = 0;
-                foreach (KeyValuePair<int, EntityPlayer> current in w.playerEntities.dict)
-                {
-                        int clientId = -1;
-                        Dictionary<int,int> d = this.m_Console.gameManager.connectionManager.mapClientToEntity;
-                        foreach (KeyValuePair<int, int> mapping in d) {
-                                if (mapping.Value == current.Value.fd0087) {
-                                        clientId = mapping.Key;
+                try {
+                        World w = CommonMappingFunctions.GetGameManager ().World;
+                        int num = 0;
+                        foreach (KeyValuePair<int, EntityPlayer> current in w.playerEntities.dict) {
+                                ClientInfo ci = CommonMappingFunctions.GetClientInfoFromEntityID (current.Key);
+                                string ip = string.Empty;
+                                if (ci != null) {
+                                        ip = ci.networkPlayer.ipAddress;
                                 }
-                        }
-                        string ip = string.Empty;
-                        if (clientId >= 0) {
-                                ip = this.m_Console.gameManager.connectionManager.connectedClients [clientId].networkPlayer.ipAddress;
-                        }
-                        m_Console.md000a (string.Concat (new object[]
+                                m_Console.md000a (string.Concat (new object[]
                         {
                                 string.Empty,
@@ -58 +54 @@
                                 current.Value.Score,
                                 ", steamid=",
-                                SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (current.Value.EntityName),
+                                CommonMappingFunctions.GetSteamID (ci),
                                 ", ip=",
                                 ip,
                                 ", ping=",
                                 current.Value.pingToServer
-                        }));
+                        }
+                                )
+                                );
+                        }
+                        m_Console.md000a ("Total of " + w.playerEntities.list.Count + " in the game");
+                } catch (Exception e) {
+                        Log.Out ("Error in ListPlayersExtended.Run: " + e);
                 }
-                m_Console.md000a ("Total of " + w.playerEntities.list.Count + " in the game");
         }
 }