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

Dont use exiting veh event, fix player spawn event

Browse Source
This commit is contained in:
Vortrex
2021-01-15 03:42:08 -06:00
parent 4719baa9c5
commit cd8e8dda11
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
scripts/server/event.js
View File

@@ -120,11 +120,10 @@ function onPedEnteringVehicle(event, ped, vehicle, seat) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function onPedExitingVehicle(event, ped, vehicle) { function onPedExitingVehicle(event, ped, vehicle) {
//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;
//} }
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -286,50 +285,65 @@ function onPedSpawn(ped) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function onPlayerSpawn(ped) { function onPlayerSpawn(ped) {
logToConsole(LOG_DEBUG, `[Asshat.Event] Checking for ${getPlayerDisplayForConsole(client)}'s client element`);
if(getClientFromPlayerElement(ped) == null) { if(getClientFromPlayerElement(ped) == null) {
logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s client element not set yet. Rechecking ...`);
setTimeout(onPlayerSpawn, 500, ped); setTimeout(onPlayerSpawn, 500, ped);
return false; return false;
} }
logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s client element is valid.`);
let client = getClientFromPlayerElement(ped); let client = getClientFromPlayerElement(ped);
logToConsole(LOG_DEBUG, `[Asshat.Event] Checking ${getPlayerDisplayForConsole(client)}'s player data`);
if(!getPlayerData(client)) { if(!getPlayerData(client)) {
logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s player data is invalid. Kicking them from server.`);
client.disconnect(); client.disconnect();
return false; return false;
} }
if(!isPlayerSwitchingCharacter(client)) { logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s player data is valid.`);
return false; logToConsole(LOG_DEBUG, `[Asshat.Event] Processing ${getPlayerDisplayForConsole(client)}'s spawn (Player Element ID: ${client.player.id})`);
} restorePlayerCamera(client);
//logToConsole(LOG_DEBUG, `Checking switchchar for ${getPlayerDisplayForConsole(client)}`);
//if(!isPlayerSwitchingCharacter(client)) {
// return false;
//}
logToConsole(LOG_DEBUG, `Storing ${getPlayerDisplayForConsole(client)} ped in client data `);
getPlayerData(client).ped = ped;
logToConsole(LOG_DEBUG, `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"));
restorePlayerCamera(client, false, 1.0);
updatePlayerSpawnedState(client, true); updatePlayerSpawnedState(client, true);
setPlayerInterior(client, getPlayerCurrentSubAccount(client).interior); setPlayerInterior(client, getPlayerCurrentSubAccount(client).interior);
setPlayerDimension(client, getPlayerCurrentSubAccount(client).dimension); setPlayerDimension(client, getPlayerCurrentSubAccount(client).dimension);
updateAllPlayerNameTags(); updateAllPlayerNameTags();
getPlayerData(client).switchingCharacter = false;
updatePlayerCash(client); updatePlayerCash(client);
sendPlayerJobType(client, getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(client))); sendPlayerJobType(client, getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(client)));
setPlayer2DRendering(client, true, true, true, true, true, true); setPlayer2DRendering(client, true, true, true, true, true, true);
updatePlayerSnowState(client); updatePlayerSnowState(client);
updatePlayerHotBar(client);
setEntityData(client.player, "ag.scale", getPlayerCurrentSubAccount(client).pedScale, true);
sendExcludedModelsForGroundSnowToPlayer(client); sendExcludedModelsForGroundSnowToPlayer(client);
sendRemovedWorldObjectsToPlayer(client); sendRemovedWorldObjectsToPlayer(client);
setTimeout(function() { //setEntityData(client.player, "ag.scale", getPlayerCurrentSubAccount(client).pedScale, true);
syncPlayerProperties(client);
}, 1000); //setTimeout(function() {
// syncPlayerProperties(client);
//}, 1000);
if(getServerConfig().showLogo && doesPlayerHaveLogoEnabled(client)) { if(getServerConfig().showLogo && doesPlayerHaveLogoEnabled(client)) {
updatePlayerShowLogoState(client, true); updatePlayerShowLogoState(client, true);
} }
cachePlayerHotBarItems(client);
updatePlayerHotBar(client);
getPlayerData(client).switchingCharacter = false;
getPlayerData(client).pedState = AG_PEDSTATE_READY; getPlayerData(client).pedState = AG_PEDSTATE_READY;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------