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

Tab completion across worlds (#3270)

Browse Source 
Fixes #2563.
This commit is contained in:
Alexander Harkness
2016-07-21 12:00:30 +01:00
committed by Mattes D
parent fc5fb03fec
commit a2a9341c24
5 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ClientHandle.cpp
View File

@@ -1831,12 +1831,24 @@ void cClientHandle::HandleUnmount(void)
void cClientHandle::HandleTabCompletion(const AString & a_Text)
{
AStringVector Results;
m_Player->GetWorld()->TabCompleteUserName(a_Text, Results);
// Get player name completions.
if (cRoot::Get()->GetServer()->ShouldAllowMultiWorldTabCompletion())
{
Results = cRoot::Get()->GetPlayerTabCompletionMultiWorld(a_Text);
}
else
{
m_Player->GetWorld()->TabCompleteUserName(a_Text, Results);
}
// Get command completions.
cRoot::Get()->GetPluginManager()->TabCompleteCommand(a_Text, Results, m_Player);
if (Results.empty())
{
return;
}
// Sort and send results.
std::sort(Results.begin(), Results.end());
SendTabCompletionResults(Results);
}