From 900a31b3bd68ef7bc43623c7dd37070a8d202874 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sun, 13 Dec 2020 14:49:04 -0600 Subject: [PATCH] Remove IV vehicle sync workaround --- scripts/client/sync.js | 15 ++++++++------- scripts/server/client.js | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scripts/client/sync.js b/scripts/client/sync.js index 740039b7..6f33b13d 100644 --- a/scripts/client/sync.js +++ b/scripts/client/sync.js @@ -17,12 +17,12 @@ let inVehicle = null; addEventHandler("onProcess", function(event, deltaTime) { //if(gta.game == GAME_GTA_IV) { - getVehicles().forEach(function(vehicle) { - if(vehicle.isSyncer && getEntityData(vehicle, "ag.syncId") != null) { - //console.log(`Syncing vehicle ${getEntityData(vehicle, "ag.syncId")} to server. Pos: ${vehicle.position.x}, ${vehicle.position.y}, ${vehicle.position.z}`); - triggerNetworkEvent("ag.veh.sync", getEntityData(vehicle, "ag.syncId"), vehicle.position, vehicle.heading.toFixed(2)); - } - }); + //getVehicles().forEach(function(vehicle) { + // if(vehicle.isSyncer && getEntityData(vehicle, "ag.syncId") != null) { + // //console.log(`Syncing vehicle ${getEntityData(vehicle, "ag.syncId")} to server. Pos: ${vehicle.position.x}, ${vehicle.position.y}, ${vehicle.position.z}`); + // triggerNetworkEvent("ag.veh.sync", getEntityData(vehicle, "ag.syncId"), vehicle.position, vehicle.heading.toFixed(2)); + // } + //}); if(localPlayer != null && syncPosition) { if(localPlayer.health <= 0) { @@ -30,6 +30,7 @@ addEventHandler("onProcess", function(event, deltaTime) { } else { triggerNetworkEvent("ag.player.sync", localPlayer.position, localPlayer.heading.toFixed(2)); + /* if(localPlayer.vehicle) { if(!inVehicle) { inVehicle = localPlayer.vehicle; @@ -46,8 +47,8 @@ addEventHandler("onProcess", function(event, deltaTime) { //localPlayer.removeData("ag.vehicle", localPlayer.vehicle); inVehicle = null; } - } + */ } } //} diff --git a/scripts/server/client.js b/scripts/server/client.js index 56f6f207..f6805c9d 100644 --- a/scripts/server/client.js +++ b/scripts/server/client.js @@ -141,11 +141,11 @@ addNetworkHandler("ag.player.death", function(client, position, heading) { // --------------------------------------------------------------------------- addNetworkHandler("ag.veh.sync", function(client, syncId, position, heading) { - let vehicleData = getVehicleDataFromSyncId(syncId); - if(vehicleData) { - vehicleData.syncPosition = position; - vehicleData.syncHeading = heading; - } + //let vehicleData = getVehicleDataFromSyncId(syncId); + //if(vehicleData) { + // vehicleData.syncPosition = position; + // vehicleData.syncHeading = heading; + //} }); // ---------------------------------------------------------------------------