Merge branch 'dev' of https://github.com/The-Order-Of-The-Sacred-Framework/community_bridge into dev
This commit is contained in:
commit
c34b1cce27
2 files changed
+5
-6
No files matched your search
@@ -64,7 +64,7 @@ function Point.StartLoop()
|
||||
end
|
||||
end
|
||||
else
|
||||
local distance = #(coords.xyz - point.coords.xyz)
|
||||
local distance = #(vector3(coords.x, coords.y, coords.z) - vector3(point.coords.x, point.coords.y, point.coords.z))
|
||||
if distance < point.distance then
|
||||
if not point.inside then
|
||||
point.inside = true
|
||||
@@ -131,7 +131,6 @@ function Point.UpdateCoords(id, coords)
|
||||
if oldGrid then
|
||||
oldGrid[point.id] = nil
|
||||
end
|
||||
-- Add to new grid
|
||||
point.coords = coords
|
||||
newGrid[point.id] = point
|
||||
return true
|
||||
|
||||
@@ -126,7 +126,7 @@ function Utility.CreateBlip(coords, sprite, color, scale, label, shortRange, dis
|
||||
AddTextEntry(label, label)
|
||||
BeginTextCommandSetBlipName(label)
|
||||
EndTextCommandSetBlipName(blip)
|
||||
blipIDs[tostring(blip)] = true
|
||||
blipIDs[tostring(blip)] = blip
|
||||
return blip
|
||||
end
|
||||
|
||||
@@ -150,7 +150,7 @@ function Utility.CreateEntityBlip(entity, sprite, color, scale, label, shortRang
|
||||
AddTextEntry(label, label)
|
||||
BeginTextCommandSetBlipName(label)
|
||||
EndTextCommandSetBlipName(blip)
|
||||
blipIDs[tostring(blip)] = true
|
||||
blipIDs[tostring(blip)] = blip
|
||||
return blip
|
||||
end
|
||||
|
||||
@@ -158,8 +158,8 @@ end
|
||||
---@param blip number
|
||||
---@return boolean
|
||||
function Utility.RemoveBlip(blip)
|
||||
if not blipIDs[tostring(blip)] then return false end
|
||||
RemoveBlip(blip)
|
||||
if not blipIDs[tostring(blip)] then return false, print("NO BLIP BY ID") end
|
||||
RemoveBlip(blipIDs[tostring(blip)])
|
||||
blipIDs[tostring(blip)] = nil
|
||||
return true
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user