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

Use non-ex events on Mafia 1

Browse Source
This commit is contained in:
Vortrex
2023-02-08 17:58:46 -06:00
parent 145906042b
commit 094387dc41
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/server/event.js
View File

@@ -27,14 +27,19 @@ function addAllEventHandlers() {
addEventHandler("onElementStreamIn", onElementStreamIn); addEventHandler("onElementStreamIn", onElementStreamIn);
addEventHandler("onElementStreamOut", onElementStreamOut); addEventHandler("onElementStreamOut", onElementStreamOut);
addEventHandler("onPedSpawn", onPedSpawn); addEventHandler("onPedSpawn", onPedSpawn);
addEventHandler("OnPickupPickedUp", onPedPickupPickedUp);
addEventHandler("onPedEnteredVehicleEx", onPedEnteredVehicle); if (getGame() <= V_GAME_GTA_IV) {
addEventHandler("onPedExitedVehicleEx", onPedExitedVehicle); addEventHandler("OnPickupPickedUp", onPedPickupPickedUp);
addEventHandler("onPedEnteredSphereEx", onPedEnteredSphere); addEventHandler("onPedEnteredVehicleEx", onPedEnteredVehicle);
addEventHandler("onPedExitedSphereEx", onPedExitedSphere); addEventHandler("onPedExitedVehicleEx", onPedExitedVehicle);
addEventHandler("onPedEnteredSphereEx", onPedEnteredSphere);
addEventHandler("onPedExitedSphereEx", onPedExitedSphere);
}
if (getGame() == V_GAME_MAFIA_ONE) { if (getGame() == V_GAME_MAFIA_ONE) {
addEventHandler("onPedFall", onPedFall); addEventHandler("onPedFall", onPedFall);
addEventHandler("onPedEnteredVehicle", onPedEnteredVehicle);
addEventHandler("onPedExitedVehicle", onPedExitedVehicle);
} }
} }
@@ -747,10 +752,12 @@ function onPedExitedVehicle(event, ped, vehicle, seat) {
function onPedEnteredVehicle(event, ped, vehicle, seat) { function onPedEnteredVehicle(event, ped, vehicle, seat) {
if (ped == null) { if (ped == null) {
logToConsole(LOG_ERROR | LOG_DEBUG, `[AGRP.Event] Ped ${ped.id} entered vehicle ${vehicle.id} in seat ${seat}, but ped is null`);
return false; return false;
} }
if (vehicle == null) { if (vehicle == null) {
logToConsole(LOG_ERROR | LOG_DEBUG, `[AGRP.Event] Ped ${ped.id} entered vehicle ${vehicle.id} in seat ${seat}, but vehicle is null`);
return false; return false;
} }
@@ -760,10 +767,12 @@ function onPedEnteredVehicle(event, ped, vehicle, seat) {
let client = getClientFromPlayerElement(ped); let client = getClientFromPlayerElement(ped);
if (client != null) { if (client != null) {
if (getPlayerData(client) == false) { if (getPlayerData(client) == false) {
logToConsole(LOG_ERROR | LOG_DEBUG, `[AGRP.Event] ${getPlayerDisplayForConsole(client)} entered vehicle ${vehicle.id} in seat ${seat}, but player data is false`);
return false; return false;
} }
if (!getVehicleData(vehicle)) { if (!getVehicleData(vehicle)) {
logToConsole(LOG_ERROR | LOG_DEBUG, `[AGRP.Event] ${getPlayerDisplayForConsole(client)} entered vehicle ${vehicle.id} in seat ${seat}, but vehicle data is false`);
return false; return false;
} }