diff options
| author | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2016-01-18 23:07:37 -0500 |
|---|---|---|
| committer | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2016-01-18 23:07:37 -0500 |
| commit | 98596bf290559eb84944e3a1e93eb393890e964a (patch) | |
| tree | a2ec688367d242edb96417c309e65eb7af690692 /gamemode/shared/player_transferitem.lua | |
| parent | f8f7483f4c2bfafb7e92a073fce6694928ff1f70 (diff) | |
| parent | 1110c67135c099f4f71dbb3fd9f1d0137c7083fb (diff) | |
| download | wintersurvival2-98596bf290559eb84944e3a1e93eb393890e964a.tar.gz wintersurvival2-98596bf290559eb84944e3a1e93eb393890e964a.tar.bz2 wintersurvival2-98596bf290559eb84944e3a1e93eb393890e964a.zip | |
Merge branch 'queue' into development
Conflicts:
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod.htm
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/angular.js
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/embed.htm
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.css
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.js
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/jquery.js
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.css
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.php
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.css
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.php
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_003.php
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_004.php
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_005.php
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/poweredby_mediawiki_88x31.png
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/rainbow.js
doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/smw_button.png
Diffstat (limited to 'gamemode/shared/player_transferitem.lua')
| -rw-r--r-- | gamemode/shared/player_transferitem.lua | 20 |
1 files changed, 10 insertions, 10 deletions
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
|