Skip to content

Fixed an error when an object can be dropped #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TovarischPootis merged 2 commits into from
Apr 19, 2021
Merged

Fixed an error when an object can be dropped #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0d3ce6
Fixed an error when an object can be dropped.
FlorianLeChat Apr 19, 2021
087cc8f
While reviewing the commit, found another issue
TovarischPootis Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions entities/weapons/nut_hands.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ function SWEP:pickup(entity, trace)
local max_force = CARRY_FORCE_LIMIT

if (entity:GetClass() == "prop_ragdoll") then
self.dt.carried_rag = ent
self.dt.carried_rag = entity

bone = trace.PhysicsBone
max_force = 0
Expand All @@ -611,8 +611,9 @@ end
local down = Vector(0, 0, -1)
function SWEP:allowEntityDrop()
local client = self:GetOwner()
local ent = self.carryHack

if (not IsValid(client)) or (not IsValid(self.carryHack)) then return false end
if (not IsValid(client)) or (not IsValid(ent)) then return false end

local ground = client:GetGroundEntity()
if ground and (ground:IsWorld() or IsValid(ground)) then return true end
Expand Down