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

Timestamp:

Jul 26, 2014, 6:38:49 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes

Files:

• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• src/CommonMappingFunctions.cs (modified) (6 diffs)
• src/TelnetCommands/SayToPlayer.cs (modified) (1 diff)

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using ManagedSteam.SteamTypes;
 
@@ -101 +102 @@
         }
 
-        public static ClientInfo GetClientInfoFromPlayerName (string _playerName)
+        public static ClientInfo GetClientInfoFromPlayerName (string _playerName, bool ignoreColorcodes)
         {
                 try {
@@ -107 +108 @@
 
                         _playerName = _playerName.ToLower ();
+                        if (ignoreColorcodes) {
+                                _playerName = Regex.Replace (_playerName, "\\[[0-9a-fA-F]{6}\\]", "");
+                        }
                         foreach (ClientInfo ci in cm.connectedClients.Values) {
-                                if (GetPlayerName (ci).ToLower ().Equals (_playerName)) {
+                                string curName = GetPlayerName (ci).ToLower ();
+                                if (ignoreColorcodes) {
+                                        curName = Regex.Replace (curName, "\\[[0-9a-fA-F]{6}\\]", "");
+                                }
+                                if (curName.Equals (_playerName)) {
                                         return ci;
                                 }
@@ -118 +126 @@
         }
 
-        public static ClientInfo GetClientInfoFromNameOrID (string _nameOrId)
+        public static ClientInfo GetClientInfoFromNameOrID (string _nameOrId, bool ignoreColorcodes)
         {
                 try {
@@ -128 +136 @@
                         }
 
-                        return GetClientInfoFromPlayerName (_nameOrId);
+                        return GetClientInfoFromPlayerName (_nameOrId, ignoreColorcodes);
                 } catch (Exception e) {
                         Log.Out ("Error getting ClientInfo for entity ID or player name: " + e);
@@ -142 +150 @@
                                 string curId = string.Empty + ((SteamID)kvp.Value).AsUInt64;
                                 if (curId.Equals (_steamId)) {
-                                        return GetClientInfoFromPlayerName (kvp.Key);
+                                        return GetClientInfoFromPlayerName (kvp.Key, false);
                                 }
                         }

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

@@ -51 +51 @@
                 }
 
-                ClientInfo receiver = CommonMappingFunctions.GetClientInfoFromNameOrID (_params [0]);
+                ClientInfo receiver = CommonMappingFunctions.GetClientInfoFromNameOrID (_params [0], true);
                 if (receiver != null) {
                         SendMessage (receiver, _sender, message);