Allow constraints with world entity (#2782)

* Add world to isOwner check in checkEnts * nil check * Changes
wiremod · Oct 6, 2023 · e824652 · e824652
1 parent cd4d012
commit e824652
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lua/entities/gmod_wire_expression2/core/custom/constraintcore.lua b/lua/entities/gmod_wire_expression2/core/custom/constraintcore.lua
@@ -91,11 +91,17 @@ local countLookup = {
 
 
 local function checkEnts(self, ent1, ent2)
-	if not IsValid(ent1) and not ent1:IsWorld() then return self:throw("Invalid entity!", false) end
-	if not IsValid(ent2) and not ent2:IsWorld() then return self:throw("Invalid target entity!", false) end
+	if not ent1 or not ent2 then return self:throw("Invalid entity!", false) end
 
-	if not isOwner(self, ent1) then return self:throw("You are not the owner of the entity!", false) end
-	if not isOwner(self, ent2) then return self:throw("You are not the owner of the target entity!", false) end
+	if not ent1:IsWorld() then
+		if not ent1:IsValid() then return self:throw("Invalid entity!", false) end
+		if not isOwner(self, ent1) then return self:throw("You are not the owner of the entity!", false) end
+	end
+
+	if not ent2:IsWorld() then
+		if not ent2:IsValid() then return self:throw("Invalid target entity!", false) end
+		if not isOwner(self, ent2) then return self:throw("You are not the owner of the target entity!", false) end
+	end
 
 	if ent1:IsPlayer() or ent2:IsPlayer() then return self:throw("Cannot constrain players!", false) end
 	return true