diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-10-29 19:00:29 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-10-29 19:00:29 -0400 |
| commit | 5f2a8015bd5d2a42e79038bb52f20260d8d97ba0 (patch) | |
| tree | 4b2871efacec0fa75a45ab23a989ee6190e915fb | |
| parent | 79c1c484eab6fbf36a69d155a324540887e38880 (diff) | |
| download | artery-5f2a8015bd5d2a42e79038bb52f20260d8d97ba0.tar.gz artery-5f2a8015bd5d2a42e79038bb52f20260d8d97ba0.tar.bz2 artery-5f2a8015bd5d2a42e79038bb52f20260d8d97ba0.zip | |
Fixed HasItem() sometimes erroring
| -rw-r--r-- | entities/entities/art_droppeditem/cl_init.lua | 3 | ||||
| -rw-r--r-- | gamemode/shared/inventory.lua | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/entities/entities/art_droppeditem/cl_init.lua b/entities/entities/art_droppeditem/cl_init.lua index eb8868d..ceebc7f 100644 --- a/entities/entities/art_droppeditem/cl_init.lua +++ b/entities/entities/art_droppeditem/cl_init.lua @@ -21,9 +21,6 @@ hook.Add("Tick","pickupitemstick",function() local ae = ents.FindInSphere(lp:GetPos(),5) for k,v in pairs(ae) do local ei = v:EntIndex() - if ei ~= 1 and ei ~= -1 then - print("Checking if we should pick up", ei) - end if (not sentrequests[ei]) and v.GetClass and v:GetClass() == "art_droppeditem" then print("Sending request to pick up", ei) net.Start("art_requestpickup") diff --git a/gamemode/shared/inventory.lua b/gamemode/shared/inventory.lua index 2165686..7b6c9cd 100644 --- a/gamemode/shared/inventory.lua +++ b/gamemode/shared/inventory.lua @@ -108,7 +108,7 @@ function pmeta:HasItem(nameorcomparitor) for row = 1,v[2][2] do for col = 1,v[2][1] do local itemin = v[1][row][col] - if itemin ~= false and comparitor(itemin) then + if (type(itemin) ~= "boolean") and comparitor(itemin) then return row,col,n end end |