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

Timestamp:

Jul 24, 2014, 3:25:58 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

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

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

@@ -13 +13 @@
                         foreach (InventoryField item in _belt) {
                                 if (item.count > 0) {
-                                        string name = getInvFieldName(item);
-                                        if (belt.ContainsKey(name)) {
-                                                belt[name] += item.count;
+                                        string name = getInvFieldName (item);
+                                        if (belt.ContainsKey (name)) {
+                                                belt [name] += item.count;
                                         } else {
                                                 belt.Add (name, item.count);
@@ -24 +24 @@
                         foreach (InventoryField item in _bag) {
                                 if (item.count > 0) {
-                                        string name = getInvFieldName(item);
-                                        if (bag.ContainsKey(name)) {
-                                                bag[name] += item.count;
+                                        string name = getInvFieldName (item);
+                                        if (bag.ContainsKey (name)) {
+                                                bag [name] += item.count;
                                         } else {
                                                 bag.Add (name, item.count);
@@ -47 +47 @@
         public static void GM_SavePlayerData (GameManager manager, int _clientId, PlayerDataFile _playerDataFile)
         {
-                if (manager.connectionManager.mapClientToEntity.ContainsKey (_clientId)) {
-                        int entityId = manager.connectionManager.mapClientToEntity [_clientId];
-                        Log.Out ("Saving playerData for entity id: " + entityId);
+                try {
+                        int entityId = CommonMappingFunctions.GetEntityID (CommonMappingFunctions.GetClientInfoFromClientID (_clientId));
+                        if (entityId >= 0) {
+                                Log.Out ("Saving playerData for entity id: " + entityId);
 
-                        if (itemsPerEntityId.ContainsKey(entityId))
-                                itemsPerEntityId.Remove(entityId);
-                        itemsPerEntityId.Add (entityId, new PlayerItems (_playerDataFile.inventory, _playerDataFile.bag));
+                                if (itemsPerEntityId.ContainsKey (entityId))
+                                        itemsPerEntityId.Remove (entityId);
+                                itemsPerEntityId.Add (entityId, new PlayerItems (_playerDataFile.inventory, _playerDataFile.bag));
+                        }
+                } catch (Exception e) {
+                        Log.Out ("Error in GM_SavePlayerData: " + e);
                 }
                 /*