1 files changed, 23 insertions, 5 deletions

diff --git a/source/World.cpp b/source/World.cpp
index 6b82dce0f..97186fa24 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -1385,6 +1385,21 @@ void cWorld::FastSetBlock(int a_X, int a_Y, int a_Z, BLOCKTYPE a_BlockType, NIBB
 
 
 
+void cWorld::SetServerBlock(int a_X, int a_Y, int a_Z, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
+{
+	if (a_BlockType == E_BLOCK_AIR)
+	{
+		BlockHandler(GetBlock(a_X, a_Y, a_Z))->OnDestroyed(this, a_X, a_Y, a_Z);
+	}
+	m_ChunkMap->SetServerBlock(a_X, a_Y, a_Z, a_BlockType, a_BlockMeta);
+
+	BlockHandler(a_BlockType)->OnPlaced(this, a_X, a_Y, a_Z, a_BlockType, a_BlockMeta);
+}
+
+
+
+
+
 BLOCKTYPE cWorld::GetBlock(int a_X, int a_Y, int a_Z)
 {
 	// First check if it isn't queued in the m_FastSetBlockQueue:
@@ -2635,15 +2650,18 @@ 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)
 	{
-		unsigned LastSpace = a_Text.find_last_of(" ");
-		std::string LastWord = a_Text.substr(LastSpace + 1, a_Text.length());
+		size_t LastSpace = a_Text.find_last_of(" "); //Find the position of the last space
+		
+		std::string LastWord = a_Text.substr(LastSpace + 1, a_Text.length()); //Find the last word
 		std::string PlayerName ((*itr)->GetName());
-		std::size_t Found = PlayerName.find(LastWord);
+		std::size_t Found = PlayerName.find(LastWord); //Try to find last word in playername
+		
 		if (Found!=0)
 		{
-			continue;
+			continue; //No match
 		}
-		a_Results.push_back((*itr)->GetName());
+		
+		a_Results.push_back((*itr)->GetName()); //Match!
 	}
 }