summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent <vincent.leung60@gmail.com>2014-12-08 09:57:46 +0100
committerVincent <vincent.leung60@gmail.com>2014-12-08 09:57:46 +0100
commite28cc876c4aa4d71f821fca45b5486b8ef6cca4e (patch)
tree4b167adf142f29341bbcee45c3f3ee1caf61efea
parentFixed compile errors (diff)
downloadcuberite-e28cc876c4aa4d71f821fca45b5486b8ef6cca4e.tar
cuberite-e28cc876c4aa4d71f821fca45b5486b8ef6cca4e.tar.gz
cuberite-e28cc876c4aa4d71f821fca45b5486b8ef6cca4e.tar.bz2
cuberite-e28cc876c4aa4d71f821fca45b5486b8ef6cca4e.tar.lz
cuberite-e28cc876c4aa4d71f821fca45b5486b8ef6cca4e.tar.xz
cuberite-e28cc876c4aa4d71f821fca45b5486b8ef6cca4e.tar.zst
cuberite-e28cc876c4aa4d71f821fca45b5486b8ef6cca4e.zip
Diffstat (limited to '')
-rw-r--r--src/ClientHandle.cpp2
-rw-r--r--src/Root.cpp9
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 6f7bd1faf..6fe7cbd4a 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1807,7 +1807,7 @@ bool cClientHandle::CheckMultiLogin(const AString & a_Username)
}
} Callback;
- if (cRoot::Get()->GetDefaultWorld()->DoWithPlayer(a_Username, Callback))
+ if (cRoot::Get()->DoWithPlayer(a_Username, Callback))
{
Kick("A player of the username is already logged in");
return false;
diff --git a/src/Root.cpp b/src/Root.cpp
index dddb943a2..c59590d95 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -651,7 +651,14 @@ bool cRoot::DoWithPlayerByUUID(const AString & a_PlayerUUID, cPlayerListCallback
bool cRoot::DoWithPlayer(const AString & a_PlayerName, cPlayerListCallback & a_Callback)
{
-
+ for (WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end(); itr++)
+ {
+ if (itr->second->DoWithPlayer(a_PlayerName, a_Callback))
+ {
+ return true;
+ }
+ }
+ return false;
}