Changeset 76 for binary-improvements/7dtd-server-fixes

Timestamp:

Jul 17, 2014, 1:46:42 AM (10 years ago)

Author:

alloc

Message:

fixer

Location:

binary-improvements/7dtd-server-fixes

Files:

• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/Assembly-CSharp.dll (modified) ( previous)
• src/AllocsRequestToSpawnPlayer.cs (modified) (2 diffs)
• src/TelnetCommands/ListPlayersExtended.cs (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/src/AllocsRequestToSpawnPlayer.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 
 public class AllocsRequestToSpawnPlayer
@@ -6 +7 @@
         {
                 string ip = manager.connectionManager.connectedClients [_clientId].networkPlayer.ipAddress;
-                Log.Out ("Player connected, clientid=" + _clientId + ", ip=" + ip);
+                string name = string.Empty;
+                int entityId = -1;
+                Dictionary<int,int> d = manager.connectionManager.mapClientToEntity;
+                if (d.ContainsKey (_clientId)) {
+                        entityId = d [_clientId];
+                        World w = manager.World;
+                        name = w.playerEntities.dict [entityId].EntityName;
+                }
+
+                Log.Out ("Player connected, clientid=" + _clientId +
+                         ", entityid=" + entityId +
+                         ", name=" + name +
+                         ", steamid=" + SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (name) +
+                         ", ip=" + ip);
         }
 }

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

@@ -22 +22 @@
                 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;
+                                }
+                        }
+                        string ip = string.Empty;
+                        if (clientId >= 0) {
+                                ip = this.m_Console.gameManager.connectionManager.connectedClients [clientId].networkPlayer.ipAddress;
+                        }
                         m_Console.md000a (string.Concat (new object[]
                         {
@@ -46 +57 @@
                                 ", score=",
                                 current.Value.Score,
-                                ", ",
-                                SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (current.Value.EntityName)
+                                ", steamid=",
+                                SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (current.Value.EntityName),
+                                ", ip=",
+                                ip
                         }));
                 }