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

Timestamp:

Jul 31, 2023, 4:06:13 PM (16 months ago)

Author:

alloc

Message:

25_30_44

• Got rid (mostly) of custom JSON serialization
• Some code cleanup

File:

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

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

@@ -24 +24 @@
                 }
 
-                private void ProcessInv (List<InvItem> _target, ItemStack[] _sourceFields, int _id) {
+                private void ProcessInv (ICollection<InvItem> _target, IReadOnlyList<ItemStack> _sourceFields, int _id) {
                         _target.Clear ();
-                        for (int i = 0; i < _sourceFields.Length; i++) {
+                        for (int i = 0; i < _sourceFields.Count; i++) {
                                 InvItem item = CreateInvItem (_sourceFields [i].itemValue, _sourceFields [i].count, _id);
                                 if (item != null && _sourceFields [i].itemValue.Modifications != null) {
@@ -43 +43 @@
                 }
 
-                private void ProcessParts (ItemValue[] _parts, InvItem _item, int _playerId) {
-                        InvItem[] itemParts = new InvItem[_parts.Length];
-                        for (int i = 0; i < _parts.Length; i++) {
+                private void ProcessParts (IReadOnlyList<ItemValue> _parts, InvItem _item, int _playerId) {
+                        InvItem[] itemParts = new InvItem[_parts.Count];
+                        for (int i = 0; i < _parts.Count; i++) {
                                 InvItem partItem = CreateInvItem (_parts [i], 1, _playerId);
                                 if (partItem != null && _parts [i].Modifications != null) {
@@ -67 +67 @@
 
                         if (_count > maxAllowed) {
-                                Log.Out ("Player with ID " + _playerId + " has stack for \"" + name + "\" greater than allowed (" +
-                                         _count + " > " + maxAllowed + ")");
+                                Log.Out ($"Player with ID {_playerId} has stack for \"{name}\" greater than allowed ({_count} > {maxAllowed})");
                         }