From 28111c477129af876418fb1662829a881539afc9 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 10 Aug 2022 14:17:53 -0500
Subject: [PATCH] Don't spawn player, use existing one (IV)

---
 scripts/server/subaccount.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js
index 4cea8b54..d731ff38 100644
--- a/scripts/server/subaccount.js
+++ b/scripts/server/subaccount.js
@@ -520,17 +520,17 @@ function selectCharacter(client, characterId = -1) {
 	if (getGame() <= AGRP_GAME_GTA_SA) {
 		spawnPlayer(client, spawnPosition, spawnHeading, getGameConfig().skins[getGame()][skin][0], spawnInterior, spawnDimension);
 	} else if (getGame() == AGRP_GAME_GTA_IV) {
-		spawnPlayer(client, spawnPosition, spawnHeading, getGameConfig().skins[getGame()][skin][0], spawnInterior, spawnDimension);
-		//clearPlayerWeapons(client);
-		//setPlayerSkin(client, skin);
-		//setPlayerPosition(client, spawnPosition);
-		//setPlayerHeading(client, spawnHeading);
+		//spawnPlayer(client, spawnPosition, spawnHeading, getGameConfig().skins[getGame()][skin][0], spawnInterior, spawnDimension);
+		clearPlayerWeapons(client);
+		setPlayerPosition(client, spawnPosition);
+		setPlayerHeading(client, spawnHeading);
 		//setPlayerInterior(client, spawnInterior);
 		//setPlayerDimension(client, spawnDimension);
-		//restorePlayerCamera(client);
+		restorePlayerCamera(client);
+		setPlayerSkin(client, skin);
 	} else if (getGame() == AGRP_GAME_MAFIA_ONE) {
 		//spawnPlayer(client, spawnPosition, spawnHeading, getGameConfig().skins[getGame()][skin][0]);
-		logToConsole(LOG_DEBUG, `[VRR.SubAccount] Spawning ${getPlayerDisplayForConsole(client)} as ${getGameConfig().skins[getGame()][skin][1]} (${getGameConfig().skins[getGame()][skin][0]})`);
+		//logToConsole(LOG_DEBUG, `[VRR.SubAccount] Spawning ${getPlayerDisplayForConsole(client)} as ${getGameConfig().skins[getGame()][skin][1]} (${getGameConfig().skins[getGame()][skin][0]})`);
 		spawnPlayer(client, spawnPosition, spawnHeading, getGameConfig().skins[getGame()][skin][0]);
 	}
 
@@ -727,7 +727,7 @@ function forcePlayerIntoSwitchCharacterScreen(client) {
 		getPlayerCurrentSubAccount(client).interior = 0;
 	}
 
-	if (isGameFeatureSupported("armour")) {
+	if (isGameFeatureSupported("pedArmour")) {
 		getPlayerCurrentSubAccount(client).armour = getPlayerArmour(client);
 	} else {
 		getPlayerCurrentSubAccount(client).armour = 0;