Changeset 326 for binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.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/Inventory.cs (modified) (1 diff)

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