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

Fix sacct create query

Browse Source
This commit is contained in:
Vortrex
2021-04-24 11:01:42 -05:00
parent d7405bcfa3
commit 42ec0058ac
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/server/subaccount.js
View File

@@ -64,6 +64,9 @@ function loadSubAccountsFromAccount(accountId) {
if(dbQuery) { if(dbQuery) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) { while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempSubAccount = new serverClasses.subAccountData(dbAssoc); let tempSubAccount = new serverClasses.subAccountData(dbAssoc);
if(tempSubAccount.skin == -1) {
tempSubAccount.skin = getServerConfig().newCharacter.skin;
}
tempSubAccounts.push(tempSubAccount); tempSubAccounts.push(tempSubAccount);
} }
freeDatabaseQuery(dbQuery); freeDatabaseQuery(dbQuery);
@@ -166,23 +169,25 @@ function saveSubAccountToDatabase(subAccountData) {
// =========================================================================== // ===========================================================================
function createSubAccount(accountId, firstName, lastName, skinId) { function createSubAccount(accountId, firstName, lastName) {
logToConsole(LOG_DEBUG, `[Asshat.Account] Attempting to create subaccount ${firstName} ${lastName} in database`); logToConsole(LOG_DEBUG, `[Asshat.Account] Attempting to create subaccount ${firstName} ${lastName} in database`);
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
let dbQuery = false;
if(dbConnection) { if(dbConnection) {
let safeFirstName = escapeDatabaseString(dbConnection, firstName); let safeFirstName = escapeDatabaseString(dbConnection, firstName);
let safeLastName = escapeDatabaseString(dbConnection, lastName); let safeLastName = escapeDatabaseString(dbConnection, lastName);
let dbQuery = queryDatabase(dbConnection, `INSERT INTO sacct_main (sacct_acct, sacct_name_first, sacct_name_last, sacct_skin, sacct_pos_x, sacct_pos_y, sacct_pos_z, sacct_angle, sacct_cash, sacct_server, sacct_health, sacct_when_made, sacct_when_lastlogin) VALUES (${accountId}, '${safeFirstName}', '${safeLastName}', ${getServerConfig().newCharacter.skin}, ${getServerConfig().newCharacter.spawnPosition.x}, ${getServerConfig().newCharacter.spawnPosition.y}, ${getServerConfig().newCharacter.spawnPosition.z}, ${getServerConfig().newCharacter.spawnHeading}, ${getServerConfig().newCharacter.money}, ${getServerId()}, 100, UNIX_TIMESTAMP(), 0)`); dbQuery = queryDatabase(dbConnection, `INSERT INTO sacct_main (sacct_acct, sacct_name_first, sacct_name_last, sacct_pos_x, sacct_pos_y, sacct_pos_z, sacct_angle, sacct_cash, sacct_server, sacct_health, sacct_when_made, sacct_when_lastlogin) VALUES (${accountId}, '${safeFirstName}', '${safeLastName}', ${getServerConfig().newCharacter.spawnPosition.x}, ${getServerConfig().newCharacter.spawnPosition.y}, ${getServerConfig().newCharacter.spawnPosition.z}, ${getServerConfig().newCharacter.spawnHeading}, ${getServerConfig().newCharacter.money}, ${getServerId()}, 100, UNIX_TIMESTAMP(), 0)`);
if(dbQuery) { //if(dbQuery) {
if(getDatabaseInsertId(dbConnection) > 0) { if(getDatabaseInsertId(dbConnection) > 0) {
let dbInsertId = getDatabaseInsertId(dbConnection); let dbInsertId = getDatabaseInsertId(dbConnection);
createDefaultSubAccountServerData(dbInsertId) createDefaultSubAccountServerData(dbInsertId, getServerConfig().newCharacter.skin);
return loadSubAccountFromId(getDatabaseInsertId(dbConnection)); let tempSubAccount = loadSubAccountFromId(dbInsertId);
return tempSubAccount;
} }
freeDatabaseQuery(dbQuery); //freeDatabaseQuery(dbQuery);
} //}
disconnectFromDatabase(dbConnection); disconnectFromDatabase(dbConnection);
} }
@@ -247,10 +252,10 @@ function checkNewCharacter(client, firstName, lastName) {
let skinId = allowedSkins[getServerGame()][getPlayerData(client).creatingCharacterSkin]; let skinId = allowedSkins[getServerGame()][getPlayerData(client).creatingCharacterSkin];
let subAccountData = createSubAccount(getPlayerData(client).accountData.databaseId, firstName, lastName, skinId); let subAccountData = createSubAccount(getPlayerData(client).accountData.databaseId, firstName, lastName);
if(!subAccountData) { if(!subAccountData) {
if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) { if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) {
showPlayerNewCharacterFailedGUI("Your character could not be created!"); showPlayerNewCharacterFailedGUI(client, "Your character could not be created!");
} else { } else {
messagePlayerAlert(client, "Your character could not be created!"); messagePlayerAlert(client, "Your character could not be created!");
} }
@@ -494,10 +499,15 @@ function setFightStyleCommand(command, params, client) {
// =========================================================================== // ===========================================================================
function createDefaultSubAccountServerData(databaseId) { function createDefaultSubAccountServerData(databaseId, thisServerSkin) {
for(let i = 1 ; i <= 4 ; i++) { for(let i = 1 ; i <= 4 ; i++) {
let dbQueryString = `INSERT INTO sacct_svr (sacct_svr_sacct, sacct_svr_server) VALUES (${databaseId}, ${i})`; if(i == getServerId()) {
quickDatabaseQuery(dbQueryString); let dbQueryString = `INSERT INTO sacct_svr (sacct_svr_sacct, sacct_svr_server, sacct_svr_skin) VALUES (${databaseId}, ${i}, ${thisServerSkin})`;
quickDatabaseQuery(dbQueryString);
} else {
let dbQueryString = `INSERT INTO sacct_svr (sacct_svr_sacct, sacct_svr_server, sacct_svr_skin) VALUES (${databaseId}, ${i}, -1)`;
quickDatabaseQuery(dbQueryString);
}
} }
} }