hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove IV vehicle sync workaround

Browse Source
This commit is contained in:
Vortrex
2020-12-13 14:49:04 -06:00
parent 2ef292d799
commit 900a31b3bd
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/client/sync.js
View File

@@ -17,12 +17,12 @@ let inVehicle = null;
addEventHandler("onProcess", function(event, deltaTime) { addEventHandler("onProcess", function(event, deltaTime) {
//if(gta.game == GAME_GTA_IV) { //if(gta.game == GAME_GTA_IV) {
getVehicles().forEach(function(vehicle) { //getVehicles().forEach(function(vehicle) {
if(vehicle.isSyncer && getEntityData(vehicle, "ag.syncId") != null) { // 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}`); // //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)); // triggerNetworkEvent("ag.veh.sync", getEntityData(vehicle, "ag.syncId"), vehicle.position, vehicle.heading.toFixed(2));
} // }
}); //});
if(localPlayer != null && syncPosition) { if(localPlayer != null && syncPosition) {
if(localPlayer.health <= 0) { if(localPlayer.health <= 0) {
@@ -30,6 +30,7 @@ addEventHandler("onProcess", function(event, deltaTime) {
} else { } else {
triggerNetworkEvent("ag.player.sync", localPlayer.position, localPlayer.heading.toFixed(2)); triggerNetworkEvent("ag.player.sync", localPlayer.position, localPlayer.heading.toFixed(2));
/*
if(localPlayer.vehicle) { if(localPlayer.vehicle) {
if(!inVehicle) { if(!inVehicle) {
inVehicle = localPlayer.vehicle; inVehicle = localPlayer.vehicle;
@@ -46,8 +47,8 @@ addEventHandler("onProcess", function(event, deltaTime) {
//localPlayer.removeData("ag.vehicle", localPlayer.vehicle); //localPlayer.removeData("ag.vehicle", localPlayer.vehicle);
inVehicle = null; inVehicle = null;
} }
} }
*/
} }
} }
//} //}

10
scripts/server/client.js
View File

@@ -141,11 +141,11 @@ addNetworkHandler("ag.player.death", function(client, position, heading) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
addNetworkHandler("ag.veh.sync", function(client, syncId, position, heading) { addNetworkHandler("ag.veh.sync", function(client, syncId, position, heading) {
let vehicleData = getVehicleDataFromSyncId(syncId); //let vehicleData = getVehicleDataFromSyncId(syncId);
if(vehicleData) { //if(vehicleData) {
vehicleData.syncPosition = position; // vehicleData.syncPosition = position;
vehicleData.syncHeading = heading; // vehicleData.syncHeading = heading;
} //}
}); });
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------