Use utils + formatting

This commit is contained in:
Vortrex
2022-04-12 06:30:30 -05:00
parent 5f3484e3e0
commit 7aacf876da
5 changed files with 8 additions and 8 deletions

View File

@@ -937,13 +937,13 @@ function checkRegistration(client, password, confirmPassword = "", emailAddress
} else { } else {
messagePlayerError(client, "Password doesn't meet requirements!"); messagePlayerError(client, "Password doesn't meet requirements!");
} }
return false return false;
} }
if(doesServerHaveGUIEnabled() && doesPlayerHaveGUIEnabled(client)) { if(doesServerHaveGUIEnabled() && doesPlayerHaveGUIEnabled(client)) {
if(!isValidEmailAddress(emailAddress)) { if(!isValidEmailAddress(emailAddress)) {
showPlayerRegistrationFailedGUI(client, getLocaleString(client, "RegistrationFailedInvalidEmail")); showPlayerRegistrationFailedGUI(client, getLocaleString(client, "RegistrationFailedInvalidEmail"));
return false return false;
} }
} }
@@ -1104,7 +1104,7 @@ function savePlayerToDatabase(client) {
return false; return false;
} }
if(!getPlayerData(client).loggedIn) { if(!isPlayerLoggedIn(client)) {
return false; return false;
} }

View File

@@ -104,7 +104,7 @@ function messageDiscordChatChannel(messageString) {
// =========================================================================== // ===========================================================================
function messageDiscordEventChannel(messageString) { function messageDiscordEventChannel(messageString) {
if(getServerConfig().devServer) { if(getServerConfig().devServer == true) {
return false; return false;
} }
@@ -119,7 +119,7 @@ function messageDiscordEventChannel(messageString) {
// =========================================================================== // ===========================================================================
function messageDiscordAdminChannel(messageString) { function messageDiscordAdminChannel(messageString) {
if(getServerConfig().devServer) { if(getServerConfig().devServer == true) {
return false; return false;
} }

View File

@@ -474,7 +474,7 @@ function onPlayerSpawn(client) {
} }
logToConsole(LOG_DEBUG, `[VRR.Event] Checking ${getPlayerDisplayForConsole(client)}'s login status`); logToConsole(LOG_DEBUG, `[VRR.Event] Checking ${getPlayerDisplayForConsole(client)}'s login status`);
if(!getPlayerData(client).loggedIn) { if(!isPlayerLoggedIn(client)) {
logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)} is NOT logged in. Despawning their player.`); logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)} is NOT logged in. Despawning their player.`);
client.disconnect(); client.disconnect();
return false; return false;

View File

@@ -619,7 +619,7 @@ function stopWorking(client) {
if(jobVehicle) { if(jobVehicle) {
if(getPlayerVehicle(client) == jobVehicle) { if(getPlayerVehicle(client) == jobVehicle) {
removePlayerFromVehicle(client); removePlayerFromVehicle(client);
//client.player.removeFromVehicle(); //getPlayerPed(client).removeFromVehicle();
} }
respawnVehicle(jobVehicle); respawnVehicle(jobVehicle);

View File

@@ -333,7 +333,7 @@ function checkPlayerSpawning() {
for(let i in clients) { for(let i in clients) {
if(!isConsole(clients[i])) { if(!isConsole(clients[i])) {
if(getPlayerData(clients[i])) { if(getPlayerData(clients[i])) {
if(getPlayerData(clients[i]).loggedIn) { if(isPlayerLoggedIn(clients[i])) {
if(!getPlayerData(clients[i]).ped) { if(!getPlayerData(clients[i]).ped) {
if(clients[i].player != null) { if(clients[i].player != null) {
//getPlayerData(clients[i]).ped = clients[i].player; //getPlayerData(clients[i]).ped = clients[i].player;