Changes in binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs [213:211]

File:

• binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs (modified) (3 diffs)

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

@@ -20 +20 @@
                 public static string GetPlayerName (ClientInfo _ci)
                 {
-                        return _ci.playerName;
+                        try {
+                                int entityId = GetConnectionManager ().mapClientToEntity [_ci.clientId];
+                                return GetGameManager ().World.playerEntities.dict [entityId].EntityName;
+                        } catch (Exception e) {
+                                Log.Out ("Error getting player name for ClientInfo: " + e);
+                        }
+                        return null;
                 }
 
                 public static EntityPlayer GetEntityPlayer (ClientInfo _ci)
                 {
-                        return GetGameManager ().World.playerEntities.dict [_ci.entityId];
+                        try {
+                                int entityId = GetConnectionManager ().mapClientToEntity [_ci.clientId];
+                                return GetGameManager ().World.playerEntities.dict [entityId];
+                        } catch (Exception e) {
+                                Log.Out ("Error getting entity player for ClientInfo: " + e);
+                        }
+                        return null;
                 }
 
                 public static string GetSteamID (ClientInfo _ci)
                 {
-                        return _ci.playerId;
+                        return Steam.Authentication.Server.GetPlayerId (GetPlayerName (_ci));
+                }
+
+                public static string GetSteamID (string _playerName)
+                {
+                        return Steam.Authentication.Server.GetPlayerId (_playerName);
                 }
 
                 public static int GetClientID (ClientInfo _ci)
                 {
-                        return _ci.clientId;
+                        if (_ci != null) {
+                                if (GetConnectionManager ().connectedClients.ContainsKey (_ci.clientId))
+                                        return _ci.clientId;
+                        }
+                        return -1;
                 }
 
                 public static int GetEntityID (ClientInfo _ci)
                 {
-                        return _ci.entityId;
+                        try {
+                                ConnectionManager cm = GetConnectionManager ();
+
+                                if (cm.mapClientToEntity.ContainsKey (_ci.clientId))
+                                        return cm.mapClientToEntity [_ci.clientId];
+                                else
+                                        return -1;
+                        } catch (Exception e) {
+                                Log.Out ("Error getting entity ID for ClientInfo: " + e);
+                        }
+                        return -1;
                 }
 
@@ -48 +79 @@
                                 ConnectionManager cm = GetConnectionManager ();
 
-                                return cm.GetClientInfoForEntityId (_entityId);
+                                if (cm.mapClientToEntity.ContainsValue (_entityId)) {
+                                        foreach (KeyValuePair<int, int> kvp in cm.mapClientToEntity) {
+                                                if (kvp.Value == _entityId) {
+                                                        return cm.connectedClients [kvp.Key];
+                                                }
+                                        }
+                                }
+
+                                return null;
                         } catch (Exception e) {
                                 Log.Out ("Error getting ClientInfo for entity ID: " + e);
@@ -118 +157 @@
                 public static ClientInfo GetClientInfoFromSteamID (string _steamId)
                 {
-                        return GetConnectionManager ().GetClientInfoForPlayerId (_steamId);
+                        try {
+                                foreach (string name in Steam.Authentication.Server.usersToIDs.Keys) {
+                                        string curId = string.Empty + Steam.Authentication.Server.usersToIDs[name].steamID.m_SteamID;
+                                        if (curId.Equals (_steamId)) {
+                                                return GetClientInfoFromPlayerName (name, false);
+                                        }
+                                }
+                        } catch (Exception e) {
+                                Log.Out ("Error getting ClientInfo for steam ID: " + e);
+                        }
+                        return null;
                 }