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

Fix sacct saving to include int & vw

Browse Source
This commit is contained in:
Vortrex
2020-12-27 21:28:06 -06:00
parent 5c60c30ea0
commit 8a75bee292
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/server/subaccount.js
View File

@@ -81,7 +81,7 @@ function saveSubAccountToDatabase(subAccountData) {
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
if(dbConnection) { if(dbConnection) {
let dbQueryString = `UPDATE sacct_main SET sacct_pos_x=${subAccountData.spawnPosition.x}, sacct_pos_y=${subAccountData.spawnPosition.y}, sacct_pos_z=${subAccountData.spawnPosition.z}, sacct_angle=${subAccountData.spawnHeading}, sacct_skin=${subAccountData.skin}, sacct_cash=${subAccountData.cash}, sacct_job=${subAccountData.job}, sacct_int=${subAccountData.interior}, sacct_vw=${subAccountData.dimension} WHERE sacct_id=${subAccountData.databaseId}`; let dbQueryString = `UPDATE sacct_main SET sacct_pos_x=${subAccountData.spawnPosition.x}, sacct_pos_y=${subAccountData.spawnPosition.y}, sacct_pos_z=${subAccountData.spawnPosition.z}, sacct_angle=${subAccountData.spawnHeading}, sacct_skin=${subAccountData.skin}, sacct_cash=${subAccountData.cash}, sacct_job=${subAccountData.job}, sacct_int=${getPlayerInterior(client)}, sacct_vw=${getPlayerVirtualWorld(client)} WHERE sacct_id=${subAccountData.databaseId}`;
let dbQuery = queryDatabase(dbConnection, dbQueryString); let dbQuery = queryDatabase(dbConnection, dbQueryString);
//freeDatabaseQuery(dbQuery); //freeDatabaseQuery(dbQuery);
disconnectFromDatabase(dbConnection); disconnectFromDatabase(dbConnection);
@@ -163,9 +163,8 @@ function checkNewCharacter(client, firstName, lastName, dateOfBirth, placeOfOrig
return false; return false;
} }
if(areParamsEmpty(skinId)) { if(!skinId) {
triggerNetworkEvent("ag.newCharacterFailed", client, "Invalid skin!"); skinId = getServerConfig().newCharacter.skin;
return false;
} }
let subAccountData = createSubAccount(getPlayerData(client).accountData.databaseId, firstName, lastName, skinId, dateOfBirth, placeOfOrigin); let subAccountData = createSubAccount(getPlayerData(client).accountData.databaseId, firstName, lastName, skinId, dateOfBirth, placeOfOrigin);
@@ -234,9 +233,6 @@ async function selectCharacter(client, characterId = -1) {
tempSubAccount.lastLogin = new Date().getTime(); tempSubAccount.lastLogin = new Date().getTime();
updatePlayerNameTag(client);
sendAccountKeyBindsToClient(client);
messageClientAlert(client, `You are now playing as: [#0099FF]${tempSubAccount.firstName} ${tempSubAccount.lastName}`, getColourByName("white")); messageClientAlert(client, `You are now playing as: [#0099FF]${tempSubAccount.firstName} ${tempSubAccount.lastName}`, getColourByName("white"));
messageClientNormal(client, "This server is in early development and may restart at any time for updates.", getColourByName("orange")); messageClientNormal(client, "This server is in early development and may restart at any time for updates.", getColourByName("orange"));
messageClientNormal(client, "Please report any bugs using /bug and suggestions using /idea", getColourByName("yellow")); messageClientNormal(client, "Please report any bugs using /bug and suggestions using /idea", getColourByName("yellow"));
@@ -257,7 +253,7 @@ async function selectCharacter(client, characterId = -1) {
}, 1000); }, 1000);
}, client.ping+1000); }, client.ping+1000);
updateAllPlayerNameTags();
} }
addNetworkHandler("ag.selectCharacter", selectCharacter); addNetworkHandler("ag.selectCharacter", selectCharacter);
@@ -269,6 +265,8 @@ function switchCharacterCommand(command, params, client) {
saveSubAccountToDatabase(getClientCurrentSubAccount(client)); saveSubAccountToDatabase(getClientCurrentSubAccount(client));
resetClientStuff(client);
client.despawnPlayer(); client.despawnPlayer();
showConnectCameraToPlayer(client); showConnectCameraToPlayer(client);
showCharacterSelectToClient(client); showCharacterSelectToClient(client);
@@ -312,7 +310,7 @@ function getPlayerLastUsedSubAccount(client) {
lastUsed = i; lastUsed = i;
} }
} }
return lastUsed return lastUsed;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------