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

Timestamp:

Sep 21, 2014, 7:20:16 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

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

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

@@ -21 +21 @@
                 {
                         //Log.Out ("Updating player inventory - player id: " + pdf.id);
-                        ProcessInv (bag, pdf.bag);
-                        ProcessInv (belt, pdf.inventory);
+                        ProcessInv (bag, pdf.bag, pdf.id);
+                        ProcessInv (belt, pdf.inventory, pdf.id);
                 }
 
-                private void ProcessInv (List<InvItem> target, InventoryField[] sourceFields)
+                private void ProcessInv (List<InvItem> target, InventoryField[] sourceFields, int id)
                 {
                         lock (target) {
@@ -32 +32 @@
                                         if (sourceFields [i].count > 0) {
                                                 int count = sourceFields [i].count;
+                                                int maxAllowed = ItemBase.list [sourceFields [i].itemValue.type].StackNumber;
                                                 string name = getInvFieldName (sourceFields [i]);
 
+                                                if (count > maxAllowed)
+                                                        Log.Out ("Player with ID " + id + " has stack for \"" + name + "\" greater than allowed (" + count + " > " + maxAllowed + ")");
                                                 target.Add (new InvItem (name, count));
                                         } else {
@@ -45 +48 @@
                 {
                         ItemBase iBase = ItemBase.list [item.itemValue.type];
-                        return iBase.GetItemName(item.itemValue);
+                        return iBase.GetItemName (item.itemValue);
                 }