Revert "refactor!(es_extended): move Jobs into core"

This reverts commit f6dcb82f27.
This commit is contained in:
Kasey FItton
2025-01-02 04:49:03 +00:00
parent 68af938e1c
commit 28845050e9
5 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -527,7 +527,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
onDuty = Config.DefaultJobDuty
end
local jobObject, gradeObject = Core.Jobs[newJob], Core.Jobs[newJob].grades[grade]
local jobObject, gradeObject = ESX.Jobs[newJob], ESX.Jobs[newJob].grades[grade]
self.job = {
id = jobObject.id,
+1 -1
View File
@@ -1,7 +1,7 @@
ESX.Players = {}
ESX.Jobs = {}
ESX.Items = {}
Core = {}
Core.Jobs = {}
Core.JobsPlayerCount = {}
Core.UsableItemsCallbacks = {}
Core.RegisteredCommands = {}
+4 -4
View File
@@ -495,9 +495,9 @@ function ESX.RefreshJobs()
if not Jobs then
-- Fallback data, if no jobs exist
Core.Jobs["unemployed"] = { label = "Unemployed", grades = { ["0"] = { grade = 0, label = "Unemployed", salary = 200, skin_male = {}, skin_female = {} } } }
ESX.Jobs["unemployed"] = { label = "Unemployed", grades = { ["0"] = { grade = 0, label = "Unemployed", salary = 200, skin_male = {}, skin_female = {} } } }
else
Core.Jobs = Jobs
ESX.Jobs = Jobs
end
end
@@ -558,7 +558,7 @@ end
---@return table
function ESX.GetJobs()
return Core.Jobs
return ESX.Jobs
end
---@return table
@@ -606,7 +606,7 @@ end
---@param grade string
---@return boolean
function ESX.DoesJobExist(job, grade)
return (Core.Jobs[job] and Core.Jobs[job].grades[tostring(grade)] ~= nil) or false
return (ESX.Jobs[job] and ESX.Jobs[job].grades[tostring(grade)] ~= nil) or false
end
---@param playerId string | number
+3 -3
View File
@@ -69,7 +69,7 @@ end
if Config.Multichar then
AddEventHandler("esx:onPlayerJoined", function(src, char, data)
while not next(Core.Jobs) do
while not next(ESX.Jobs) do
Wait(50)
end
@@ -85,7 +85,7 @@ if Config.Multichar then
else
RegisterNetEvent("esx:onPlayerJoined", function()
local _source = source
while not next(Core.Jobs) do
while not next(ESX.Jobs) do
Wait(50)
end
@@ -171,7 +171,7 @@ function loadESXPlayer(identifier, playerId, isNew)
job, grade = "unemployed", "0"
end
local jobObject, gradeObject = Core.Jobs[job], Core.Jobs[job].grades[grade]
local jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
userData.job = {
id = jobObject.id,
@@ -6,7 +6,7 @@ local NOTIFY_TYPES = {
}
local function doesJobAndGradesExist(name, grades)
if not Core.Jobs[name] then
if not ESX.Jobs[name] then
return false
end
@@ -86,7 +86,7 @@ function ESX.CreateJob(name, label, grades)
return success
end
Core.Jobs[name] = generateNewJobTable(name, label, grades)
ESX.Jobs[name] = generateNewJobTable(name, label, grades)
notify("SUCCESS", currentResourceName, 'Job created successfully: `%s`', name)