aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--entities/entities/ws_campfire/init.lua7
-rw-r--r--gamemode/shared/player_transferitem.lua20
2 files changed, 17 insertions, 10 deletions
diff --git a/entities/entities/ws_campfire/init.lua b/entities/entities/ws_campfire/init.lua
index 6a40aed..a57ccad 100644
--- a/entities/entities/ws_campfire/init.lua
+++ b/entities/entities/ws_campfire/init.lua
@@ -26,6 +26,13 @@ end
function ENT:Think()
if not self:IsOnFire() then
+ for k,v in pairs(self.StoredItems) do
+ local drop = ents.Create("ws_item")
+ drop.Item = GetItemByName(v.Name)
+ drop:SetModel(drop.Item.Model)
+ drop:SetPos(self:GetPos() + (self:GetUp()))
+ drop:Spawn()
+ end
self:Remove()
end
diff --git a/gamemode/shared/player_transferitem.lua b/gamemode/shared/player_transferitem.lua
index 944af63..6bdda59 100644
--- a/gamemode/shared/player_transferitem.lua
+++ b/gamemode/shared/player_transferitem.lua
@@ -1,28 +1,28 @@
-if (SERVER) then
+if (SERVER) then
util.AddNetworkString("RequestTransfer")
util.AddNetworkString("RequestTransferFrom")
-
+
net.Receive("RequestTransfer",function(siz,pl)
local item = net.ReadString()
local quan = net.ReadUInt(32)
local ent = net.ReadEntity()
-
+
if (!IsValid(ent) or !ent.AddItem) then return end
-
+
if (!pl:HasItem(item,quan)) then return end
-
+
pl:RemoveItem(item,quan)
ent:AddItem(item,quan)
end)
-
+
net.Receive("RequestTransferFrom",function(siz,pl)
local item = net.ReadString()
local quan = net.ReadUInt(32)
local ent = net.ReadEntity()
-
+
if (!IsValid(ent) or !ent.TakeItem) then return end
-
+
ent:TakeItem(pl,item,quan)
end)
else
@@ -33,7 +33,7 @@ else
net.WriteEntity(to)
net.SendToServer()
end
-
+
function DemandItems(item,quantity,from)
net.Start("RequestTransferFrom")
net.WriteString(item)
@@ -41,4 +41,4 @@ else
net.WriteEntity(from)
net.SendToServer()
end
-end \ No newline at end of file
+end