starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-02 19:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from thelindat/patch-2

Browse Source 
fix(client/main): Fix nil tables after dying; resolve server hitch from update event
This commit is contained in:
ESXCrackhead
2021-06-23 08:06:39 -05:00
committed by GitHub
parent 6aed226671 4aa9525fcf
commit 92a9779f93
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+4 -7
View File
@@ -13,19 +13,19 @@ function GetStatusData(minimal)
for i=1, #Status, 1 do
if minimal then
status[#status+1] = {
table.insert(status, {
name = Status[i].name,
val = Status[i].val,
percent = (Status[i].val / Config.StatusMax) * 100
}
})
else
status[#status+1] {
table.insert(status, {
name = Status[i].name,
val = Status[i].val,
color = Status[i].color,
visible = Status[i].visible(Status[i]),
percent = (Status[i].val / Config.StatusMax) * 100
}
})
end
end
@@ -109,7 +109,6 @@ AddEventHandler('esx_status:set', function(name, val)
status = GetStatusData()
})
end
TriggerServerEvent('esx_status:update', GetStatusData(true))
end)
RegisterNetEvent('esx_status:add')
@@ -126,7 +125,6 @@ AddEventHandler('esx_status:add', function(name, val)
status = GetStatusData()
})
end
TriggerServerEvent('esx_status:update', GetStatusData(true))
end)
RegisterNetEvent('esx_status:remove')
@@ -143,7 +141,6 @@ AddEventHandler('esx_status:remove', function(name, val)
status = GetStatusData()
})
end
TriggerServerEvent('esx_status:update', GetStatusData(true))
end)
AddEventHandler('esx_status:getStatus', function(name, cb)