flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Uses callback for players already in World.

Browse Source
This commit is contained in:
Vincent 2014-11-29 15:44:38 -08:00
parent a7bf2725c8
commit 72797b14fe
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ClientHandle.cpp
View File

@ -1790,6 +1790,7 @@ void cClientHandle::HandleKeepAlive(int a_KeepAliveID)
bool cClientHandle::HandleHandshake(const AString & a_Username) bool cClientHandle::HandleHandshake(const AString & a_Username)
{ {
if (!cRoot::Get()->GetPluginManager()->CallHookHandshake(*this, a_Username)) if (!cRoot::Get()->GetPluginManager()->CallHookHandshake(*this, a_Username))
{ {
if (cRoot::Get()->GetServer()->GetNumPlayers() >= cRoot::Get()->GetServer()->GetMaxPlayers()) if (cRoot::Get()->GetServer()->GetNumPlayers() >= cRoot::Get()->GetServer()->GetMaxPlayers())
@ -1801,11 +1802,6 @@ bool cClientHandle::HandleHandshake(const AString & a_Username)
if (!(cRoot::Get()->GetServer()->IsAllowMultiLogin())) if (!(cRoot::Get()->GetServer()->IsAllowMultiLogin()))
{ {
std::list<AString> usernamesServer = cRoot::Get()->GetServer()->GetUsernames(); std::list<AString> usernamesServer = cRoot::Get()->GetServer()->GetUsernames();
std::list<AString> usernamesWorld = cRoot::Get()->GetDefaultWorld()-> GetUsernames();
usernamesServer.sort();
usernamesWorld.sort();
usernamesServer.merge(usernamesWorld);
for (std::list<AString>::iterator itr = usernamesServer.begin(); itr != usernamesServer.end(); ++itr) for (std::list<AString>::iterator itr = usernamesServer.begin(); itr != usernamesServer.end(); ++itr)
{ {
@ -1815,6 +1811,17 @@ bool cClientHandle::HandleHandshake(const AString & a_Username)
return false; return false;
} }
} }
class cCallback : public cPlayerListCallback
{
virtual bool Item(cPlayer * a_Player) override
{
return false;
}
} Callback;
if (cRoot::Get()->GetDefaultWorld()->DoWithPlayer(a_Username, Callback))
{
Kick("User already logged in.");
}
} }
return true; return true;
} }