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

Timestamp:

Aug 30, 2014, 6:11:18 PM (10 years ago)

Author:

alloc

Message:

Fixes

File:

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

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

@@ -136 +136 @@
                 {
                         try {
-                                int entityId = -1;
-                                if (int.TryParse (_nameOrId, out entityId)) {
-                                        ClientInfo ci = GetClientInfoFromEntityID (entityId);
-                                        if (ci != null)
-                                                return ci;
+                                long tempLong;
+                                if (_nameOrId.Length == 17 && long.TryParse (_nameOrId, out tempLong)) {
+                                        return GetClientInfoFromSteamID (_nameOrId);
+                                } else {
+                                        int entityId = -1;
+                                        if (int.TryParse (_nameOrId, out entityId)) {
+                                                ClientInfo ci = GetClientInfoFromEntityID (entityId);
+                                                if (ci != null)
+                                                        return ci;
+                                        }
+
+                                        return GetClientInfoFromPlayerName (_nameOrId, ignoreColorcodes);
                                 }
-
-                                return GetClientInfoFromPlayerName (_nameOrId, ignoreColorcodes);
                         } catch (Exception e) {
-                                Log.Out ("Error getting ClientInfo for entity ID or player name: " + e);
+                                Log.Out ("Error getting ClientInfo for steam ID / entity ID / player name \"" + _nameOrId + "\": " + e);
                         }
                         return null;