From d2868db28210b8c4debab2b70dca2833d582fdfd Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Fri, 23 Mar 2018 15:20:30 -0400 Subject: Refactored the inventory system Inventory system now uses flyweight pattern with metatables. --- gamemode/inventorysystem/prayers/sh_prayers.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gamemode/inventorysystem/prayers/sh_prayers.lua') diff --git a/gamemode/inventorysystem/prayers/sh_prayers.lua b/gamemode/inventorysystem/prayers/sh_prayers.lua index e1e7347..9d8ff3b 100644 --- a/gamemode/inventorysystem/prayers/sh_prayers.lua +++ b/gamemode/inventorysystem/prayers/sh_prayers.lua @@ -14,7 +14,7 @@ end inv.Name = "Prayers" inv.track = {} function inv:FindPlaceFor(item) - if item.isprayer then + if item.Pray ~= nil then return {#self.track} end return nil @@ -54,14 +54,15 @@ function inv:Serialize() end function inv:DeSerialize(str) - local cpy = table.Copy(self) + self.track = {} local tbl = util.JSONToTable(str) + tbl = tbl or {} local i = 1 for k,v in pairs(tbl) do local this_prayer = itm.GetItemByName(k):DeSerialize(v) - cpy:Put({i},this_prayer) + self:Put({i},this_prayer) end - return cpy + return self end -- cgit v1.2.3-70-g09d2