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

Check if vehdata false on exiting before process

Browse Source
This commit is contained in:
Vortrex
2021-04-20 21:32:25 -05:00
parent b4d3280290
commit 090bd8d0b3
1 changed files with 87 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
scripts/server/event.js
View File

@@ -128,6 +128,10 @@ function onPedEnteringVehicle(event, ped, vehicle, seat) {
// =========================================================================== // ===========================================================================
function onPedExitingVehicle(event, ped, vehicle) { function onPedExitingVehicle(event, ped, vehicle) {
if(!getVehicleData(vehicle)) {
return false;
}
if(ped.isType(ELEMENT_PLAYER)) { if(ped.isType(ELEMENT_PLAYER)) {
let client = getClientFromPlayerElement(ped); let client = getClientFromPlayerElement(ped);
getPlayerData(client).pedState = AG_PEDSTATE_EXITINGVEHICLE; getPlayerData(client).pedState = AG_PEDSTATE_EXITINGVEHICLE;
@@ -172,12 +176,21 @@ function onPlayerExitedSphere(client, sphere) {
// =========================================================================== // ===========================================================================
async function onPlayerEnteredVehicle(client) { async function onPlayerEnteredVehicle(client, clientVehicle, seat) {
if(client == null) {
return false;
}
if(client.player == null) { if(client.player == null) {
return false; return false;
} }
await waitUntil(() => client.player.vehicle != null); await waitUntil(() => client != null && client.player != null && client.player.vehicle != null);
//setTimeout(function() {
//if(client.player.vehicle == null) {
// onPlayerEnteredVehicle(client, clientVehicle, seat);
//}
let vehicle = client.player.vehicle; let vehicle = client.player.vehicle;
if(vehicle.syncer != client.index) { if(vehicle.syncer != client.index) {
@@ -239,14 +252,22 @@ async function onPlayerEnteredVehicle(client) {
} }
} }
} }
if(getVehicleData(vehicle).streamingRadioStation != -1) {
if(getPlayerData(client).streamingRadioStation != getVehicleData(vehicle).streamingRadioStation) {
playRadioStreamForPlayer(client, radioStations[getVehicleData(vehicle).streamingRadioStation].url);
setPlayerStreamingRadioVolume(client, getPlayerData(client).streamingRadioVolume);
}
}
//}, client.ping+500);
} }
// =========================================================================== // ===========================================================================
function onPlayerExitedVehicle(client) { function onPlayerExitedVehicle(client, vehicle) {
getPlayerData(client).pedState = AG_PEDSTATE_READY; getPlayerData(client).pedState = AG_PEDSTATE_READY;
let vehicle = getPlayerData(client).lastVehicle; //let vehicle = getPlayerData(client).lastVehicle;
if(!getVehicleData(vehicle)) { if(!getVehicleData(vehicle)) {
return false; return false;
@@ -261,16 +282,19 @@ function onPlayerExitedVehicle(client) {
} }
} }
} }
playRadioStreamForPlayer(client, "");
} }
// =========================================================================== // ===========================================================================
function onPlayerDeath(client, position) { function onPlayerDeath(client, position) {
logToConsole(LOG_INFO, `${getPlayerDisplayForConsole(client)} died.`);
getPlayerData(client).pedState = AG_PEDSTATE_DEAD; getPlayerData(client).pedState = AG_PEDSTATE_DEAD;
updatePlayerSpawnedState(client, false); updatePlayerSpawnedState(client, false);
setPlayerControlState(client, false); setPlayerControlState(client, false);
setTimeout(function() { setTimeout(function() {
fadePlayerCamera(client, false, 1.0); fadeCamera(client, false, 1.0);
setTimeout(function() { setTimeout(function() {
client.despawnPlayer(); client.despawnPlayer();
if(getPlayerCurrentSubAccount(client).inJail) { if(getPlayerCurrentSubAccount(client).inJail) {
@@ -280,8 +304,11 @@ function onPlayerDeath(client, position) {
if(getServerGame() == GAME_GTA_IV) { if(getServerGame() == GAME_GTA_IV) {
spawnPlayer(client, closestJail.position, closestJail.heading, getPlayerCurrentSubAccount(client).skin); spawnPlayer(client, closestJail.position, closestJail.heading, getPlayerCurrentSubAccount(client).skin);
} else { } else {
spawnPlayer(client, closestJail.position, closestJail.heading, getPlayerCurrentSubAccount(client).skin, closestJail.interior, closestJail.dimension); spawnPlayer(client, closestJail.position, closestJail.heading, getPlayerCurrentSubAccount(client).skin);
} }
fadeCamera(client, true, 1.0);
updatePlayerSpawnedState(client, true);
} else { } else {
let closestHospital = getClosestHospital(position); let closestHospital = getClosestHospital(position);
getPlayerCurrentSubAccount(client).interior = closestHospital.interior; getPlayerCurrentSubAccount(client).interior = closestHospital.interior;
@@ -289,8 +316,11 @@ function onPlayerDeath(client, position) {
if(getServerGame() == GAME_GTA_IV) { if(getServerGame() == GAME_GTA_IV) {
spawnPlayer(client, closestHospital.position, closestHospital.heading, getPlayerCurrentSubAccount(client).skin); spawnPlayer(client, closestHospital.position, closestHospital.heading, getPlayerCurrentSubAccount(client).skin);
} else { } else {
spawnPlayer(client, closestHospital.position, closestHospital.heading, getPlayerCurrentSubAccount(client).skin, closestHospital.interior, closestHospital.dimension); spawnPlayer(client, closestHospital.position, closestHospital.heading, getPlayerCurrentSubAccount(client).skin);
} }
fadeCamera(client, true, 1.0);
updatePlayerSpawnedState(client, true);
} }
}, 2000); }, 2000);
}, 1000); }, 1000);
@@ -345,10 +375,10 @@ function onPlayerSpawn(client) {
//if(getPlayerData(client).pedState != AG_PEDSTATE_READY) { //if(getPlayerData(client).pedState != AG_PEDSTATE_READY) {
restorePlayerCamera(client); restorePlayerCamera(client);
logToConsole(LOG_DEBUG, `Storing ${getPlayerDisplayForConsole(client)} ped in client data `); logToConsole(LOG_DEBUG, `[Asshat.Event] Storing ${getPlayerDisplayForConsole(client)} ped in client data `);
getPlayerData(client).ped = client.player; getPlayerData(client).ped = client.player;
logToConsole(LOG_DEBUG, `Sending ${getPlayerDisplayForConsole(client)} the 'now playing as' message`); logToConsole(LOG_DEBUG, `[Asshat.Event] Sending ${getPlayerDisplayForConsole(client)} the 'now playing as' message`);
messagePlayerAlert(client, `You are now playing as: [#0099FF]${getCharacterFullName(client)}`, getColourByName("white")); messagePlayerAlert(client, `You are now playing as: [#0099FF]${getCharacterFullName(client)}`, getColourByName("white"));
messagePlayerNormal(client, "This server is in early development and may restart at any time for updates.", getColourByName("orange")); messagePlayerNormal(client, "This server is in early development and may restart at any time for updates.", getColourByName("orange"));
messagePlayerNormal(client, "Please report any bugs using /bug and suggestions using /idea", getColourByName("yellow")); messagePlayerNormal(client, "Please report any bugs using /bug and suggestions using /idea", getColourByName("yellow"));
@@ -390,6 +420,7 @@ function onPlayerSpawn(client) {
sendRemovedWorldObjectsToPlayer(client); sendRemovedWorldObjectsToPlayer(client);
if(getServerGame() == GAME_GTA_SA) { if(getServerGame() == GAME_GTA_SA) {
logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player walk and fightstyle for ${getPlayerDisplayForConsole(client)}`);
setEntityData(client.player, "ag.walkStyle", getPlayerCurrentSubAccount(client).walkStyle, true); setEntityData(client.player, "ag.walkStyle", getPlayerCurrentSubAccount(client).walkStyle, true);
setEntityData(client.player, "ag.fightStyle", getPlayerCurrentSubAccount(client).fightStyle, true); setEntityData(client.player, "ag.fightStyle", getPlayerCurrentSubAccount(client).fightStyle, true);
} }