diff options
| m--------- | MCServer/Plugins/TransAPI | 6 | ||||
| -rw-r--r-- | source/BlockID.h | 2 | ||||
| -rw-r--r-- | source/World.cpp | 18 |
3 files changed, 8 insertions, 18 deletions
diff --git a/MCServer/Plugins/TransAPI b/MCServer/Plugins/TransAPI deleted file mode 160000 -Subproject 52e1de4332a026e58fda843aae98c1f51e57199 diff --git a/source/BlockID.h b/source/BlockID.h index 8a60c16ce..3c4381ae1 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -170,7 +170,7 @@ enum ENUM_BLOCK_ID E_BLOCK_DROPPER = 158, E_BLOCK_STAINED_CLAY = 159, - E_BLOCK_HAY_BALE = 170 + E_BLOCK_HAY_BALE = 170, E_BLOCK_CARPET = 171, E_BLOCK_HARDENED_CLAY = 172, E_BLOCK_BLOCK_OF_COAL = 173, diff --git a/source/World.cpp b/source/World.cpp index 5c15a3965..6b82dce0f 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -2635,19 +2635,15 @@ void cWorld::TabCompleteUserName(const AString & a_Text, AStringVector & a_Resul cCSLock Lock(m_CSPlayers); for (cPlayerList::iterator itr = m_Players.begin(), end = m_Players.end(); itr != end; ++itr) { - for (unsigned int selected = 0; selected < a_Text.length(); selected++ ) + unsigned LastSpace = a_Text.find_last_of(" "); + std::string LastWord = a_Text.substr(LastSpace + 1, a_Text.length()); + std::string PlayerName ((*itr)->GetName()); + std::size_t Found = PlayerName.find(LastWord); + if (Found!=0) { - std::string playername ((*itr)->GetName()); - std::string cut (a_Text.substr(selected, a_Text.length())); - std::size_t found = playername.find(cut); - if (found!=0) - { - //Player name doesn't match - continue; - } - a_Results.push_back((*itr)->GetName()); - break; + continue; } + a_Results.push_back((*itr)->GetName()); } } |