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

Support latest esx

Browse Source
This commit is contained in:
ElPumpo
2020-03-24 10:33:56 +01:00
parent 739a228dd2
commit 2da17bc123
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+4 -5
View File
@@ -28,12 +28,10 @@ AddEventHandler('esx:setJob', function(job)
ESX.PlayerData.job = job
end)
AddEventHandler('playerSpawned', function()
AddEventHandler('esx:onPlayerSpawn', function()
isDead = false
TriggerServerEvent('esx_ambulancejob:onPlayerSpawn')
if firstSpawn then
exports.spawnmanager:setAutoSpawn(false) -- disable respawn
firstSpawn = false
if Config.AntiCombatLog then
@@ -310,10 +308,11 @@ function RespawnPed(ped, coords, heading)
SetEntityCoordsNoOffset(ped, coords.x, coords.y, coords.z, false, false, false, true)
NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z, heading, true, false)
SetPlayerInvincible(ped, false)
TriggerEvent('playerSpawned', coords.x, coords.y, coords.z)
ClearPedBloodDamage(ped)
ESX.UI.Menu.CloseAll()
TriggerServerEvent('esx:onPlayerSpawn')
TriggerEvent('esx:onPlayerSpawn')
TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon
end
RegisterNetEvent('esx_phone:loaded')
server/main.lua
+2 -2
View File
@@ -43,8 +43,8 @@ AddEventHandler('esx_ambulancejob:onPlayerDistress', function()
end
end)
RegisterNetEvent('esx_ambulancejob:onPlayerSpawn')
AddEventHandler('esx_ambulancejob:onPlayerSpawn', function()
RegisterNetEvent('esx:onPlayerSpawn')
AddEventHandler('esx:onPlayerSpawn', function()
if deadPlayers[source] then
deadPlayers[source] = nil
TriggerClientEvent('esx_ambulancejob:setDeadPlayers', -1, deadPlayers)