aboutsummaryrefslogtreecommitdiff
path: root/entities/weapons
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2017-08-25 15:03:30 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2017-08-25 15:03:30 -0400
commit984b841c008ba29ead9ecb12aa86a57de2b0597a (patch)
tree079aa2cacacc2bb515788a40c94308b19fbeac08 /entities/weapons
parent233e478e40d72a091f70f18dc6846066a4f52016 (diff)
downloadartery-984b841c008ba29ead9ecb12aa86a57de2b0597a.tar.gz
artery-984b841c008ba29ead9ecb12aa86a57de2b0597a.tar.bz2
artery-984b841c008ba29ead9ecb12aa86a57de2b0597a.zip
Fixed some bugs
* Huntables now drop items correctly * Shop npcs work * Fixed a bug in shaped inventory
Diffstat (limited to 'entities/weapons')
-rw-r--r--entities/weapons/hands.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/entities/weapons/hands.lua b/entities/weapons/hands.lua
index 553c4f1..57c56d9 100644
--- a/entities/weapons/hands.lua
+++ b/entities/weapons/hands.lua
@@ -39,7 +39,7 @@ function SWEP:DefaultPickup()
if self.Pickup == nil then
local tr = self.Owner:GetEyeTrace()
local dist = self.Owner:GetPos():Distance(tr.HitPos)
- if dist < 100 and tr.Entity:GetMass() < 100 then
+ if dist < 100 and tr.Entity.GetMass and tr.Entity:GetMass() < 100 then
self.Pickup = tr.Entity
self.PickupAngles = tr.Entity:GetAngles()
self.PickupOffset = dist