From 6234d5da9ce4b837c393a6d79e6e7e24b244778e Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Thu, 6 Jul 2023 00:31:56 +1000
Subject: [PATCH] refactor(esx_multicharacter/server): remove hacky jobs
 workaround

---
 [core]/esx_multicharacter/server/main.lua | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/[core]/esx_multicharacter/server/main.lua b/[core]/esx_multicharacter/server/main.lua
index b677c7ad..6d61489d 100644
--- a/[core]/esx_multicharacter/server/main.lua
+++ b/[core]/esx_multicharacter/server/main.lua
@@ -184,20 +184,11 @@ MySQL.ready(function()
 			end
 		end
 
-		ESX.Jobs = {}
-
-		local function GetJobs()
-			if ESX.GetJobs then
-				return ESX.GetJobs()
-			end
-			return exports.es_extended:getSharedObject().Jobs
+		while not next(ESX.Jobs) do
+			Wait(500)
+			ESX.Jobs = ESX.GetJobs()
 		end
 
-		repeat
-			ESX.Jobs = GetJobs()
-			Wait(50)
-		until next(ESX.Jobs)
-
 		FETCH = 'SELECT identifier, accounts, job, job_grade, firstname, lastname, dateofbirth, sex, skin, disabled FROM users WHERE identifier LIKE ? LIMIT ?'
 		databaseConnected = true
 	end