edshot99/ulib
1
0
Fork 0
forked from TeamUlysses/ulib
Code Pull Requests Activity

Fix Weapon SetClipErrors (#76)

Browse Source 
* fix: result isn't used in this context.

* fix: the docs say ply, we use ply.

* perf: we don't need to call that twice.

* fix: printname isn't a name, it's class. localise class.

* fix: fix weapon error if not given.

replace printname with class.
only call getweapon if we can't get it through give.

* fix: Make sure SetClip1 and SetClip2 actually exist before we call them.
This commit is contained in:
Joshua Piper 2022-08-05 04:14:54 +01:00 committed by GitHub
parent f401c2a656
commit bde520a16a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lua/ulib/server/player.lua
View File

@ -207,26 +207,27 @@ end
Updates player object to store health and armor. Has no effect unless ULib.Spawn is used later.
]]
function ULib.getSpawnInfo( player )
local result = {}
function ULib.getSpawnInfo( ply )
local t = {}
player.ULibSpawnInfo = t
t.health = player:Health()
t.armor = player:Armor()
if player:GetActiveWeapon():IsValid() then
t.curweapon = player:GetActiveWeapon():GetClass()
ply.ULibSpawnInfo = t
t.health = ply:Health()
t.armor = ply:Armor()
local wep = ply:GetActiveWeapon()
if IsValid( wep ) then
t.curweapon = wep:GetClass()
end
local weapons = player:GetWeapons()
local data = {}
local weapons = ply:GetWeapons()
for _, weapon in ipairs( weapons ) do
printname = weapon:GetClass()
data[ printname ] = {}
data[ printname ].clip1 = weapon:Clip1()
data[ printname ].clip2 = weapon:Clip2()
data[ printname ].ammo1 = player:GetAmmoCount( weapon:GetPrimaryAmmoType() )
data[ printname ].ammo2 = player:GetAmmoCount( weapon:GetSecondaryAmmoType() )
local class = weapon:GetClass()
data[ class ] = {}
data[ class ].clip1 = weapon:Clip1()
data[ class ].clip2 = weapon:Clip2()
data[ class ].ammo1 = ply:GetAmmoCount( weapon:GetPrimaryAmmoType() )
data[ class ].ammo2 = ply:GetAmmoCount( weapon:GetSecondaryAmmoType() )
end
t.data = data
end
@ -238,14 +239,25 @@ local function doWeapons( player, t )
player:StripAmmo()
player:StripWeapons()
for printname, data in pairs( t.data ) do
player:Give( printname )
local weapon = player:GetWeapon( printname )
for class, data in pairs( t.data ) do
local weapon = player:Give( class )
if not IsValid( weapon ) then
weapon = player:GetWeapon( class )
end
if IsValid( weapon ) then
if weapon.SetClip1 then
weapon:SetClip1( data.clip1 )
end
if weapon.SetClip2 then
weapon:SetClip2( data.clip2 )
end
player:SetAmmo( data.ammo1, weapon:GetPrimaryAmmoType() )
player:SetAmmo( data.ammo2, weapon:GetSecondaryAmmoType() )
end
end
if t.curweapon then
player:SelectWeapon( t.curweapon )