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

Sending all labels using one util func

Browse Source
This commit is contained in:
Vortrex
2020-12-28 01:23:49 -06:00
parent 07dbeb55c7
commit 45c34aab3a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/server/account.js
View File

@@ -434,9 +434,7 @@ function loginSuccess(client) {
getPlayerData(client).accountData.ipAddress = client.ip; getPlayerData(client).accountData.ipAddress = client.ip;
sendRemovedWorldObjectsToPlayer(client); sendRemovedWorldObjectsToPlayer(client);
sendAllBusinessLabelsToPlayer(client); sendAllLabelsToPlayer(client);
sendAllHouseLabelsToPlayer(client);
sendAllJobLabelsToPlayer(client);
sendAccountKeyBindsToClient(client); sendAccountKeyBindsToClient(client);
//message(`👋 ${client.name} has joined the server`, getColourByName("softYellow")); //message(`👋 ${client.name} has joined the server`, getColourByName("softYellow"));
@@ -735,6 +733,8 @@ function savePlayerToDatabase(client) {
if(client.player != null) { if(client.player != null) {
subAccountData.spawnPosition = getPlayerPosition(client); subAccountData.spawnPosition = getPlayerPosition(client);
subAccountData.spawnHeading = getPlayerHeading(client); subAccountData.spawnHeading = getPlayerHeading(client);
subAccountData.interior = getPlayerInterior(client);
subAccountData.dimension = getPlayerVirtualWorld(client);
} }
saveSubAccountToDatabase(subAccountData); saveSubAccountToDatabase(subAccountData);
@@ -746,6 +746,10 @@ function savePlayerToDatabase(client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function initClient(client) { function initClient(client) {
if(client.console) {
return false;
}
triggerNetworkEvent("ag.guiColour", client, getServerConfig().guiColour[0], getServerConfig().guiColour[1], getServerConfig().guiColour[2]); triggerNetworkEvent("ag.guiColour", client, getServerConfig().guiColour[0], getServerConfig().guiColour[1], getServerConfig().guiColour[2]);
triggerNetworkEvent("ag.logo", client, getServerConfig().showLogo); triggerNetworkEvent("ag.logo", client, getServerConfig().showLogo);
triggerNetworkEvent("ag.snow", client, getServerConfig().fallingSnow, getServerConfig().groundSnow); triggerNetworkEvent("ag.snow", client, getServerConfig().fallingSnow, getServerConfig().groundSnow);
@@ -769,23 +773,23 @@ function initClient(client) {
loginSuccess(client); loginSuccess(client);
} else { } else {
if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) { if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) {
console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} is being shown the login GUI.`);
triggerNetworkEvent("ag.showLogin", client); triggerNetworkEvent("ag.showLogin", client);
} else { } else {
console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} is being shown the login message (GUI disabled).`);
messageClient(`Welcome back to Asshat Gaming RP, ${client.name}! Please /login to continue.`, client, getColourByName("softGreen")); messageClient(`Welcome back to Asshat Gaming RP, ${client.name}! Please /login to continue.`, client, getColourByName("softGreen"));
} }
} }
} else { } else {
if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) { if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) {
console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} is being shown the register GUI.`);
triggerNetworkEvent("ag.showRegistration", client); triggerNetworkEvent("ag.showRegistration", client);
} else { } else {
console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} is being shown the register message (GUI disabled).`);
messageClient(`Welcome to Asshat Gaming RP, ${client.name}! Please /register to continue.`, client, getColourByName("softGreen")); messageClient(`Welcome to Asshat Gaming RP, ${client.name}! Please /register to continue.`, client, getColourByName("softGreen"));
} }
} }
}, 2500); }, 2500);
//if(server.game < GAME_GTA_IV) {
// sendAllBlips(client);
//}
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------