From 49f1668b0a231bdda0a4b5ddfadb6830220e28a5 Mon Sep 17 00:00:00 2001
From: Tinky <48660658+Tinky124@users.noreply.github.com>
Date: Sat, 23 Jan 2021 21:19:32 +0100
Subject: [PATCH 1/3] Fix server hitch warning

---
 server/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/main.lua b/server/main.lua
index 469fd5dd..fd1c5b94 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -3,7 +3,7 @@ ESX = nil
 TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
 
 Citizen.CreateThread(function()
-	Citizen.Wait(1000)
+	Citizen.Wait(5000)
 	local players = ESX.GetPlayers()
 
 	for _,playerId in ipairs(players) do

From ea844e81da2daab0dfb974206009181f81d3a5ac Mon Sep 17 00:00:00 2001
From: Tinky <48660658+Tinky124@users.noreply.github.com>
Date: Sun, 24 Jan 2021 21:17:01 +0100
Subject: [PATCH 2/3] Better just to remove this... Too many hitch

---
 server/main.lua | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/server/main.lua b/server/main.lua
index fd1c5b94..138b0c57 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -2,28 +2,6 @@ ESX = nil
 
 TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
 
-Citizen.CreateThread(function()
-	Citizen.Wait(5000)
-	local players = ESX.GetPlayers()
-
-	for _,playerId in ipairs(players) do
-		local xPlayer = ESX.GetPlayerFromId(playerId)
-
-		MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', {
-			['@identifier'] = xPlayer.identifier
-		}, function(result)
-			local data = {}
-
-			if result[1].status then
-				data = json.decode(result[1].status)
-			end
-
-			xPlayer.set('status', data)
-			TriggerClientEvent('esx_status:load', playerId, data)
-		end)
-	end
-end)
-
 AddEventHandler('esx:playerLoaded', function(playerId, xPlayer)
 	MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', {
 		['@identifier'] = xPlayer.identifier

From 74335672ea232d47b7fc48412ce14205516c55f2 Mon Sep 17 00:00:00 2001
From: Tinky <48660658+Tinky124@users.noreply.github.com>
Date: Tue, 2 Feb 2021 19:28:48 -0100
Subject: [PATCH 3/3] Fixed losing functionality when restarting script

---
 server/main.lua | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/server/main.lua b/server/main.lua
index 138b0c57..57b5b6f4 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -2,6 +2,31 @@ ESX = nil
 
 TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
 
+AddEventHandler('onResourceStart', function(resourceName)
+	if (GetCurrentResourceName() ~= resourceName) then
+	  	return
+	end
+
+	local players = ESX.GetPlayers()
+
+	for _,playerId in ipairs(players) do
+		local xPlayer = ESX.GetPlayerFromId(playerId)
+
+		MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', {
+			['@identifier'] = xPlayer.identifier
+		}, function(result)
+			local data = {}
+
+			if result[1].status then
+				data = json.decode(result[1].status)
+			end
+
+			xPlayer.set('status', data)
+			TriggerClientEvent('esx_status:load', playerId, data)
+		end)
+	end
+end)
+
 AddEventHandler('esx:playerLoaded', function(playerId, xPlayer)
 	MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', {
 		['@identifier'] = xPlayer.identifier