aboutsummaryrefslogtreecommitdiff
path: root/gamemode/inventorysystem/equipment
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2017-08-07 18:08:00 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2017-08-07 18:08:00 -0400
commit0ce40afcb04587bbccd39fc64a4928607c285c51 (patch)
tree8a82b316b7300864aca612c6b0c059e14c15bd37 /gamemode/inventorysystem/equipment
parent076b4245a757dc0ca9d1c9d234c32df546b1239e (diff)
downloadartery-0ce40afcb04587bbccd39fc64a4928607c285c51.tar.gz
artery-0ce40afcb04587bbccd39fc64a4928607c285c51.tar.bz2
artery-0ce40afcb04587bbccd39fc64a4928607c285c51.zip
Various additions and removals for server
Diffstat (limited to 'gamemode/inventorysystem/equipment')
-rw-r--r--gamemode/inventorysystem/equipment/cl_equipment.lua1
-rw-r--r--gamemode/inventorysystem/equipment/sh_equipment.lua1
2 files changed, 2 insertions, 0 deletions
diff --git a/gamemode/inventorysystem/equipment/cl_equipment.lua b/gamemode/inventorysystem/equipment/cl_equipment.lua
index 74152dc..57a07ad 100644
--- a/gamemode/inventorysystem/equipment/cl_equipment.lua
+++ b/gamemode/inventorysystem/equipment/cl_equipment.lua
@@ -181,6 +181,7 @@ inv.DrawOnDPanel = function(self,panel)
for k,v in pairs(pn:GetChildren()) do
v:Remove()
end
+ if pn.Entity then pn.Entity:Remove() end
end
return prox
end
diff --git a/gamemode/inventorysystem/equipment/sh_equipment.lua b/gamemode/inventorysystem/equipment/sh_equipment.lua
index be930e0..0cd62e9 100644
--- a/gamemode/inventorysystem/equipment/sh_equipment.lua
+++ b/gamemode/inventorysystem/equipment/sh_equipment.lua
@@ -120,6 +120,7 @@ inv.DeSerialize = function(self,data)
for k,v in pairs(tbl) do
cpy.equiped[k] = itm.GetItemFromData(v)
end
+ return cpy
else
return table.Copy(self)
end