From 5273c954bef7897545578230d3c5b9f8198825a8 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 1 May 2022 15:02:54 -0500
Subject: [PATCH] Clear data option for clear wep util+dont freeze car

---
 scripts/client/utilities.js | 58 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/scripts/client/utilities.js b/scripts/client/utilities.js
index 9294ceb8..8cdd2416 100644
--- a/scripts/client/utilities.js
+++ b/scripts/client/utilities.js
@@ -314,12 +314,14 @@ function giveLocalPlayerWeapon(weaponId, ammo, active) {
 
 // ===========================================================================
 
-function clearLocalPlayerWeapons() {
+function clearLocalPlayerWeapons(clearData) {
 	logToConsole(LOG_DEBUG, `[VRR.Utilities] Clearing weapons`);
 	localPlayer.clearWeapons();
-	forceWeapon = 0;
-	forceWeaponAmmo = 0;
-	forceWeaponClipAmmo = 0;
+	if(clearData == true) {
+		forceWeapon = 0;
+		forceWeaponAmmo = 0;
+		forceWeaponClipAmmo = 0;
+	}
 }
 
 // ===========================================================================
@@ -358,15 +360,15 @@ function setLocalPlayerInterior(interior) {
 		if(!isGTAIV()) {
 			localPlayer.interior = interior;
 			game.cameraInterior = interior;
-		} else {
-			if(getGameConfig().mainWorldInterior != interior) {
-				let interiorId = natives.getInteriorAtCoords(localPlayer.position);
-				natives.activateInterior(interiorId, true);
-				natives.loadAllObjectsNow();
-			}
-			let interiorId = natives.getInteriorAtCoords(localPlayer.position);
-			natives.activateInterior(interiorId, true);
-		}
+		} //else {
+			//if(getGameConfig().mainWorldInterior != interior) {
+			//	let interiorId = natives.getInteriorAtCoords(localPlayer.position);
+			//	natives.activateInterior(interiorId, true);
+			//	natives.loadAllObjectsNow();
+			//}
+			//let interiorId = natives.getInteriorAtCoords(localPlayer.position);
+			//natives.activateInterior(interiorId, true);
+		//}
 	}
 
 	//let vehicles = getElementsByType(ELEMENT_VEHICLE);
@@ -575,24 +577,20 @@ function processWantedLevelReset() {
 function processLocalPlayerVehicleControlState() {
 	if(areServerElementsSupported()) {
 		if(inVehicle && localPlayer.vehicle != null) {
-			if(getEntityData(localPlayer.vehicle, "vrr.engine") == false) {
-				localPlayer.vehicle.engine = false;
-			}
+			if(doesEntityDataExist(localPlayer.vehicle, "vrr.engine")) {
+				if(getEntityData(localPlayer.vehicle, "vrr.engine") == false) {
+					localPlayer.vehicle.engine = false;
+					if(!localPlayer.vehicle.engine) {
+						if(typeof localPlayer.vehicle.velocity != "undefined") {
+							localPlayer.vehicle.velocity = toVector3(0.0, 0.0, 0.0);
+							localPlayer.vehicle.turnVelocity = toVector3(0.0, 0.0, 0.0);
+						}
 
-			if(!localPlayer.vehicle.engine) {
-				if(typeof localPlayer.vehicle.velocity != "undefined") {
-					localPlayer.vehicle.velocity = toVector3(0.0, 0.0, 0.0);
-					localPlayer.vehicle.turnVelocity = toVector3(0.0, 0.0, 0.0);
-				}
-
-				if(parkedVehiclePosition) {
-					localPlayer.vehicle.position = parkedVehiclePosition;
-					localPlayer.vehicle.heading = parkedVehicleHeading;
-				}
-			} else {
-				if(parkedVehiclePosition) {
-					parkedVehiclePosition = false;
-					parkedVehicleHeading = false;
+						//if(parkedVehiclePosition) {
+						//	localPlayer.vehicle.position = parkedVehiclePosition;
+						//	localPlayer.vehicle.heading = parkedVehicleHeading;
+						//}
+					}
 				}
 			}
 		}