From 28845050e94906ba1ba505b977de3f50e8198eef Mon Sep 17 00:00:00 2001
From: Kasey FItton <kaseyfitton@hotmail.co.uk>
Date: Thu, 2 Jan 2025 04:49:03 +0000
Subject: [PATCH] Revert "refactor!(es_extended): move Jobs into core"

This reverts commit f6dcb82f274b07cf4ce20ce795e953e1ce0000dd.
---
 [core]/es_extended/server/classes/player.lua    | 2 +-
 [core]/es_extended/server/common.lua            | 2 +-
 [core]/es_extended/server/functions.lua         | 8 ++++----
 [core]/es_extended/server/main.lua              | 6 +++---
 [core]/es_extended/server/modules/createJob.lua | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index c20948c0..b5e66e7b 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -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,
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index a53588ee..9819957c 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -1,7 +1,7 @@
 ESX.Players = {}
+ESX.Jobs = {}
 ESX.Items = {}
 Core = {}
-Core.Jobs = {}
 Core.JobsPlayerCount = {}
 Core.UsableItemsCallbacks = {}
 Core.RegisteredCommands = {}
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index dec728ea..a7566ffb 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -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
diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index 27b62151..fe0821a0 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -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,
diff --git a/[core]/es_extended/server/modules/createJob.lua b/[core]/es_extended/server/modules/createJob.lua
index 866b6d5c..c4c09eff 100644
--- a/[core]/es_extended/server/modules/createJob.lua
+++ b/[core]/es_extended/server/modules/createJob.lua
@@ -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)