pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 23:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix Auto Login Issue (#4213)

Browse Source 
* [Bug Fix] Fix Auto Login Issue

# Notes
- We were setting `live_name` value regardless of if we were zoning, causing us to automatically log in to the last character we'd logged in to before.

* Remove &
This commit is contained in:
Alex King 2024-03-28 09:48:17 -04:00 committed by GitHub
parent 52417023f8
commit f905ee70e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/database.cpp
View File

@ -986,7 +986,7 @@ bool Database::UpdateLiveChar(const std::string& name, uint32 account_id)
return AccountRepository::UpdateOne(*this, e); return AccountRepository::UpdateOne(*this, e);
} }
const std::string& Database::GetLiveChar(uint32 account_id) const std::string Database::GetLiveChar(uint32 account_id)
{ {
auto e = AccountRepository::FindOne(*this, account_id); auto e = AccountRepository::FindOne(*this, account_id);

2
common/database.h
View File

@ -166,7 +166,7 @@ public:
bool GetAdventureStats(uint32 character_id, AdventureStats_Struct* as); bool GetAdventureStats(uint32 character_id, AdventureStats_Struct* as);
/* Account Related */ /* Account Related */
const std::string& GetLiveChar(uint32 account_id); const std::string GetLiveChar(uint32 account_id);
bool SetAccountStatus(const std::string& account_name, int16 status); bool SetAccountStatus(const std::string& account_name, int16 status);
bool SetLocalPassword(uint32 account_id, const std::string& password); bool SetLocalPassword(uint32 account_id, const std::string& password);
bool UpdateLiveChar(const std::string& name, uint32 account_id); bool UpdateLiveChar(const std::string& name, uint32 account_id);

3
world/client.cpp
View File

@ -193,8 +193,9 @@ bool Client::CanTradeFVNoDropItem()
void Client::SendEnterWorld(std::string name) void Client::SendEnterWorld(std::string name)
{ {
const std::string live_name = database.GetLiveChar(GetAccountID()); std::string live_name {};
if (is_player_zoning) { if (is_player_zoning) {
live_name = database.GetLiveChar(GetAccountID());
if(database.GetAccountIDByChar(live_name) != GetAccountID()) { if(database.GetAccountIDByChar(live_name) != GetAccountID()) {
eqs->Close(); eqs->Close();
return; return;