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

Timestamp:

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

Author:

alloc

Message:

More cleanup, allocation improvements

Location:

binary-improvements/7dtd-server-fixes/src/PersistentData

Files:

• Attributes.cs (modified) (1 diff)
• Inventory.cs (modified) (1 diff)
• PersistentContainer.cs (modified) (1 diff)
• Player.cs (modified) (2 diffs)
• Players.cs (modified) (4 diffs)

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

@@ -5 +5 @@
         public class Attributes {
                 private bool hideChatCommands;
-                private String hideChatCommandPrefix;
+                private string hideChatCommandPrefix;
 
                 public bool HideChatCommands {

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

@@ -58 +58 @@
 
                 private InvItem CreateInvItem (ItemValue _itemValue, int _count, int _playerId) {
-                        if (_count > 0 && _itemValue != null && !_itemValue.Equals (ItemValue.None)) {
-                                ItemClass itemClass = ItemClass.list [_itemValue.type];
-                                int maxAllowed = itemClass.Stacknumber.Value;
-                                string name = itemClass.GetItemName ();
-
-                                if (_count > maxAllowed) {
-                                        Log.Out ("Player with ID " + _playerId + " has stack for \"" + name + "\" greater than allowed (" +
-                                                 _count + " > " + maxAllowed + ")");
-                                }
-
-                                InvItem item = null;
-                                if (_itemValue.HasQuality) {
-                                        item = new InvItem (name, _count, _itemValue.Quality, _itemValue.MaxUseTimes, _itemValue.UseTimes);
-                                } else {
-                                        item = new InvItem (name, _count, -1, _itemValue.MaxUseTimes, _itemValue.UseTimes);
-                                }
-
-                                item.icon = itemClass.GetIconName ();
-
-                                item.iconcolor = AllocsUtils.ColorToHex (itemClass.GetIconTint ());
-
-                                return item;
+                        if (_count <= 0 || _itemValue == null || _itemValue.Equals (ItemValue.None)) {
+                                return null;
                         }
 
-                        return null;
+                        ItemClass itemClass = ItemClass.list [_itemValue.type];
+                        int maxAllowed = itemClass.Stacknumber.Value;
+                        string name = itemClass.GetItemName ();
+
+                        if (_count > maxAllowed) {
+                                Log.Out ("Player with ID " + _playerId + " has stack for \"" + name + "\" greater than allowed (" +
+                                         _count + " > " + maxAllowed + ")");
+                        }
+
+                        InvItem item;
+                        if (_itemValue.HasQuality) {
+                                item = new InvItem (name, _count, _itemValue.Quality, _itemValue.MaxUseTimes, _itemValue.UseTimes);
+                        } else {
+                                item = new InvItem (name, _count, -1, _itemValue.MaxUseTimes, _itemValue.UseTimes);
+                        }
+
+                        item.icon = itemClass.GetIconName ();
+
+                        item.iconcolor = AllocsUtils.ColorToHex (itemClass.GetIconTint ());
+
+                        return item;
                 }
         }

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

@@ -53 +53 @@
 
                 public static bool Load () {
-                        if (File.Exists (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
-                                try {
-                                        PersistentContainer obj;
-                                        Stream stream = File.Open (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
-                                        BinaryFormatter bFormatter = new BinaryFormatter ();
-                                        obj = (PersistentContainer) bFormatter.Deserialize (stream);
-                                        stream.Close ();
-                                        instance = obj;
-                                        return true;
-                                } catch (Exception e) {
-                                        Log.Error ("Exception in PersistentContainer.Load");
-                                        Log.Exception (e);
-                                }
+                        if (!File.Exists (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
+                                return false;
+                        }
+
+                        try {
+                                PersistentContainer obj;
+                                Stream stream = File.Open (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
+                                BinaryFormatter bFormatter = new BinaryFormatter ();
+                                obj = (PersistentContainer) bFormatter.Deserialize (stream);
+                                stream.Close ();
+                                instance = obj;
+                                return true;
+                        } catch (Exception e) {
+                                Log.Error ("Exception in PersistentContainer.Load");
+                                Log.Exception (e);
                         }
 

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

@@ -174 +174 @@
 
                 public void SetOffline () {
-                        if (clientInfo != null) {
-                                Log.Out ("Player set to offline: " + steamId);
-                                lastOnline = DateTime.Now;
-                                try {
-                                        Vector3i lastPos = new Vector3i (Entity.GetPosition ());
-                                        lastPositionX = lastPos.x;
-                                        lastPositionY = lastPos.y;
-                                        lastPositionZ = lastPos.z;
-                                        totalPlayTime += (long) (Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad);
-                                } catch (NullReferenceException) {
-                                        Log.Out ("Entity not available. Something seems to be wrong here...");
-                                }
-
-                                clientInfo = null;
-                        }
+                        if (clientInfo == null) {
+                                return;
+                        }
+
+                        Log.Out ("Player set to offline: " + steamId);
+                        lastOnline = DateTime.Now;
+                        try {
+                                Vector3i lastPos = new Vector3i (Entity.GetPosition ());
+                                lastPositionX = lastPos.x;
+                                lastPositionY = lastPos.y;
+                                lastPositionZ = lastPos.z;
+                                totalPlayTime += (long) (Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad);
+                        } catch (NullReferenceException) {
+                                Log.Out ("Entity not available. Something seems to be wrong here...");
+                        }
+
+                        clientInfo = null;
                 }
 
@@ -206 +208 @@
 
                 private void UpdateProgression (PlayerDataFile _pdf) {
-                        if (_pdf.progressionData.Length > 0) {
-                                using (PooledBinaryReader pbr = MemoryPools.poolBinaryReader.AllocSync (false)) {
-                                        pbr.SetBaseStream (_pdf.progressionData);
-                                        Progression p = Progression.Read (pbr, null);
-                                        expToNextLevel = (uint) p.ExpToNextLevel;
-                                        level = p.Level;
-                                }
+                        if (_pdf.progressionData.Length <= 0) {
+                                return;
+                        }
+
+                        using (PooledBinaryReader pbr = MemoryPools.poolBinaryReader.AllocSync (false)) {
+                                pbr.SetBaseStream (_pdf.progressionData);
+                                Progression p = Progression.Read (pbr, null);
+                                expToNextLevel = (uint) p.ExpToNextLevel;
+                                level = p.Level;
                         }
                 }

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;
                                 }