mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-08-30 17:58:54 +00:00
Minor change to functions
Add a TriggerEvent to `ESX.SetPlayerData` so we can tell other resources to update Only set networked vehicles as persistent and able to migrate Return entityCoords from `ESX.Game.GetVehicleInDirection` Only run `ServerSyncLoops` while ESX.PlayerLoaded is true Create an imports file to set ESX object and EventHandler for `esx:setPlayerData`
This commit is contained in:
@@ -42,6 +42,7 @@ end
|
||||
|
||||
ESX.SetPlayerData = function(key, val)
|
||||
ESX.PlayerData[key] = val
|
||||
TriggerEvent('esx:setPlayerData', key, val)
|
||||
end
|
||||
|
||||
ESX.ShowNotification = function(msg)
|
||||
@@ -365,10 +366,12 @@ ESX.Game.SpawnVehicle = function(model, coords, heading, cb, networked)
|
||||
ESX.Streaming.RequestModel(model)
|
||||
|
||||
local vehicle = CreateVehicle(model, vector.xyz, heading, networked, false)
|
||||
local id = NetworkGetNetworkIdFromEntity(vehicle)
|
||||
|
||||
SetNetworkIdCanMigrate(id, true)
|
||||
SetEntityAsMissionEntity(vehicle, true, false)
|
||||
if networked then
|
||||
local id = NetworkGetNetworkIdFromEntity(vehicle)
|
||||
SetNetworkIdCanMigrate(id, true)
|
||||
SetEntityAsMissionEntity(vehicle, true, false)
|
||||
end
|
||||
SetVehicleHasBeenOwnedByPlayer(vehicle, true)
|
||||
SetVehicleNeedsToBeHotwired(vehicle, false)
|
||||
SetModelAsNoLongerNeeded(model)
|
||||
@@ -494,7 +497,8 @@ ESX.Game.GetVehicleInDirection = function()
|
||||
local numRayHandle, hit, endCoords, surfaceNormal, entityHit = GetShapeTestResult(rayHandle)
|
||||
|
||||
if hit == 1 and GetEntityType(entityHit) == 2 then
|
||||
return entityHit
|
||||
local entityCoords = GetEntityCoords(entityHit)
|
||||
return entityHit, entityCoords
|
||||
end
|
||||
|
||||
return nil
|
||||
|
||||
+2
-2
@@ -352,7 +352,7 @@ end
|
||||
function StartServerSyncLoops()
|
||||
-- keep track of ammo
|
||||
Citizen.CreateThread(function()
|
||||
while true do
|
||||
while ESX.PlayerLoaded do
|
||||
Citizen.Wait(1000)
|
||||
|
||||
local letSleep = true
|
||||
@@ -379,7 +379,7 @@ function StartServerSyncLoops()
|
||||
Citizen.CreateThread(function()
|
||||
local previousCoords = vector3(ESX.PlayerData.coords.x, ESX.PlayerData.coords.y, ESX.PlayerData.coords.z)
|
||||
|
||||
while true do
|
||||
while ESX.PlayerLoaded do
|
||||
Citizen.Wait(1500)
|
||||
local playerPed = PlayerPedId()
|
||||
|
||||
|
||||
@@ -73,6 +73,7 @@ ui_page {
|
||||
}
|
||||
|
||||
files {
|
||||
'imports.lua',
|
||||
'locale.js',
|
||||
'html/ui.html',
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
ESX = exports['es_extended']:getSharedObject()
|
||||
|
||||
AddEventHandler('esx:setPlayerData', function(key, val)
|
||||
if GetInvokingResource() == 'es_extended' then
|
||||
ESX.PlayerData[key] = val
|
||||
end
|
||||
end)
|
||||
Reference in New Issue
Block a user