Changeset 326 for binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

Timestamp:

Sep 4, 2018, 2:33:52 PM (6 years ago)

Author:

alloc

Message:

More cleanup, allocation improvements

File:

• binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs (modified) (4 diffs)

binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

@@ -6 +6 @@
         [Serializable]
         public class Players {
-                private readonly Dictionary<string, Player> players = new Dictionary<string, Player> ();
+                private readonly Dictionary<string, Player> players = new CaseInsensitiveStringDictionary<Player> ();
 
                 public Player this [string steamId, bool create] {
@@ -18 +18 @@
                                 }
 
-                                if (create && steamId != null && steamId.Length == 17) {
-                                        Log.Out ("Created new player entry for ID: " + steamId);
-                                        Player p = new Player (steamId);
-                                        players.Add (steamId, p);
-                                        return p;
+                                if (!create || steamId.Length != 17) {
+                                        return null;
                                 }
 
-                                return null;
+                                Log.Out ("Created new player entry for ID: " + steamId);
+                                Player p = new Player (steamId);
+                                players.Add (steamId, p);
+                                return p;
                         }
                 }
@@ -56 +56 @@
                         }
 
-                        int entityId = -1;
+                        int entityId;
                         if (int.TryParse (_nameOrId, out entityId)) {
                                 foreach (KeyValuePair<string, Player> kvp in players) {
@@ -65 +65 @@
                         }
 
-                        _nameOrId = _nameOrId.ToLower ();
                         foreach (KeyValuePair<string, Player> kvp in players) {
-                                string name = kvp.Value.Name.ToLower ();
+                                string name = kvp.Value.Name;
                                 if (_ignoreColorCodes) {
                                         name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", "");
                                 }
 
-                                if (kvp.Value.IsOnline && name.Equals (_nameOrId)) {
+                                if (kvp.Value.IsOnline && name.EqualsCaseInsensitive (_nameOrId)) {
                                         return kvp.Key;
                                 }