Check PhysObj comparison edge case

Should close #390
ACF-Team · Feb 20, 2024 · 81164f1 · 81164f1
1 parent 9181811
commit 81164f1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lua/acf/core/validation_sv.lua b/lua/acf/core/validation_sv.lua
@@ -35,7 +35,7 @@ function ACF.IsLegal(Entity)
 
 	local Phys = Entity:GetPhysicsObject()
 
-	if Entity.ACF.PhysObj ~= Phys then
+	if not IsValid(Entity.ACF.PhysObj) or Entity.ACF.PhysObj ~= Phys then
 		if Phys:GetVolume() then
 			Entity.ACF.PhysObj = Phys -- Updated PhysObj
 		else
@@ -204,7 +204,7 @@ function ACF.Check(Entity, ForceUpdate) -- IsValid but for ACF
 		end
 
 		ACF.Activate(Entity)
-	elseif ForceUpdate or Entity.ACF.Mass ~= PhysObj:GetMass() or Entity.ACF.PhysObj ~= PhysObj then
+	elseif ForceUpdate or Entity.ACF.Mass ~= PhysObj:GetMass() or (not IsValid(Entity.ACF.PhysObj) or Entity.ACF.PhysObj ~= PhysObj) then
 		ACF.Activate(Entity, true)
 	end