weaponchecker: Fixed error when player already owns weapon upon retur…

…ning Fixes #2866
FPtje · Apr 8, 2019 · 1e6f9a1 · 1e6f9a1
1 parent 5210104
commit 1e6f9a1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/entities/weapons/weaponchecker/shared.lua b/entities/weapons/weaponchecker/shared.lua
@@ -221,6 +221,11 @@ function SWEP:Reload()
     else
         for _, v in pairs(ent.ConfiscatedWeapons) do
             local wep = ent:Give(v.class)
+
+            -- :Give returns NULL when the player already has the weapon
+            wep = IsValid(wep) and wep or ent:GetWeapon(v.class)
+            if not IsValid(wep) then continue end
+
             ent:RemoveAllAmmo()
             ent:SetAmmo(v.primaryAmmoCount, v.primaryAmmoType, false)
             ent:SetAmmo(v.secondaryAmmoCount, v.secondaryAmmoType, false)