OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-03-04 07:00:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small DB fixes

Browse Source
This commit is contained in:
Kamil
2020-12-03 01:40:36 +01:00
committed by Gent S
parent 31ac9d2e3b
commit 2bad1252d3
4 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/CNLoginServer.cpp
View File

@@ -326,7 +326,8 @@ void CNLoginServer::characterCreate(CNSocket* sock, CNPacketData* data) {
Database::finishCharacter(character);
Player player = Database::getPlayer(character->PCStyle.iPC_UID);;
Player player = {};
Database::getPlayer(&player, character->PCStyle.iPC_UID);
INITSTRUCT(sP_LS2CL_REP_CHAR_CREATE_SUCC, resp);
resp.sPC_Style = player.PCStyle;
@@ -403,7 +404,8 @@ void CNLoginServer::characterSelect(CNSocket* sock, CNPacketData* data) {
resp.g_FE_ServerPort = settings::SHARDPORT;
// pass player to CNSharedData
Player passPlayer = Database::getPlayer(selection->iPC_UID);
Player passPlayer = {};
Database::getPlayer(&passPlayer, selection->iPC_UID);
passPlayer.FEKey = sock->getFEKey();
resp.iEnterSerialKey = passPlayer.iID;
CNSharedData::setPlayer(resp.iEnterSerialKey, passPlayer);
@@ -460,7 +462,7 @@ void CNLoginServer::changeName(CNSocket* sock, CNPacketData* data) {
return;
}
Database::changeName(save);
Database::changeName(save, loginSessions[sock].userID);
INITSTRUCT(sP_LS2CL_REP_CHANGE_CHAR_NAME_SUCC, resp);
resp.iPC_UID = save->iPCUID;
@@ -485,15 +487,16 @@ void CNLoginServer::duplicateExit(CNSocket* sock, CNPacketData* data) {
// TODO: FIX THIS PACKET
sP_CL2LS_REQ_PC_EXIT_DUPLICATE* exit = (sP_CL2LS_REQ_PC_EXIT_DUPLICATE*)data->buf;
auto account = Database::findAccount(U16toU8(exit->szID));
Database::Account account = {};
Database::findAccount(&account, U16toU8(exit->szID));
// sanity check
if (account == nullptr) {
if (account.AccountID == 0) {
std::cout << "[WARN] P_CL2LS_REQ_PC_EXIT_DUPLICATE submitted unknown username: " << exit->szID << std::endl;
return;
}
exitDuplicate(account->AccountID);
exitDuplicate(account.AccountID);
}
#pragma endregion