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

Merge remote-tracking branch 'origin/master' into c++11

Browse Source 
Conflicts:
	src/Noise/Noise.h
	src/World.h
This commit is contained in:
Tiger Wang
2014-11-23 17:12:34 +00:00
parent 6382989ba0 dea8b684b2
commit 79e5b82354
99 changed files with 7166 additions and 1616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Root.cpp
View File

@@ -627,6 +627,22 @@ bool cRoot::FindAndDoWithPlayer(const AString & a_PlayerName, cPlayerListCallbac
bool cRoot::DoWithPlayerByUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback)
{
for (WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end();itr++)
{
if (itr->second->DoWithPlayerByUUID(a_PlayerUUID, a_Callback))
{
return true;
}
}
return false;
}
AString cRoot::GetProtocolVersionTextFromInt(int a_ProtocolVersion)
{
return cProtocolRecognizer::GetVersionTextFromInt(a_ProtocolVersion);