ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player.

master
Vincent 2014-12-08 00:16:09 -08:00
parent d8d3b9aec5
commit ed09e76023
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/ClientHandle.cpp
View File

@ -1790,32 +1790,35 @@ void cClientHandle::HandleKeepAlive(int a_KeepAliveID)
bool cClientHandle::CheckMultiLogin(void) bool cClientHandle::CheckMultiLogin(void)
{ {
std::list<AString> usernamesServer = cRoot::Get()->GetServer()->GetUsernames(); if (!(cRoot::Get()->GetServer()->IsAllowMultiLogin()))
for (auto item : usernamesServer)
{ {
if ((item).compare(a_Username) == 0) std::list<AString> usernamesServer = cRoot::Get()->GetServer()->GetUsernames();
for (auto item : usernamesServer)
{
if ((item).compare(a_Username) == 0)
{
Kick("A player of the username is already logged in");
return false;
}
}
class cCallback :
public cPlayerListCallback
{
virtual bool Item(cPlayer * a_Player) override
{
return true;
}
} Callback;
if (cRoot::Get()->GetDefaultWorld()->DoWithPlayer(a_Username, Callback))
{ {
Kick("A player of the username is already logged in"); Kick("A player of the username is already logged in");
return false; return false;
} }
} }
class cCallback :
public cPlayerListCallback
{
virtual bool Item(cPlayer * a_Player) override
{
return true;
}
} Callback;
if (cRoot::Get()->GetDefaultWorld()->DoWithPlayer(a_Username, Callback))
{
Kick("A player of the username is already logged in");
return false;
}
return true; return true;
} }
@ -1834,12 +1837,8 @@ bool cClientHandle::HandleHandshake(const AString & a_Username)
} }
} }
if (!(cRoot::Get()->GetServer()->IsAllowMultiLogin())) return CheckMultiLogin();
{
return CheckMultiLogin();
}
return true;
} }