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

Use new custom events for enter/exit veh

Browse Source
This commit is contained in:
Vortrex
2022-06-26 13:31:41 -05:00
parent 644a188929
commit d90dc8e7b8
1 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
scripts/server/event.js
View File

@@ -32,13 +32,10 @@ function addAllEventHandlers() {
addEventHandler("onElementStreamOut", onElementStreamOut); addEventHandler("onElementStreamOut", onElementStreamOut);
addEventHandler("onPedSpawn", onPedSpawn); addEventHandler("onPedSpawn", onPedSpawn);
addEventHandler("onPedEnterVehicle", onPedEnteringVehicle); addEventHandler("onPedEnteringVehicleEx", onPedEnteringVehicle);
addEventHandler("onPedExitVehicle", onPedExitingVehicle); addEventHandler("onPedExitingVehicleEx", onPedExitingVehicle);
addEventHandler("onPedEnteredVehicle", onPedEnteredVehicle); addEventHandler("onPedEnteredVehicleEx", onPedEnteredVehicle);
addEventHandler("onPedExitedVehicle", onPedExitedVehicle); addEventHandler("onPedExitedVehicleEx", onPedExitedVehicle);
addEventHandler("onPedEnteringVehicle", onPedEnteringVehicle);
addEventHandler("onPedExitingVehicle", onPedExitingVehicle);
//addEventHandler("OnPlayerCommand", onPlayerCommand); //addEventHandler("OnPlayerCommand", onPlayerCommand);
} }
@@ -250,24 +247,25 @@ function onPlayerExitedSphere(client, sphere) {
// =========================================================================== // ===========================================================================
async function onPlayerEnteredVehicle(client, clientVehicle, seat) { async function onPlayerEnteredVehicle(client, vehicle, seat) {
if (client == null) { if (client == null) {
return false; return false;
} }
let vehicle = null; if (getPlayerData(client) == false) {
return false;
}
if (getGame() == VRR_GAME_GTA_IV) { if (getGame() == VRR_GAME_GTA_IV) {
vehicle = getVehicleFromIVNetworkId(clientVehicle); vehicle = getVehicleFromIVNetworkId(clientVehicle);
} else {
if (getPlayerPed(client) == null) {
return false;
}
await waitUntil(() => client != null && getPlayerPed(client) != null && getPlayerVehicle(client) != null);
vehicle = getPlayerVehicle(client);
} }
//else {
// if (getPlayerPed(client) == null) {
// return false;
// }
// await waitUntil(() => client != null && getPlayerPed(client) != null && getPlayerVehicle(client) != null);
// vehicle = getPlayerVehicle(client);
//}
if (!getVehicleData(vehicle)) { if (!getVehicleData(vehicle)) {
return false; return false;
@@ -687,4 +685,48 @@ function onPlayerCommand(event, client, command, params) {
} }
} }
// ===========================================================================
function onPedEnteredVehicle(ped, vehicle, seat) {
if (ped.isType(ELEMENT_PLAYER)) {
let client = getClientFromPlayerElement(ped);
if (client != null) {
onPlayerEnteredVehicle(client, vehicle, seat);
}
}
}
// ===========================================================================
function onPedExitedVehicle(ped, vehicle, seat) {
if (ped.isType(ELEMENT_PLAYER)) {
let client = getClientFromPlayerElement(ped);
if (client != null) {
onPlayerExitedVehicle(client, vehicle, seat);
}
}
}
// ===========================================================================
function onPedEnteringVehicle(ped, vehicle, seat) {
if (ped.isType(ELEMENT_PLAYER)) {
let client = getClientFromPlayerElement(ped);
if (client != null) {
onPlayerEnteringVehicle(client, vehicle, seat);
}
}
}
// ===========================================================================
function onPedExitingVehicle(ped, vehicle, seat) {
if (ped.isType(ELEMENT_PLAYER)) {
let client = getClientFromPlayerElement(ped);
if (client != null) {
onPlayerExitingVehicle(client, vehicle, seat);
}
}
}
// =========================================================================== // ===========================================================================