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

Fix for enter vehicle logic

Browse Source
This commit is contained in:
Vortrex
2020-12-21 23:41:43 -06:00
parent fddc777de0
commit 19c38ecf64
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
scripts/server/event.js
View File

@@ -78,33 +78,18 @@ addEventHandler("OnPedExitVehicle", function(event, ped, vehicle) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function playerEnteredVehicle(client, vehicle) { function playerEnteredVehicle(client, vehicle) {
console.log(`Vehicle: ${vehicle}`);
if(!vehicle || vehicle == null) { if(!vehicle || vehicle == null) {
return false; return false;
} }
console.log(`Vehicle not null`);
if(!getVehicleData(vehicle)) { if(!getVehicleData(vehicle)) {
return false; return false;
} }
if(!getVehicleData(vehicle).engine) { console.log(`Vehicle data found`);
messageClientTip(client, `This ${getVehicleName(vehicle)}'s engine is off. Use /engine to start it`);
if(doesPlayerHaveKeyBindForCommand(client, "engine")) {
messageClientTip(client, `You can also press ${getPlayerKeyBindForCommand(client, "engine")} to start and stop the engine.`);
}
triggerNetworkEvent("ag.control", client, false, false);
}
let currentSubAccount = getClientCurrentSubAccount(client);
if(isPlayerWorking(client)) {
if(getVehicleData(vehicle).ownerType == AG_VEHOWNER_JOB) {
if(getVehicleData(vehicle).ownerId == getClientCurrentSubAccount(client).job) {
//if(seat == 0) {
getClientCurrentSubAccount(client).lastJobVehicle = vehicle;
//}
}
}
}
if(getPlayerVehicleSeat(client) == AG_VEHSEAT_DRIVER) { if(getPlayerVehicleSeat(client) == AG_VEHSEAT_DRIVER) {
if(getVehicleData(vehicle).buyPrice > 0) { if(getVehicleData(vehicle).buyPrice > 0) {
@@ -114,12 +99,34 @@ function playerEnteredVehicle(client, vehicle) {
messageClientAlert(client, `This ${getVehicleName(vehicle)} is for rent! Cost: $${getVehicleData(vehicle).rentPrice} per minute`); messageClientAlert(client, `This ${getVehicleName(vehicle)} is for rent! Cost: $${getVehicleData(vehicle).rentPrice} per minute`);
messageClientTip(client, `Use /vehrent if you want to rent it.`); messageClientTip(client, `Use /vehrent if you want to rent it.`);
} }
if(!getVehicleData(vehicle).engine) {
messageClientTip(client, `This ${getVehicleName(vehicle)}'s engine is off. Use /engine to start it`);
if(doesPlayerHaveKeyBindForCommand(client, "engine")) {
messageClientTip(client, `You can also press ${getPlayerKeyBindForCommand(client, "engine")} to start and stop the engine.`);
}
triggerNetworkEvent("ag.control", client, false, false);
}
let currentSubAccount = getClientCurrentSubAccount(client);
if(isPlayerWorking(client)) {
if(getVehicleData(vehicle).ownerType == AG_VEHOWNER_JOB) {
if(getVehicleData(vehicle).ownerId == getClientCurrentSubAccount(client).job) {
//if(seat == 0) {
getClientCurrentSubAccount(client).lastJobVehicle = vehicle;
//}
}
}
}
} }
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function playerExitedVehicle(client, vehicle) { function playerExitedVehicle(client, vehicle) {
//let vehicle = getElementFromId(vehicleId);
} }