starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-30 17:58:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sleep loop if it's OK

Browse Source
This commit is contained in:
ElPumpo
2019-01-11 22:53:47 +01:00
parent cc371bad9f
commit 97a3896020
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+15 -7
View File
@@ -1713,18 +1713,17 @@ end)
RegisterNetEvent('esx_policejob:putInVehicle')
AddEventHandler('esx_policejob:putInVehicle', function()
local playerPed = PlayerPedId()
local coords = GetEntityCoords(playerPed)
local coords = GetEntityCoords(playerPed)
if not IsHandcuffed then
return
end
if IsAnyVehicleNearPoint(coords.x, coords.y, coords.z, 5.0) then
local vehicle = GetClosestVehicle(coords.x, coords.y, coords.z, 5.0, 0, 71)
if IsAnyVehicleNearPoint(coords, 5.0) then
local vehicle = GetClosestVehicle(coords, 5.0, 0, 71)
if DoesEntityExist(vehicle) then
local maxSeats = GetVehicleMaxNumberOfPassengers(vehicle)
local freeSeat = nil
local maxSeats, freeSeat = GetVehicleMaxNumberOfPassengers(vehicle)
for i=maxSeats - 1, 0, -1 do
if IsVehicleSeatFree(vehicle, i) then
@@ -1733,7 +1732,7 @@ AddEventHandler('esx_policejob:putInVehicle', function()
end
end
if freeSeat ~= nil then
if freeSeat then
TaskWarpPedIntoVehicle(playerPed, vehicle, freeSeat)
DragStatus.IsDragged = false
end
@@ -1843,7 +1842,7 @@ Citizen.CreateThread(function()
local playerPed = PlayerPedId()
local coords = GetEntityCoords(playerPed)
local isInMarker, hasExited = false, false
local isInMarker, hasExited, letSleep = false, false, true
local currentStation, currentPart, currentPartNum
for k,v in pairs(Config.PoliceStations) do
@@ -1853,6 +1852,7 @@ Citizen.CreateThread(function()
if distance < Config.DrawDistance then
DrawMarker(20, v.Cloakrooms[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
letSleep = false
end
if distance < Config.MarkerSize.x then
@@ -1865,6 +1865,7 @@ Citizen.CreateThread(function()
if distance < Config.DrawDistance then
DrawMarker(21, v.Armories[i], 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.5, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
letSleep = false
end
if distance < Config.MarkerSize.x then
@@ -1877,6 +1878,7 @@ Citizen.CreateThread(function()
if distance < Config.DrawDistance then
DrawMarker(36, v.Vehicles[i].Spawner, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
letSleep = false
end
if distance < Config.MarkerSize.x then
@@ -1889,6 +1891,7 @@ Citizen.CreateThread(function()
if distance < Config.DrawDistance then
DrawMarker(34, v.Helicopters[i].Spawner, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
letSleep = false
end
if distance < Config.MarkerSize.x then
@@ -1902,6 +1905,7 @@ Citizen.CreateThread(function()
if distance < Config.DrawDistance then
DrawMarker(22, v.BossActions[i] + 1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
letSleep = false
end
if distance < Config.MarkerSize.x then
@@ -1933,6 +1937,10 @@ Citizen.CreateThread(function()
TriggerEvent('esx_policejob:hasExitedMarker', LastStation, LastPart, LastPartNum)
end
if letSleep then
Citizen.Wait(500)
end
end
else
config.lua
+1 -1
View File
@@ -52,7 +52,7 @@ Config.PoliceStations = {
},
{
Spawner = vector3(473.3, -1018.4, 27.0),
Spawner = vector3(473.3, -1018.8, 28.0),
InsideShop = vector3(228.5, -993.5, -99.0),
SpawnPoints = {
{ coords = vector3(475.9, -1021.6, 28.0), heading = 276.1, radius = 6.0 },