FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-17 06:56:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(zones/client): do not overwrite zone.distance with contains

Browse Source 
Manually calling the contains method would overwrite zone distance.
Also move Wait to the end of the thread to prevent race conditions.
This commit is contained in:
Linden
2022-08-10 23:45:48 +10:00
parent 0bce238304
commit 231ca90b8f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
imports/zones/client.lua
View File

@@ -223,13 +223,13 @@ local tick
CreateThread(function()
while true do
Wait(300)
local coords = GetEntityCoords(cache.ped)
table.wipe(inside)
insideCount = 0
for _, zone in pairs(Zones) do
local contains = zone:contains(coords)
zone.distance = #(zone.coords - coords)
if contains then
if zone.onEnter and not zone.insideZone then
@@ -275,6 +275,8 @@ CreateThread(function()
elseif insideCount == 0 then
tick = ClearInterval(tick)
end
Wait(300)
end
end)
@@ -302,13 +304,11 @@ end
local glm_polygon_contains = glm.polygon.contains
local function contains(self, coords)
self.distance = #(self.coords - coords)
return glm_polygon_contains(self.polygon, coords, self.thickness / 4)
end
local function insideSphere(self, coords)
self.distance = #(self.coords - coords)
return self.distance < self.radius
return #(self.coords - coords) < self.radius
end
return {