From d9c007c4bc66e9d35c4da95127f2c661dd42305d Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 17 Jun 2022 09:38:37 -0500
Subject: [PATCH] Use new entered/exited veh events

---
 scripts/server/event.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/server/event.js b/scripts/server/event.js
index b9e9a95e..1a9198c4 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -34,6 +34,8 @@ function addAllEventHandlers() {
 	addEventHandler("onPedSpawn", onPedSpawn);
 	addEventHandler("onPedEnterVehicle", onPedEnteringVehicle);
 	addEventHandler("onPedExitVehicle", onPedExitingVehicle);
+	addEventHandler("onPedEnteredVehicle", onPedEnteredVehicle);
+	addEventHandler("onPedExitedVehicle", onPedExitedVehicle);
 
 	addEventHandler("onPedEnteringVehicle", onPedEnteringVehicle);
 	addEventHandler("onPedExitingVehicle", onPedExitingVehicle);
@@ -516,10 +518,10 @@ async function onPlayerSpawn(client) {
 	logToConsole(LOG_DEBUG, `[VRR.Event] Setting ${getPlayerDisplayForConsole(client)}'s ped scale (${getPlayerCurrentSubAccount(client).pedScale})`);
 	setEntityData(getPlayerPed(client), "vrr.scale", getPlayerCurrentSubAccount(client).pedScale, true);
 
-	if (isPlayerSwitchingCharacter(client) || isPlayerCreatingCharacter(client)) {
-		logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)}'s ped is being used for character selection/creation. No further spawn processing needed'`);
-		return false;
-	}
+	//if (isPlayerSwitchingCharacter(client) || isPlayerCreatingCharacter(client)) {
+	//	logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)}'s ped is being used for character selection/creation. No further spawn processing needed'`);
+	//	return false;
+	//}
 
 	if (isCustomCameraSupported() && getGame() != VRR_GAME_GTA_IV && getGame() != VRR_GAME_GTA_IV_EFLC) {
 		restorePlayerCamera(client);