From 94fa8619f3670584daa48861ef07bf434d8aacdc Mon Sep 17 00:00:00 2001
From: ElPumpo <samo_kol@hotmail.com>
Date: Mon, 9 Apr 2018 01:49:11 +0200
Subject: [PATCH] Fixed error setting status on a unknown player

---
 client/main.lua |  2 +-
 server/main.lua | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/client/main.lua b/client/main.lua
index 089c7de0..17a7aac7 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -150,7 +150,7 @@ local isPaused = false
 
 Citizen.CreateThread(function()
   while true do
-    Citizen.Wait(1)
+    Citizen.Wait(10)
     if IsPauseMenuActive() and not isPaused then
       isPaused = true
      	TriggerEvent('esx_status:setDisplay', 0.0)
diff --git a/server/main.lua b/server/main.lua
index 5cc9ef69..b0f8c46a 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -4,7 +4,6 @@ local RegisteredStatus = {}
 TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
 
 AddEventHandler('esx:playerLoaded', function(source)
-
 	local _source        = source
 	local xPlayer        = ESX.GetPlayerFromId(_source)
 
@@ -31,7 +30,6 @@ AddEventHandler('esx:playerLoaded', function(source)
 end)
 
 AddEventHandler('esx:playerDropped', function(source)
-
 	local _source = source
 	local xPlayer = ESX.GetPlayerFromId(_source)
 
@@ -49,7 +47,6 @@ AddEventHandler('esx:playerDropped', function(source)
 end)
 
 AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb)
-
 	local xPlayer = ESX.GetPlayerFromId(playerId)
 	local status  = xPlayer.get('status')
 
@@ -64,18 +61,17 @@ end)
 
 RegisterServerEvent('esx_status:update')
 AddEventHandler('esx_status:update', function(status)
-	
 	local _source = source
 	local xPlayer = ESX.GetPlayerFromId(_source)
 	
-	xPlayer.set('status', status)
-
+	if xPlayer ~= nil then
+		xPlayer.set('status', status)
+	end
 end)
 
 function SaveData()
-
 	local xPlayers = ESX.GetPlayers()
-
+	
 	for i=1, #xPlayers, 1 do
 
 		local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
@@ -93,7 +89,6 @@ function SaveData()
 	end
 
 	SetTimeout(10 * 60 * 1000, SaveData)
-
 end
 
 SaveData()
\ No newline at end of file