Changeset 98

Timestamp:

Jul 22, 2014, 8:39:11 AM (11 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes

Files:

• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• src/PlayerDataStuff.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/PlayerDataStuff.cs

@@ -9 +9 @@
                 public SortedList<string, int> bag = new SortedList<string, int> ();
 
-                public PlayerItems (InventoryField[] belt, InventoryField[] bag)
+                public PlayerItems (InventoryField[] _belt, InventoryField[] _bag)
                 {
-                        foreach (InventoryField item in belt) {
+                        foreach (InventoryField item in _belt) {
                                 if (item.count > 0) {
-                                        this.belt.Add (getInvFieldName (item), item.count);
+                                        string name = getInvFieldName(item);
+                                        if (belt.ContainsKey(name)) {
+                                                belt[name] += item.count;
+                                        } else {
+                                                belt.Add (name, item.count);
+                                        }
                                 }
                         }
 
-                        foreach (InventoryField item in bag) {
+                        foreach (InventoryField item in _bag) {
                                 if (item.count > 0) {
-                                        this.bag.Add (getInvFieldName (item), item.count);
+                                        string name = getInvFieldName(item);
+                                        if (bag.ContainsKey(name)) {
+                                                bag[name] += item.count;
+                                        } else {
+                                                bag.Add (name, item.count);
+                                        }
                                 }
                         }