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

refactor+fix(esx/client): Remove checks performed by the function

Browse Source 
- Also resolves an issue with ESX.PlayerData.dead never setting as true
This commit is contained in:
Linden
2021-07-22 20:38:06 +10:00
parent 1c0f806cda
commit 99cd701286
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/client/main.lua
+5 -8
View File
@@ -84,15 +84,13 @@ RegisterNetEvent('esx:setMaxWeight')
AddEventHandler('esx:setMaxWeight', function(newMaxWeight) ESX.PlayerData.maxWeight = newMaxWeight end)
AddEventHandler('esx:onPlayerSpawn', function()
local playerPed = PlayerPedId()
if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end
if ESX.PlayerData.dead ~= false then ESX.SetPlayerData('dead', false) end
ESX.SetPlayerData('ped', PlayerPedId())
ESX.SetPlayerData('dead', false)
end)
AddEventHandler('esx:onPlayerDeath', function()
local playerPed = PlayerPedId()
if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end
if ESX.PlayerData.dead ~= false then ESX.SetPlayerData('dead', true) end
ESX.SetPlayerData('ped', PlayerPedId())
ESX.SetPlayerData('dead', true)
end)
AddEventHandler('skinchanger:modelLoaded', function()
@@ -103,8 +101,7 @@ AddEventHandler('skinchanger:modelLoaded', function()
end)
AddEventHandler('esx:restoreLoadout', function()
local playerPed = PlayerPedId()
if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end
ESX.SetPlayerData('ped', PlayerPedId())
local ammoTypes = {}
RemoveAllPedWeapons(ESX.PlayerData.ped, true)