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!(es_extended): move JobsPlayerCount into core

Browse Source
This commit is contained in:
Kenshin13
2024-12-31 21:23:56 +01:00
parent f53bbfe816
commit 8608043bda
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/server/common.lua
+1 -1
View File
@@ -1,8 +1,8 @@
ESX.Players = {}
ESX.Jobs = {}
ESX.JobsPlayerCount = {}
ESX.Items = {}
Core = {}
Core.JobsPlayerCount = {}
Core.UsableItemsCallbacks = {}
Core.RegisteredCommands = {}
Core.Pickups = {}
[core]/es_extended/server/functions.lua
+2 -2
View File
@@ -327,7 +327,7 @@ function ESX.GetNumPlayers(key, val)
local numPlayers = {}
if key == "job" then
for _, v in ipairs(val) do
numPlayers[v] = (ESX.JobsPlayerCount[v] or 0)
numPlayers[v] = (Core.JobsPlayerCount[v] or 0)
end
return numPlayers
end
@@ -340,7 +340,7 @@ function ESX.GetNumPlayers(key, val)
end
if key == "job" then
return (ESX.JobsPlayerCount[val] or 0)
return (Core.JobsPlayerCount[val] or 0)
end
return #ESX.GetExtendedPlayers(key, val)
[core]/es_extended/server/main.lua
+10 -10
View File
@@ -318,10 +318,10 @@ AddEventHandler("playerDropped", function(reason)
if xPlayer then
TriggerEvent("esx:playerDropped", playerId, reason)
local job = xPlayer.getJob().name
local currentJob = ESX.JobsPlayerCount[job]
ESX.JobsPlayerCount[job] = ((currentJob and currentJob > 0) and currentJob or 1) - 1
local currentJob = Core.JobsPlayerCount[job]
Core.JobsPlayerCount[job] = ((currentJob and currentJob > 0) and currentJob or 1) - 1
GlobalState[("%s:count"):format(job)] = ESX.JobsPlayerCount[job]
GlobalState[("%s:count"):format(job)] = Core.JobsPlayerCount[job]
Core.playersByIdentifier[xPlayer.identifier] = nil
Core.SavePlayer(xPlayer, function()
@@ -335,20 +335,20 @@ AddEventHandler("esx:playerLoaded", function(_, xPlayer)
local job = xPlayer.getJob().name
local jobKey = ("%s:count"):format(job)
ESX.JobsPlayerCount[job] = (ESX.JobsPlayerCount[job] or 0) + 1
GlobalState[jobKey] = ESX.JobsPlayerCount[job]
Core.JobsPlayerCount[job] = (Core.JobsPlayerCount[job] or 0) + 1
GlobalState[jobKey] = Core.JobsPlayerCount[job]
end)
AddEventHandler("esx:setJob", function(_, job, lastJob)
local lastJobKey = ("%s:count"):format(lastJob.name)
local jobKey = ("%s:count"):format(job.name)
local currentLastJob = ESX.JobsPlayerCount[lastJob.name]
local currentLastJob = Core.JobsPlayerCount[lastJob.name]
ESX.JobsPlayerCount[lastJob.name] = ((currentLastJob and currentLastJob > 0) and currentLastJob or 1) - 1
ESX.JobsPlayerCount[job.name] = (ESX.JobsPlayerCount[job.name] or 0) + 1
Core.JobsPlayerCount[lastJob.name] = ((currentLastJob and currentLastJob > 0) and currentLastJob or 1) - 1
Core.JobsPlayerCount[job.name] = (Core.JobsPlayerCount[job.name] or 0) + 1
GlobalState[lastJobKey] = ESX.JobsPlayerCount[lastJob.name]
GlobalState[jobKey] = ESX.JobsPlayerCount[job.name]
GlobalState[lastJobKey] = Core.JobsPlayerCount[lastJob.name]
GlobalState[jobKey] = Core.JobsPlayerCount[job.name]
end)
AddEventHandler("esx:playerLogout", function(playerId, cb)