Changeset 348 for binary-improvements/MapRendering/Web/API/GetPlayerInventories.cs

Timestamp:

Jan 19, 2019, 5:13:47 PM (6 years ago)

Author:

alloc

Message:

Fixed #156

File:

• binary-improvements/MapRendering/Web/API/GetPlayerInventories.cs (modified) (2 diffs)

binary-improvements/MapRendering/Web/API/GetPlayerInventories.cs

@@ -6 +6 @@
 namespace AllocsFixes.NetConnections.Servers.Web.API {
         public class GetPlayerInventories : WebAPI {
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user,
-                        int permissionLevel) {
+                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
+                        int _permissionLevel) {
+
+                        bool showIconColor, showIconName;
+                        GetPlayerInventory.GetInventoryArguments (_req, out showIconColor, out showIconName);
+
                         JSONArray AllInventoriesResult = new JSONArray ();
 
@@ -18 +22 @@
 
                                 if (p.IsOnline) {
-                                        PersistentData.Inventory inv = p.Inventory;
-
-                                        JSONObject result = new JSONObject ();
-                                        JSONArray bag = new JSONArray ();
-                                        JSONArray belt = new JSONArray ();
-                                        JSONObject equipment = new JSONObject ();
-                                        result.Add ("steamid", new JSONString (kvp.Key));
-                                        result.Add ("entityid", new JSONNumber (p.EntityID));
-                                        result.Add ("playername", new JSONString (p.Name));
-                                        result.Add ("bag", bag);
-                                        result.Add ("belt", belt);
-                                        result.Add ("equipment", equipment);
-
-                                        GetPlayerInventory.DoInventory (belt, inv.belt);
-                                        GetPlayerInventory.DoInventory (bag, inv.bag);
-
-                                        GetPlayerInventory.AddEquipment (equipment, "head", inv.equipment, EquipmentSlots.Headgear);
-                                        GetPlayerInventory.AddEquipment (equipment, "eyes", inv.equipment, EquipmentSlots.Eyewear);
-                                        GetPlayerInventory.AddEquipment (equipment, "face", inv.equipment, EquipmentSlots.Face);
-
-                                        GetPlayerInventory.AddEquipment (equipment, "armor", inv.equipment, EquipmentSlots.ChestArmor);
-                                        GetPlayerInventory.AddEquipment (equipment, "jacket", inv.equipment, EquipmentSlots.Jacket);
-                                        GetPlayerInventory.AddEquipment (equipment, "shirt", inv.equipment, EquipmentSlots.Shirt);
-
-                                        GetPlayerInventory.AddEquipment (equipment, "legarmor", inv.equipment, EquipmentSlots.LegArmor);
-                                        GetPlayerInventory.AddEquipment (equipment, "pants", inv.equipment, EquipmentSlots.Legs);
-                                        GetPlayerInventory.AddEquipment (equipment, "boots", inv.equipment, EquipmentSlots.Feet);
-
-                                        GetPlayerInventory.AddEquipment (equipment, "gloves", inv.equipment, EquipmentSlots.Hands);
-
-                                        AllInventoriesResult.Add (result);
+                                        AllInventoriesResult.Add (GetPlayerInventory.DoPlayer (kvp.Key, p, showIconName, showIconName));
                                 }
                         }
 
-                        WriteJSON (resp, AllInventoriesResult);
+                        WriteJSON (_resp, AllInventoriesResult);
                 }
         }