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

Timestamp:

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

Author:

alloc

Message:

fixes

File:

• binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs (modified) (1 diff)

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

@@ -7 +7 @@
         public static void RequestToSpawnPlayer (GameManager manager, int _clientId, string _name, string _playerClassname, string _skinTexture, int _chunkViewDim)
         {
-                string ip = manager.connectionManager.connectedClients [_clientId].networkPlayer.ipAddress;
-                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;
+                try {
+                        ClientInfo ci = CommonMappingFunctions.GetClientInfoFromClientID (_clientId);
+                        int entityId = CommonMappingFunctions.GetEntityID (ci);
+                        EntityPlayer ep = CommonMappingFunctions.GetEntityPlayer (ci);
+
+                        string ip = ci.networkPlayer.ipAddress;
+                        string name = string.Empty;
+
+                        if (ep != null)
+                                name = ep.EntityName;
+
+                        Log.Out ("Player connected, clientid=" + _clientId +
+                                ", entityid=" + entityId +
+                                ", name=" + name +
+                                ", steamid=" + CommonMappingFunctions.GetSteamID (ci) +
+                                ", ip=" + ip
+                        );
+                } catch (Exception e) {
+                        Log.Out ("Error in RequestToSpawnPlayer: " + e);
                 }
-
-                Log.Out ("Player connected, clientid=" + _clientId +
-                        ", entityid=" + entityId +
-                        ", name=" + name +
-                        ", steamid=" + SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (name) +
-                        ", ip=" + ip
-                );
         }