From 8b993799fe1bf39400e5640949e9d1938bf5297c Mon Sep 17 00:00:00 2001
From: ElPumpo <samo_kol@hotmail.com>
Date: Thu, 19 Apr 2018 21:01:18 +0200
Subject: [PATCH] Cleanup code

---
 client/esx_jobs_cl.lua     | 23 ++++++++++++-----------
 localization/br_config.lua |  8 ++------
 localization/de_config.lua |  8 ++------
 localization/en_config.lua |  8 ++------
 localization/sv_config.lua | 18 +++++++-----------
 5 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/client/esx_jobs_cl.lua b/client/esx_jobs_cl.lua
index 00d55a58..9089c25a 100644
--- a/client/esx_jobs_cl.lua
+++ b/client/esx_jobs_cl.lua
@@ -49,10 +49,12 @@ local vehicleOldHealthInCaseofDrop  = nil
 ESX = nil
 
 Citizen.CreateThread(function()
-  while ESX == nil do
-    TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
-    Citizen.Wait(0)
-  end
+	while ESX == nil do
+		TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+		Citizen.Wait(0)
+	end
+	
+	PlayerData = ESX.GetPlayerData()
 end)
 
 RegisterNetEvent('esx:playerLoaded')
@@ -225,7 +227,6 @@ function nextStep(gps)
   end
 end
 
--- #########################
 AddEventHandler('esx_jobs:hasExitedMarker', function(zone)
   TriggerServerEvent('esx_jobs:stopWork')
   hintToDisplay = "no hint to display"
@@ -349,7 +350,7 @@ end)
 -- Show top left hint
 Citizen.CreateThread(function()
   while true do
-    Wait(0)
+    Citizen.Wait(10)
     if hintIsShowed == true then
       SetTextComponentFormat("STRING")
       AddTextComponentString(hintToDisplay)
@@ -361,7 +362,7 @@ end)
 -- Display markers (only if on duty and the player's job ones)
 Citizen.CreateThread(function()
   while true do
-    Wait(0)
+    Citizen.Wait(0)
     local zones = {}
     if PlayerData.job ~= nil then
       for k,v in pairs(Config.Jobs) do
@@ -385,7 +386,7 @@ end)
 -- Display public markers
 Citizen.CreateThread(function()
   while true do
-    Wait(0)
+    Citizen.Wait(0)
     local coords = GetEntityCoords(GetPlayerPed(-1))
     for k,v in pairs(Config.PublicZones) do
       if(v.Marker ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then
@@ -398,7 +399,7 @@ end)
 -- Activate public marker
 Citizen.CreateThread(function()
   while true do
-    Wait(0)
+    Citizen.Wait(0)
     local coords      = GetEntityCoords(GetPlayerPed(-1))
     local position    = nil
     local zone        = nil
@@ -434,7 +435,7 @@ end)
 -- Activate menu when player is inside marker
 Citizen.CreateThread(function()
   while true do
-    Wait(0)
+    Citizen.Wait(0)
 
     if PlayerData.job ~= nil and PlayerData.job.name ~= 'unemployed' then
       local zones = nil
@@ -526,7 +527,7 @@ end)
 -- VEHICLE CAUTION
 Citizen.CreateThread(function()
   while true do
-    Wait(0)
+    Citizen.Wait(0)
     if vehicleInCaseofDrop ~= nil then
       if onDuty and IsVehicleModel(vehicleInCaseofDrop, vehicleHashInCaseofDrop) then
         local vehicleHealth = GetEntityHealth(vehicleInCaseofDrop)
diff --git a/localization/br_config.lua b/localization/br_config.lua
index 36bcd36f..1e7298af 100644
--- a/localization/br_config.lua
+++ b/localization/br_config.lua
@@ -3,17 +3,13 @@ Config.DrawDistance = 100.0
 Config.Locale       = 'br'
 
 Config.Plates = {
-  taxi = "TAXI",
   fisherman = "PESCA",
-  cop = "LSPD",
-  ambulance = "SAMU",
-  depanneur = "MECA",
-  fuel = "REFINA",
+  fueler = "REFINA",
   lumberjack = "LENHA",
   miner = "MINE",
   reporter = "JORN",
   slaughterer = "ABAT",
-  textil = "COST"
+  tailor = "COST"
 }
 
 Config.Jobs = {}
diff --git a/localization/de_config.lua b/localization/de_config.lua
index 6bb1f89d..2a752002 100644
--- a/localization/de_config.lua
+++ b/localization/de_config.lua
@@ -3,17 +3,13 @@ Config.DrawDistance = 100.0
 Config.Locale       = 'de'
 
 Config.Plates = {
-  taxi = "TAXI",
   fisherman = "FISH",
-  cop = "LSPD",
-  ambulance = "EMS",
-  depanneur = "MECA",
-  fuel = "FUEL",
+  fueler = "FUEL",
   lumberjack = "BUCH",
   miner = "MINE",
   reporter = "JOUR",
   slaughterer = "ABAT",
-  textil = "COUT"
+  tailor = "COUT"
 }
 
 Config.Jobs = {}
diff --git a/localization/en_config.lua b/localization/en_config.lua
index 4c1443f5..32b30f8f 100644
--- a/localization/en_config.lua
+++ b/localization/en_config.lua
@@ -3,17 +3,13 @@ Config.DrawDistance = 100.0
 Config.Locale       = 'en'
 
 Config.Plates = {
-  taxi = "TAXI",
   fisherman = "FISH",
-  cop = "LSPD",
-  ambulance = "EMS",
-  depanneur = "MECA",
-  fuel = "FUEL",
+  fueler = "FUEL",
   lumberjack = "BUCH",
   miner = "MINE",
   reporter = "JOUR",
   slaughterer = "ABAT",
-  textil = "COUT"
+  tailor = "COUT"
 }
 
 Config.Jobs = {}
diff --git a/localization/sv_config.lua b/localization/sv_config.lua
index 498ab95c..ff0df242 100644
--- a/localization/sv_config.lua
+++ b/localization/sv_config.lua
@@ -3,17 +3,13 @@ Config.DrawDistance = 100.0
 Config.Locale       = 'sv'
 
 Config.Plates = {
-	taxi = "TAXI",
-	fisherman = "FISH",
-	cop = "LSPD",
-	ambulance = "EMS",
-	depanneur = "MECA",
-	fuel = "FUEL",
-	lumberjack = "BUCH",
-	miner = "MINE",
-	reporter = "JOUR",
-	slaughterer = "ABAT",
-	textil = "COUT"
+	fisherman = "FISK",
+	fueler = "FUEL",
+	lumberjack = "LUMB",
+	miner = "GRUV",
+	reporter = "TV4",
+	slaughterer = "SLAK",
+	tailor = "KLÄD"
 }
 
 Config.Jobs = {}