From 5b55022eb947c46a409a11a0baa3688ac90885a7 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 14 Dec 2020 10:46:17 -0600
Subject: [PATCH] Fix death process and remove debugging msg

---
 scripts/server/utilities.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js
index 6cdd3463..cdb89bb8 100644
--- a/scripts/server/utilities.js
+++ b/scripts/server/utilities.js
@@ -680,7 +680,6 @@ function doesWordStartWithVowel(word) {
 // ---------------------------------------------------------------------------
 
 function getVehicleNameFromModelId(modelId) {
-	console.log(modelId);
 	if(isGTAIV()) {
 		for(let i in getGameData().gtaivVehicleModels) {
 			if(getGameData().gtaivVehicleModels[i][1] == modelId) {
@@ -1661,33 +1660,24 @@ function getClosestPoliceStation(position) {
 // ----------------------------------------------------------------------------
 
 function processPlayerDeath(client) {
-	client.removeData("ag.spawned", true);
-
-	if(isGTAIV()) {
-		triggerNetworkEvent("ag.iv.syncPosition", client, false);
-	}
+	removeEntityData(client.player, "ag.spawned", true);
 	
 	let closestHospital = getClosestHospital(getPlayerPosition(client));
 	triggerNetworkEvent("ag.control", client, false);
 	setTimeout(function() {
 		triggerNetworkEvent("ag.fadeCamera", client, false, 1.0);
 		setTimeout(function() {
-			if(!isGTAIV()) {
-				client.despawnPlayer();
-			}
+			client.despawnPlayer();
 			if(getClientCurrentSubAccount(client).inJail) {
 				let closestJail = getClosestJail(getPlayerPosition(client));
 				spawnPlayer(client, closestJail.position, closestJail.heading, getClientCurrentSubAccount(client).skin);
 			} else {
 				spawnPlayer(client, closestHospital.position, closestHospital.heading, getClientCurrentSubAccount(client).skin);
 			}
-			getEntityData(client, "ag.spawned", true, true);	
 			setTimeout(function() {
+				setEntityData(client.player, "ag.spawned", true, true);
 				triggerNetworkEvent("ag.fadeCamera", client, true, 1.0);
 				triggerNetworkEvent("ag.control", client, true);
-				if(isGTAIV()) {
-					triggerNetworkEvent("ag.iv.syncPosition", client, true);
-				}				
 			}, 1000);
 		}, 2000);		
 	}, 1000);