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

Check to make sure player data isn't null

Browse Source
This commit is contained in:
Vortrex
2021-02-20 20:10:08 -06:00
parent 0abbbf2c51
commit 2e6bf7ffe1
1 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/server/event.js
View File

@@ -73,10 +73,12 @@ function onPlayerQuit(event, client, quitReasonId) {
function onPlayerChat(event, client, messageText) { function onPlayerChat(event, client, messageText) {
event.preventDefault(); event.preventDefault();
if(!isNull(getPlayerData(client))) {
if(!getPlayerData(client).loggedIn) { if(!getPlayerData(client).loggedIn) {
messagePlayerError(client, "You need to login before you can chat!"); messagePlayerError(client, "You need to login before you can chat!");
return false; return false;
} }
}
messageText = messageText.substring(0, 128); messageText = messageText.substring(0, 128);
@@ -272,12 +274,20 @@ function onPlayerDeath(client, position) {
let closestJail = getClosestJail(position); let closestJail = getClosestJail(position);
getPlayerCurrentSubAccount(client).interior = closestJail.interior; getPlayerCurrentSubAccount(client).interior = closestJail.interior;
getPlayerCurrentSubAccount(client).dimension = closestJail.dimension; getPlayerCurrentSubAccount(client).dimension = closestJail.dimension;
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);
}
} else {
let closestHospital = getClosestHospital(position); let closestHospital = getClosestHospital(position);
getPlayerCurrentSubAccount(client).interior = closestHospital.interior; getPlayerCurrentSubAccount(client).interior = closestHospital.interior;
getPlayerCurrentSubAccount(client).dimension = closestHospital.dimension; getPlayerCurrentSubAccount(client).dimension = closestHospital.dimension;
if(getServerGame() == GAME_GTA_IV) {
spawnPlayer(client, closestHospital.position, closestHospital.heading, getPlayerCurrentSubAccount(client).skin); spawnPlayer(client, closestHospital.position, closestHospital.heading, getPlayerCurrentSubAccount(client).skin);
} else {
spawnPlayer(client, closestHospital.position, closestHospital.heading, getPlayerCurrentSubAccount(client).skin, closestHospital.interior, closestHospital.dimension);
}
} }
}, 2000); }, 2000);
}, 1000); }, 1000);
@@ -312,11 +322,12 @@ function onPlayerSpawn(client) {
logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s player data is valid. Continuing spawn processing ...`); logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s player data is valid. Continuing spawn processing ...`);
logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player skin for ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).skin}`); //logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player skin for ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).skin}`);
setPlayerSkin(client, getPlayerCurrentSubAccount(client).skin); //setPlayerSkin(client, getPlayerCurrentSubAccount(client).skin);
restorePlayerCamera(client); restorePlayerCamera(client);
//if(getServerGame() != GAME_GTA_IV) {
logToConsole(LOG_DEBUG, `Storing ${getPlayerDisplayForConsole(client)} ped in client data `); logToConsole(LOG_DEBUG, `Storing ${getPlayerDisplayForConsole(client)} ped in client data `);
getPlayerData(client).ped = client.player; getPlayerData(client).ped = client.player;
@@ -328,12 +339,11 @@ function onPlayerSpawn(client) {
logToConsole(LOG_DEBUG, `[Asshat.Event] Updating spawned state for ${getPlayerDisplayForConsole(client)} to true`); logToConsole(LOG_DEBUG, `[Asshat.Event] Updating spawned state for ${getPlayerDisplayForConsole(client)} to true`);
updatePlayerSpawnedState(client, true); updatePlayerSpawnedState(client, true);
//logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player interior for ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).interior}`);
//setPlayerInterior(client, getPlayerCurrentSubAccount(client).interior);
logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player interior for ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).interior}`); //logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player dimension for ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).dimension}`);
setPlayerInterior(client, getPlayerCurrentSubAccount(client).interior); //setPlayerDimension(client, getPlayerCurrentSubAccount(client).dimension);
logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player dimension for ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).dimension}`);
setPlayerDimension(client, getPlayerCurrentSubAccount(client).dimension);
logToConsole(LOG_DEBUG, `[Asshat.Event] Updating all player name tags`); logToConsole(LOG_DEBUG, `[Asshat.Event] Updating all player name tags`);
updateAllPlayerNameTags(); updateAllPlayerNameTags();