From 984b841c008ba29ead9ecb12aa86a57de2b0597a Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Fri, 25 Aug 2017 15:03:30 -0400 Subject: Fixed some bugs * Huntables now drop items correctly * Shop npcs work * Fixed a bug in shaped inventory --- entities/entities/art_droppeditem/init.lua | 4 +++- entities/weapons/hands.lua | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'entities') diff --git a/entities/entities/art_droppeditem/init.lua b/entities/entities/art_droppeditem/init.lua index afd3139..6c66ac8 100644 --- a/entities/entities/art_droppeditem/init.lua +++ b/entities/entities/art_droppeditem/init.lua @@ -67,7 +67,9 @@ net.Receive("art_requestpickup",function(len,pl) xpcall(function() pl:GiveItem(i) e:Remove() - end,function() --We couldn't put the item in the player's inventory! + end,function() + print("Unable to put item into player's inventory") + --We couldn't put the item in the player's inventory! --Don't do anything I guess end) else 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 -- cgit v1.2.3-70-g09d2