pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-15 12:58:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes to make it actually sorta work

Browse Source
This commit is contained in:
KimLS
2017-12-11 18:38:04 -08:00
parent 5bbeec626c
commit 569a907e43
11 changed files with 75 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loginserver/client_manager.cpp
+6 -13
View File
@@ -124,12 +124,12 @@ void ClientManager::ProcessDisconnect()
}
}
void ClientManager::RemoveExistingClient(unsigned int account_id)
void ClientManager::RemoveExistingClient(unsigned int account_id, const std::string &loginserver)
{
auto iter = clients.begin();
while (iter != clients.end())
{
if ((*iter)->GetAccountID() == account_id)
if ((*iter)->GetAccountID() == account_id && (*iter)->GetLoginServerName().compare(loginserver) == 0)
{
Log(Logs::General, Logs::Login_Server, "Client attempting to log in and existing client already logged in, removing existing client.");
delete (*iter);
@@ -142,24 +142,17 @@ void ClientManager::RemoveExistingClient(unsigned int account_id)
}
}
Client *ClientManager::GetClient(unsigned int account_id)
Client *ClientManager::GetClient(unsigned int account_id, const std::string &loginserver)
{
Client *cur = nullptr;
int count = 0;
auto iter = clients.begin();
while (iter != clients.end())
{
if ((*iter)->GetAccountID() == account_id)
if ((*iter)->GetAccountID() == account_id && (*iter)->GetLoginServerName().compare(loginserver) == 0)
{
cur = (*iter);
count++;
return (*iter);
}
++iter;
}
if (count > 1)
{
Log(Logs::General, Logs::Error, "More than one client with a given account_id existed in the client list.");
}
return cur;
return nullptr;
}