From 6a2542b6cd8225cc908daa0a1ceb76c38dcdfa13 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 12 Dec 2020 06:12:25 -0600
Subject: [PATCH] Fix some native utils

---
 scripts/server/native.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/scripts/server/native.js b/scripts/server/native.js
index 5e289434..a8ca34d2 100644
--- a/scripts/server/native.js
+++ b/scripts/server/native.js
@@ -73,52 +73,56 @@ function getServerGame() {
 // ---------------------------------------------------------------------------
 
 function getPlayerPosition(client) {
-    return client.getData("ag.position");
+    //return (isGTAIV()) ? getEntityData(client, "ag.position") : client.player.position;
+    return getEntityData(client, "ag.position");
 }
 
 // ---------------------------------------------------------------------------
 
 function getPlayerHeading(client) {
-    return client.getData("ag.heading");
+    //return (isGTAIV()) ? getEntityData(client, "ag.heading") : client.player.heading;
+    return getEntityData(client, "ag.heading");
 }
 
 // ---------------------------------------------------------------------------
 
 function getPlayerVehicle(client) {
-	return getVehicleDataFromSyncId(client.getData("ag.vehicle"));
+    //return (isGTAIV()) ? getVehicleDataFromSyncId(getEntityData(client, "ag.vehicle")) : getVehicleData(client.player.vehicle);
+    let playerVehicle = getEntityData(client, "ag.vehicle");
+    let vehicleData = getVehicleDataFromSyncId(playerVehicle);
+    console.log(`playerVehicle: ${playerVehicle}, vehicleData: ${vehicleData}`);
+    return vehicleData;
 }
 
 // ---------------------------------------------------------------------------
 
 function isPlayerInAnyVehicle(client) {
-    if(isGTAIV()) {
-        return (client.getData("ag.vehicle") != null);
-    } else {
-        return (client.player.vehicle != null);
-    }
+    return doesEntityDataExist(client, "ag.vehicle");
 }
 
 // ---------------------------------------------------------------------------
 
 function getPlayerVehicleSeat(client) {
-    return client.getData("ag.vehicleSeat");
+    return getEntityData(client, "ag.vehicleSeat");
 }
 
 // ---------------------------------------------------------------------------
 
 function isPlayerSpawned(client) {
-    return client.getData("ag.spawned");
+    return getEntityData(client, "ag.spawned");
 }
 
 // ---------------------------------------------------------------------------
 
 function getVehiclePosition(vehicleData) {
+    //return (isGTAIV()) ? vehicleData.syncPosition : vehicleData.vehicle.position;
     return vehicleData.syncPosition;
 }
 
 // ---------------------------------------------------------------------------
 
 function getVehicleHeading(vehicleData) {
+    //return (isGTAIV()) ? vehicleData.syncHeading : vehicleData.vehicle.heading;
     return vehicleData.syncHeading;
 }