From 2ff383616f059bfc17cc1720c9d2520423920915 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Thu, 3 Jun 2021 23:21:31 +1000
Subject: [PATCH] improvements(server/main): Set the initial value for
 PlayerData.dead; use MySQL.store for loadESXPlayer

---
 server/main.lua | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/server/main.lua b/server/main.lua
index d4e8e8ae..0ba04c18 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -1,10 +1,13 @@
-local NewPlayer = -1
+local NewPlayer, LoadPlayer = -1, -1
 Citizen.CreateThread(function()
 	SetMapName('San Andreas')
 	SetGameType('ESX Roleplay')
 	MySQL.Async.store("INSERT INTO users SET ?", function(storeId)
 		NewPlayer = storeId
 	end)
+	MySQL.Async.store("SELECT `accounts`, `job`, `job_grade`, `group`, `position`, `inventory`, `skin`, `firstname`, `lastname`, `dateofbirth`, `sex`, `height`, `is_dead` FROM `users` WHERE ?? LIKE ?", function(storeId)
+		LoadPlayer = storeId
+	end)
 end)
 
 local awaitingRegistration = {}
@@ -128,7 +131,7 @@ function loadESXPlayer(identifier, playerId, isNew)
 	}
 
 	table.insert(tasks, function(cb)
-		MySQL.Async.fetchAll('SELECT `accounts`, `job`, `job_grade`, `group`, `loadout`, `position`, `inventory`, `skin`, `firstname`, `lastname`, `dateofbirth`, `sex`, `height` FROM `users` WHERE identifier = @identifier', {
+		MySQL.Async.fetchAll(LoadPlayer, {'identifier', {identifier}
 			['@identifier'] = identifier
 		}, function(result)
 			local job, grade, jobObject, gradeObject = result[1].job, tostring(result[1].job_grade)
@@ -266,6 +269,13 @@ function loadESXPlayer(identifier, playerId, isNew)
 				if result[1].sex then userData.sex = result[1].sex end
 				if result[1].height then userData.height = result[1].height end
 			end
+			
+			-- Death
+			if result[1].is_dead and result[1].is_dead ~= '' then
+				userData.is_dead = result[1].is_dead
+			else
+				userData.is_dead = 0
+			end
 
 			cb()
 		end)
@@ -294,7 +304,8 @@ function loadESXPlayer(identifier, playerId, isNew)
 			loadout = xPlayer.getLoadout(),
 			maxWeight = xPlayer.getMaxWeight(),
 			money = xPlayer.getMoney(),
-			skin = userData.skin
+			skin = userData.skin,
+			dead = userData.dead
 		}, isNew)
 
 		xPlayer.triggerEvent('esx:createMissingPickups', ESX.Pickups)