From 978909d830dd173f8b018f36c5f142d225732ba1 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Sat, 19 Aug 2017 23:49:16 -0400 Subject: Fixed a bug with equipment inventories --- gamemode/inventorysystem/equipment/sh_equipment.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gamemode/inventorysystem') diff --git a/gamemode/inventorysystem/equipment/sh_equipment.lua b/gamemode/inventorysystem/equipment/sh_equipment.lua index 0cd62e9..8dc9442 100644 --- a/gamemode/inventorysystem/equipment/sh_equipment.lua +++ b/gamemode/inventorysystem/equipment/sh_equipment.lua @@ -108,7 +108,9 @@ end inv.Serialize = function(self) local tbl = {} for k,v in pairs(self.equiped) do - tbl[k] = v:Serialize() + if v then + tbl[k] = {v.Name, v:Serialize()} + end end return util.TableToJSON(tbl) end @@ -118,7 +120,7 @@ inv.DeSerialize = function(self,data) local tbl = util.JSONToTable(data) local cpy = table.Copy(self) for k,v in pairs(tbl) do - cpy.equiped[k] = itm.GetItemFromData(v) + cpy.equiped[k] = itm.GetItemByName(v[1]):DeSerialize(v[2]) end return cpy else -- cgit v1.2.3-70-g09d2