15 files changed, 406 insertions, 221 deletions

diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp
index 7c808f2c1..fd7914bb6 100644
--- a/Tools/ProtoProxy/Connection.cpp
+++ b/Tools/ProtoProxy/Connection.cpp
@@ -193,6 +193,7 @@ enum
 	PACKET_PLAYER_LIST_ITEM          = 0xc9,
 	PACKET_PLAYER_ABILITIES          = 0xca,
 	PACKET_INCREMENT_STATISTIC       = 0xc8,
+	PACKET_TAB_COMPLETION            = 0xcb,
 	PACKET_LOCALE_AND_VIEW           = 0xcc,
 	PACKET_CLIENT_STATUSES           = 0xcd,
 	PACKET_PLUGIN_MESSAGE            = 0xfa,
@@ -579,6 +580,7 @@ bool cConnection::DecodeClientsPackets(const char * a_Data, int a_Size)
 			case PACKET_PLAYER_POSITION_LOOK:      HANDLE_CLIENT_READ(HandleClientPlayerPositionLook); break;
 			case PACKET_PLUGIN_MESSAGE:            HANDLE_CLIENT_READ(HandleClientPluginMessage); break;
 			case PACKET_SLOT_SELECT:               HANDLE_CLIENT_READ(HandleClientSlotSelect); break;
+			case PACKET_TAB_COMPLETION:            HANDLE_CLIENT_READ(HandleClientTabCompletion); break;
 			case PACKET_UPDATE_SIGN:               HANDLE_CLIENT_READ(HandleClientUpdateSign); break;
 			case PACKET_USE_ENTITY:                HANDLE_CLIENT_READ(HandleClientUseEntity); break;
 			case PACKET_WINDOW_CLICK:              HANDLE_CLIENT_READ(HandleClientWindowClick); break;
@@ -687,6 +689,7 @@ bool cConnection::DecodeServersPackets(const char * a_Data, int a_Size)
 			case PACKET_SPAWN_OBJECT_VEHICLE:      HANDLE_SERVER_READ(HandleServerSpawnObjectVehicle); break;
 			case PACKET_SPAWN_PAINTING:            HANDLE_SERVER_READ(HandleServerSpawnPainting); break;
 			case PACKET_SPAWN_PICKUP:              HANDLE_SERVER_READ(HandleServerSpawnPickup); break;
+			case PACKET_TAB_COMPLETION:            HANDLE_SERVER_READ(HandleServerTabCompletion); break;
 			case PACKET_TIME_UPDATE:               HANDLE_SERVER_READ(HandleServerTimeUpdate); break;
 			case PACKET_UPDATE_HEALTH:             HANDLE_SERVER_READ(HandleServerUpdateHealth); break;
 			case PACKET_UPDATE_SIGN:               HANDLE_SERVER_READ(HandleServerUpdateSign); break;
@@ -1072,6 +1075,19 @@ bool cConnection::HandleClientSlotSelect(void)
 
 
 
+bool cConnection::HandleClientTabCompletion(void)
+{
+	HANDLE_CLIENT_PACKET_READ(ReadBEUTF16String16, AString, Query);
+	Log("Received a PACKET_TAB_COMPLETION query from the client");
+	Log("  Query = \"%s\"", Query.c_str());
+	COPY_TO_SERVER();
+	return true;
+}
+
+
+
+
+
 bool cConnection::HandleClientUpdateSign(void)
 {
 	HANDLE_CLIENT_PACKET_READ(ReadBEInt,           int,   BlockX);
@@ -2103,6 +2119,34 @@ bool cConnection::HandleServerSpawnPickup(void)
 
 
 
+bool cConnection::HandleServerTabCompletion(void)
+{
+	HANDLE_SERVER_PACKET_READ(ReadBEUTF16String16, AString, Results);
+	Log("Received a PACKET_TAB_COMPLETION from the server, results given:");
+
+	// Parse the zero-terminated list of results:
+	size_t len = Results.size();
+	size_t last = 0;
+	for (size_t i = 0; i < len; i++)
+	{
+		if (Results[i] == 0)
+		{
+			Log("  \"%s\"", Results.substr(last, i - last).c_str());
+			last = i + 1;
+		}
+	}
+	if (last < len)
+	{
+		Log("  \"%s\"", Results.substr(last, len - last).c_str());
+	}
+	COPY_TO_CLIENT();
+	return true;
+}
+
+
+
+
+
 bool cConnection::HandleServerTimeUpdate(void)
 {
 	HANDLE_SERVER_PACKET_READ(ReadBEInt64, Int64, WorldAge);
diff --git a/Tools/ProtoProxy/Connection.h b/Tools/ProtoProxy/Connection.h
index 942ee6e06..8d466c62d 100644
--- a/Tools/ProtoProxy/Connection.h
+++ b/Tools/ProtoProxy/Connection.h
@@ -128,6 +128,7 @@ protected:
 	bool HandleClientPlayerPositionLook(void);
 	bool HandleClientPluginMessage(void);
 	bool HandleClientSlotSelect(void);
+	bool HandleClientTabCompletion(void);
 	bool HandleClientUpdateSign(void);
 	bool HandleClientUseEntity(void);
 	bool HandleClientWindowClick(void);
@@ -177,6 +178,7 @@ protected:
 	bool HandleServerSpawnObjectVehicle(void);
 	bool HandleServerSpawnPainting(void);
 	bool HandleServerSpawnPickup(void);
+	bool HandleServerTabCompletion(void);
 	bool HandleServerTimeUpdate(void);
 	bool HandleServerUpdateHealth(void);
 	bool HandleServerUpdateSign(void);
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index 526d00b98..45b604b65 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -1235,6 +1235,23 @@ void cClientHandle::HandleUnmount(void)
 
 
 
+void cClientHandle::HandleTabCompletion(const AString & a_Text)
+{
+	AStringVector Results;
+	m_Player->GetWorld()->TabCompleteUserName(a_Text, Results);
+	cRoot::Get()->GetPluginManager()->TabCompleteCommand(a_Text, Results, m_Player);
+	if (Results.empty())
+	{
+		return;
+	}
+	std::sort(Results.begin(), Results.end());
+	SendTabCompletionResults(Results);
+}
+
+
+
+
+
 void cClientHandle::SendData(const char * a_Data, int a_Size)
 {
 	{
@@ -1781,6 +1798,15 @@ void cClientHandle::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleTy
 
 
 
+void cClientHandle::SendTabCompletionResults(const AStringVector & a_Results)
+{
+	m_Protocol->SendTabCompletionResults(a_Results);
+}
+
+
+
+
+
 void cClientHandle::SendTeleportEntity(const cEntity & a_Entity)
 {
 	m_Protocol->SendTeleportEntity(a_Entity);
diff --git a/source/ClientHandle.h b/source/ClientHandle.h
index 0f1daa72c..4cc2050f5 100644
--- a/source/ClientHandle.h
+++ b/source/ClientHandle.h
@@ -87,56 +87,57 @@ public:
 
 	// The following functions send the various packets:
 	// (Please keep these alpha-sorted)
-	void SendAttachEntity       (const cEntity & a_Entity, const cEntity * a_Vehicle);
-	void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType);
-	void SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage);
-	void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta); // tolua_export
-	void SendBlockChanges       (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes);
-	void SendChat               (const AString & a_Message);
-	void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer);
-	void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player);
-	void SendDestroyEntity      (const cEntity & a_Entity);
-	void SendDisconnect         (const AString & a_Reason);
-	void SendEditSign           (int a_BlockX, int a_BlockY, int a_BlockZ);
-	void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item);
-	void SendEntityHeadLook     (const cEntity & a_Entity);
-	void SendEntityLook         (const cEntity & a_Entity);
-	void SendEntityMetadata     (const cEntity & a_Entity);
-	void SendEntityProperties   (const cEntity & a_Entity);
-	void SendEntityRelMove      (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ);
-	void SendEntityRelMoveLook  (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ);
-	void SendEntityStatus       (const cEntity & a_Entity, char a_Status);
-	void SendEntityVelocity     (const cEntity & a_Entity);
-	void SendExplosion          (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion);
-	void SendGameMode           (eGameMode a_GameMode);
-	void SendHealth             (void);
-	void SendInventoryProgress  (char a_WindowID, short a_Progressbar, short a_Value);
-	void SendInventorySlot      (char a_WindowID, short a_SlotNum, const cItem & a_Item);
-	void SendPickupSpawn        (const cPickup & a_Pickup);
-	void SendPlayerAnimation    (const cPlayer & a_Player, char a_Animation);
-	void SendPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline);
-	void SendPlayerMaxSpeed     (void);  ///< Informs the client of the maximum player speed (1.6.1+)
-	void SendPlayerMoveLook     (void);
-	void SendPlayerPosition     (void);
-	void SendPlayerSpawn        (const cPlayer & a_Player);
-	void SendRespawn            (void);
-	void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch);  // a_Src coords are Block * 8
-	void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data);
-	void SendSpawnFallingBlock  (const cFallingBlock & a_FallingBlock);
-	void SendSpawnMob           (const cMonster & a_Mob);
-	void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch);
-	void SendSpawnVehicle       (const cEntity & a_Vehicle, char a_VehicleType);
-	void SendTeleportEntity     (const cEntity & a_Entity);
-	void SendThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ);
-	void SendTimeUpdate         (Int64 a_WorldAge, Int64 a_TimeOfDay);
-	void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ);
-	void SendUpdateSign         (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4);
-	void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
-	void SendWeather            (eWeather a_Weather);
-	void SendWholeInventory     (const cInventory & a_Inventory);
-	void SendWholeInventory     (const cWindow    & a_Window);
-	void SendWindowClose        (const cWindow    & a_Window);
-	void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots);
+	void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle);
+	void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType);
+	void SendBlockBreakAnim      (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage);
+	void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta); // tolua_export
+	void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes);
+	void SendChat                (const AString & a_Message);
+	void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer);
+	void SendCollectPickup       (const cPickup & a_Pickup, const cPlayer & a_Player);
+	void SendDestroyEntity       (const cEntity & a_Entity);
+	void SendDisconnect          (const AString & a_Reason);
+	void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ);
+	void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item);
+	void SendEntityHeadLook      (const cEntity & a_Entity);
+	void SendEntityLook          (const cEntity & a_Entity);
+	void SendEntityMetadata      (const cEntity & a_Entity);
+	void SendEntityProperties    (const cEntity & a_Entity);
+	void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ);
+	void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ);
+	void SendEntityStatus        (const cEntity & a_Entity, char a_Status);
+	void SendEntityVelocity      (const cEntity & a_Entity);
+	void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion);
+	void SendGameMode            (eGameMode a_GameMode);
+	void SendHealth              (void);
+	void SendInventoryProgress   (char a_WindowID, short a_Progressbar, short a_Value);
+	void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item);
+	void SendPickupSpawn         (const cPickup & a_Pickup);
+	void SendPlayerAnimation     (const cPlayer & a_Player, char a_Animation);
+	void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline);
+	void SendPlayerMaxSpeed      (void);  ///< Informs the client of the maximum player speed (1.6.1+)
+	void SendPlayerMoveLook      (void);
+	void SendPlayerPosition      (void);
+	void SendPlayerSpawn         (const cPlayer & a_Player);
+	void SendRespawn             (void);
+	void SendSoundEffect         (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch);  // a_Src coords are Block * 8
+	void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data);
+	void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock);
+	void SendSpawnMob            (const cMonster & a_Mob);
+	void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch);
+	void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType);
+	void SendTabCompletionResults(const AStringVector & a_Results);
+	void SendTeleportEntity      (const cEntity & a_Entity);
+	void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ);
+	void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay);
+	void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ);
+	void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4);
+	void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
+	void SendWeather             (eWeather a_Weather);
+	void SendWholeInventory      (const cInventory & a_Inventory);
+	void SendWholeInventory      (const cWindow    & a_Window);
+	void SendWindowClose         (const cWindow    & a_Window);
+	void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots);
 
 	const AString & GetUsername(void) const;		// tolua_export
 	void SetUsername( const AString & a_Username );	// tolua_export
@@ -184,6 +185,7 @@ public:
 	bool HandleHandshake        (const AString & a_Username);
 	void HandleEntityAction     (int a_EntityID, char a_ActionID);
 	void HandleUnmount          (void);
+	void HandleTabCompletion    (const AString & a_Text);
 	
 	/** Called when the protocol has finished logging the user in.
 	Return true to allow the user in; false to kick them.
diff --git a/source/PluginManager.cpp b/source/PluginManager.cpp
index b7a21a7ea..043390cbc 100644
--- a/source/PluginManager.cpp
+++ b/source/PluginManager.cpp
@@ -1335,6 +1335,28 @@ bool cPluginManager::ExecuteConsoleCommand(const AStringVector & a_Split, cComma
 
 
 
+void cPluginManager::TabCompleteCommand(const AString & a_Text, AStringVector & a_Results, cPlayer * a_Player)
+{
+	for (CommandMap::iterator itr = m_Commands.begin(), end = m_Commands.end(); itr != end; ++itr)
+	{
+		if (NoCaseCompare(itr->first.substr(0, a_Text.length()), a_Text) != 0)
+		{
+			// Command name doesn't match
+			continue;
+		}
+		if ((a_Player != NULL) && !a_Player->HasPermission(itr->second.m_Permission))
+		{
+			// Player doesn't have permission for the command
+			continue;
+		}
+		a_Results.push_back(itr->first);
+	}
+}
+
+
+
+
+
 bool cPluginManager::AddPlugin(cPlugin * a_Plugin)
 {
 	m_Plugins[a_Plugin->GetDirectory()] = a_Plugin;
diff --git a/source/PluginManager.h b/source/PluginManager.h
index 3832ee455..6bdf87fc7 100644
--- a/source/PluginManager.h
+++ b/source/PluginManager.h
@@ -197,6 +197,11 @@ public:																	// tolua_export
 	/// Executes the command split into a_Split, as if it was given on the console. Returns true if executed. Output is sent to the a_Output callback
 	bool ExecuteConsoleCommand(const AStringVector & a_Split, cCommandOutputCallback & a_Output);
 	
+	/** Appends all commands beginning with a_Text (case-insensitive) into a_Results.
+	If a_Player is not NULL, only commands for which the player has permissions are added.
+	*/
+	void TabCompleteCommand(const AString & a_Text, AStringVector & a_Results, cPlayer * a_Player);
+	
 private:
 	friend class cRoot;
 	
diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h
index 1a154ea95..5c46b2726 100644
--- a/source/Protocol/Protocol.h
+++ b/source/Protocol/Protocol.h
@@ -50,58 +50,59 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) = 0;
 	
 	// Sending stuff to clients (alphabetically sorted):
-	virtual void SendAttachEntity       (const cEntity & a_Entity, const cEntity * a_Vehicle) = 0;
-	virtual void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) = 0;
-	virtual void SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) = 0;
-	virtual void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) = 0;
-	virtual void SendBlockChanges       (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) = 0;
-	virtual void SendChat               (const AString & a_Message) = 0;
-	virtual void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) = 0;
-	virtual void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player) = 0;
-	virtual void SendDestroyEntity      (const cEntity & a_Entity) = 0;
-	virtual void SendDisconnect         (const AString & a_Reason) = 0;
-	virtual void SendEditSign           (int a_BlockX, int a_BlockY, int a_BlockZ) = 0;  ///< Request the client to open up the sign editor for the sign (1.6+)
-	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) = 0;
-	virtual void SendEntityHeadLook     (const cEntity & a_Entity) = 0;
-	virtual void SendEntityLook         (const cEntity & a_Entity) = 0;
-	virtual void SendEntityMetadata     (const cEntity & a_Entity) = 0;
-	virtual void SendEntityProperties   (const cEntity & a_Entity) = 0;
-	virtual void SendEntityRelMove      (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;
-	virtual void SendEntityRelMoveLook  (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;
-	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) = 0;
-	virtual void SendEntityVelocity     (const cEntity & a_Entity) = 0;
-	virtual void SendExplosion          (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) = 0;
-	virtual void SendGameMode           (eGameMode a_GameMode) = 0;
-	virtual void SendHealth             (void) = 0;
-	virtual void SendInventoryProgress  (char a_WindowID, short a_Progressbar, short a_Value) = 0;
-	virtual void SendInventorySlot      (char a_WindowID, short a_SlotNum, const cItem & a_Item) = 0;
-	virtual void SendKeepAlive          (int a_PingID) = 0;
-	virtual void SendLogin              (const cPlayer & a_Player, const cWorld & a_World) = 0;
-	virtual void SendPickupSpawn        (const cPickup & a_Pickup) = 0;
-	virtual void SendPlayerAnimation    (const cPlayer & a_Player, char a_Animation) = 0;
-	virtual void SendPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline) = 0;
-	virtual void SendPlayerMaxSpeed     (void) = 0;  ///< Informs the client of the maximum player speed (1.6.1+)
-	virtual void SendPlayerMoveLook     (void) = 0;
-	virtual void SendPlayerPosition     (void) = 0;
-	virtual void SendPlayerSpawn        (const cPlayer & a_Player) = 0;
-	virtual void SendRespawn            (void) = 0;
-	virtual void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) = 0;  // a_Src coords are Block * 8
-	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) = 0;
-	virtual void SendSpawnFallingBlock  (const cFallingBlock & a_FallingBlock) = 0;
-	virtual void SendSpawnMob           (const cMonster & a_Mob) = 0;
-	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) = 0;
-	virtual void SendSpawnVehicle       (const cEntity & a_Vehicle, char a_VehicleType) = 0;
-	virtual void SendTeleportEntity     (const cEntity & a_Entity) = 0;
-	virtual void SendThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ) = 0;
-	virtual void SendTimeUpdate         (Int64 a_WorldAge, Int64 a_TimeOfDay) = 0;
-	virtual void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ) = 0;
-	virtual void SendUpdateSign         (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) = 0;
-	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) = 0;
-	virtual void SendWeather            (eWeather a_Weather) = 0;
-	virtual void SendWholeInventory     (const cInventory & a_Inventory) = 0;
-	virtual void SendWholeInventory     (const cWindow    & a_Window) = 0;
-	virtual void SendWindowClose        (const cWindow    & a_Window) = 0;
-	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) = 0;
+	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) = 0;
+	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) = 0;
+	virtual void SendBlockBreakAnim      (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) = 0;
+	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) = 0;
+	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) = 0;
+	virtual void SendChat                (const AString & a_Message) = 0;
+	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) = 0;
+	virtual void SendCollectPickup       (const cPickup & a_Pickup, const cPlayer & a_Player) = 0;
+	virtual void SendDestroyEntity       (const cEntity & a_Entity) = 0;
+	virtual void SendDisconnect          (const AString & a_Reason) = 0;
+	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) = 0;  ///< Request the client to open up the sign editor for the sign (1.6+)
+	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) = 0;
+	virtual void SendEntityHeadLook      (const cEntity & a_Entity) = 0;
+	virtual void SendEntityLook          (const cEntity & a_Entity) = 0;
+	virtual void SendEntityMetadata      (const cEntity & a_Entity) = 0;
+	virtual void SendEntityProperties    (const cEntity & a_Entity) = 0;
+	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;
+	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;
+	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) = 0;
+	virtual void SendEntityVelocity      (const cEntity & a_Entity) = 0;
+	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) = 0;
+	virtual void SendGameMode            (eGameMode a_GameMode) = 0;
+	virtual void SendHealth              (void) = 0;
+	virtual void SendInventoryProgress   (char a_WindowID, short a_Progressbar, short a_Value) = 0;
+	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) = 0;
+	virtual void SendKeepAlive           (int a_PingID) = 0;
+	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) = 0;
+	virtual void SendPickupSpawn         (const cPickup & a_Pickup) = 0;
+	virtual void SendPlayerAnimation     (const cPlayer & a_Player, char a_Animation) = 0;
+	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) = 0;
+	virtual void SendPlayerMaxSpeed      (void) = 0;  ///< Informs the client of the maximum player speed (1.6.1+)
+	virtual void SendPlayerMoveLook      (void) = 0;
+	virtual void SendPlayerPosition      (void) = 0;
+	virtual void SendPlayerSpawn         (const cPlayer & a_Player) = 0;
+	virtual void SendRespawn             (void) = 0;
+	virtual void SendSoundEffect         (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) = 0;  // a_Src coords are Block * 8
+	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) = 0;
+	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) = 0;
+	virtual void SendSpawnMob            (const cMonster & a_Mob) = 0;
+	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) = 0;
+	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType) = 0;
+	virtual void SendTabCompletionResults(const AStringVector & a_Results) = 0;
+	virtual void SendTeleportEntity      (const cEntity & a_Entity) = 0;
+	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) = 0;
+	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay) = 0;
+	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) = 0;
+	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) = 0;
+	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) = 0;
+	virtual void SendWeather             (eWeather a_Weather) = 0;
+	virtual void SendWholeInventory      (const cInventory & a_Inventory) = 0;
+	virtual void SendWholeInventory      (const cWindow    & a_Window) = 0;
+	virtual void SendWindowClose         (const cWindow    & a_Window) = 0;
+	virtual void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) = 0;
 
 	/// Returns the ServerID used for authentication through session.minecraft.net
 	virtual AString GetAuthServerID(void) = 0;
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 1f6dcdec9..1f2acf50c 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -782,6 +782,16 @@ void cProtocol125::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleTyp
 
 
 
+void cProtocol125::SendTabCompletionResults(const AStringVector & a_Results)
+{
+	// This protocol version doesn't support tab completion
+	UNUSED(a_Results);
+}
+
+
+
+
+
 void cProtocol125::SendTeleportEntity(const cEntity & a_Entity)
 {
 	cCSLock Lock(m_CSPacket);
diff --git a/source/Protocol/Protocol125.h b/source/Protocol/Protocol125.h
index 6d0fe2408..ee8fd94eb 100644
--- a/source/Protocol/Protocol125.h
+++ b/source/Protocol/Protocol125.h
@@ -27,58 +27,59 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;
 	
 	/// Sending stuff to clients (alphabetically sorted):
-	virtual void SendAttachEntity       (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
-	virtual void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
-	virtual void SendBlockBreakAnim	    (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
-	virtual void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
-	virtual void SendBlockChanges       (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;
-	virtual void SendChat               (const AString & a_Message) override;
-	virtual void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
-	virtual void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player) override;
-	virtual void SendDestroyEntity      (const cEntity & a_Entity) override;
-	virtual void SendDisconnect         (const AString & a_Reason) override;
-	virtual void SendEditSign           (int a_BlockX, int a_BlockY, int a_BlockZ) override;  ///< Request the client to open up the sign editor for the sign (1.6+)
-	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
-	virtual void SendEntityHeadLook     (const cEntity & a_Entity) override;
-	virtual void SendEntityLook         (const cEntity & a_Entity) override;
-	virtual void SendEntityMetadata     (const cEntity & a_Entity) override;
-	virtual void SendEntityProperties   (const cEntity & a_Entity) override;
-	virtual void SendEntityRelMove      (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
-	virtual void SendEntityRelMoveLook  (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
-	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) override;
-	virtual void SendEntityVelocity     (const cEntity & a_Entity) override;
-	virtual void SendExplosion          (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) override;
-	virtual void SendGameMode           (eGameMode a_GameMode) override;
-	virtual void SendHealth             (void) override;
-	virtual void SendInventoryProgress  (char a_WindowID, short a_Progressbar, short a_Value) override;
-	virtual void SendInventorySlot      (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;
-	virtual void SendKeepAlive          (int a_PingID) override;
-	virtual void SendLogin              (const cPlayer & a_Player, const cWorld & a_World) override;
-	virtual void SendPickupSpawn        (const cPickup & a_Pickup) override;
-	virtual void SendPlayerAnimation    (const cPlayer & a_Player, char a_Animation) override;
-	virtual void SendPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline) override;
-	virtual void SendPlayerMaxSpeed     (void) override;
-	virtual void SendPlayerMoveLook     (void) override;
-	virtual void SendPlayerPosition     (void) override;
-	virtual void SendPlayerSpawn        (const cPlayer & a_Player) override;
-	virtual void SendRespawn            (void) override;
-	virtual void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8
-	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
-	virtual void SendSpawnFallingBlock  (const cFallingBlock & a_FallingBlock) override;
-	virtual void SendSpawnMob           (const cMonster & a_Mob) override;
-	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override;
-	virtual void SendSpawnVehicle       (const cEntity & a_Vehicle, char a_VehicleType) override;
-	virtual void SendTeleportEntity     (const cEntity & a_Entity) override;
-	virtual void SendThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ) override;
-	virtual void SendTimeUpdate         (Int64 a_WorldAge, Int64 a_TimeOfDay) override;
-	virtual void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ) override;
-	virtual void SendUpdateSign         (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
-	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
-	virtual void SendWeather            (eWeather a_Weather) override;
-	virtual void SendWholeInventory     (const cInventory & a_Inventory) override;
-	virtual void SendWholeInventory     (const cWindow    & a_Window) override;
-	virtual void SendWindowClose        (const cWindow    & a_Window) override;
-	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;
+	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
+	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
+	virtual void SendBlockBreakAnim	     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
+	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;
+	virtual void SendChat                (const AString & a_Message) override;
+	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
+	virtual void SendCollectPickup       (const cPickup & a_Pickup, const cPlayer & a_Player) override;
+	virtual void SendDestroyEntity       (const cEntity & a_Entity) override;
+	virtual void SendDisconnect          (const AString & a_Reason) override;
+	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) override;  ///< Request the client to open up the sign editor for the sign (1.6+)
+	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendEntityHeadLook      (const cEntity & a_Entity) override;
+	virtual void SendEntityLook          (const cEntity & a_Entity) override;
+	virtual void SendEntityMetadata      (const cEntity & a_Entity) override;
+	virtual void SendEntityProperties    (const cEntity & a_Entity) override;
+	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) override;
+	virtual void SendEntityVelocity      (const cEntity & a_Entity) override;
+	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) override;
+	virtual void SendGameMode            (eGameMode a_GameMode) override;
+	virtual void SendHealth              (void) override;
+	virtual void SendInventoryProgress   (char a_WindowID, short a_Progressbar, short a_Value) override;
+	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendKeepAlive           (int a_PingID) override;
+	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) override;
+	virtual void SendPickupSpawn         (const cPickup & a_Pickup) override;
+	virtual void SendPlayerAnimation     (const cPlayer & a_Player, char a_Animation) override;
+	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) override;
+	virtual void SendPlayerMaxSpeed      (void) override;
+	virtual void SendPlayerMoveLook      (void) override;
+	virtual void SendPlayerPosition      (void) override;
+	virtual void SendPlayerSpawn         (const cPlayer & a_Player) override;
+	virtual void SendRespawn             (void) override;
+	virtual void SendSoundEffect         (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8
+	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
+	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) override;
+	virtual void SendSpawnMob            (const cMonster & a_Mob) override;
+	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override;
+	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType) override;
+	virtual void SendTabCompletionResults(const AStringVector & a_Results) override;
+	virtual void SendTeleportEntity      (const cEntity & a_Entity) override;
+	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay) override;
+	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) override;
+	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
+	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
+	virtual void SendWeather             (eWeather a_Weather) override;
+	virtual void SendWholeInventory      (const cInventory & a_Inventory) override;
+	virtual void SendWholeInventory      (const cWindow    & a_Window) override;
+	virtual void SendWindowClose         (const cWindow    & a_Window) override;
+	virtual void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;
 	
 	virtual AString GetAuthServerID(void) override;
 	
diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 9a985ec1f..7a3975537 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -70,6 +70,7 @@ enum
 	PACKET_BLOCK_BREAK_ANIM      = 0x37,
 	PACKET_SOUND_EFFECT          = 0x3e,
 	PACKET_SOUND_PARTICLE_EFFECT = 0x3d,
+	PACKET_TAB_COMPLETION        = 0xcb,
 	PACKET_LOCALE_VIEW_DISTANCE  = 0xcc,
 	PACKET_CLIENT_STATUSES       = 0xcd,
 	PACKET_ENCRYPTION_KEY_RESP   = 0xfc,
@@ -426,6 +427,31 @@ void cProtocol132::SendSpawnMob(const cMonster & a_Mob)
 
 
 
+void cProtocol132::SendTabCompletionResults(const AStringVector & a_Results)
+{
+	if (a_Results.empty())
+	{
+		// No results to send
+		return;
+	}
+	
+	AString Serialized(a_Results[0]);
+	for (AStringVector::const_iterator itr = a_Results.begin() + 1, end = a_Results.end(); itr != end; ++itr)
+	{
+		Serialized.push_back(0);
+		Serialized.append(*itr);
+	}  // for itr - a_Results[]
+	
+	cCSLock Lock(m_CSPacket);
+	WriteByte(PACKET_TAB_COMPLETION);
+	WriteString(Serialized);
+	Flush();
+}
+
+
+
+
+
 void cProtocol132::SendUnloadChunk(int a_ChunkX, int a_ChunkZ)
 {
 	// Not used in 1.3.2
@@ -484,9 +510,10 @@ int cProtocol132::ParsePacket(unsigned char a_PacketType)
 	switch (a_PacketType)
 	{
 		default:                          return super::ParsePacket(a_PacketType);  // off-load previously known packets into cProtocol125
-		case PACKET_LOCALE_VIEW_DISTANCE: return ParseLocaleViewDistance();
 		case PACKET_CLIENT_STATUSES:      return ParseClientStatuses();
 		case PACKET_ENCRYPTION_KEY_RESP:  return ParseEncryptionKeyResponse();
+		case PACKET_LOCALE_VIEW_DISTANCE: return ParseLocaleViewDistance();
+		case PACKET_TAB_COMPLETION:       return ParseTabCompletion();
 	}
 }
 
@@ -632,6 +659,17 @@ int cProtocol132::ParsePlayerAbilities(void)
 
 
 
+int cProtocol132::ParseTabCompletion(void)
+{
+	HANDLE_PACKET_READ(ReadBEUTF16String16, AString, Text);
+	m_Client->HandleTabCompletion(Text);
+	return PARSE_OK;
+}
+
+
+
+
+
 void cProtocol132::SendData(const char * a_Data, int a_Size)
 {
 	m_DataToSend.append(a_Data, a_Size);
diff --git a/source/Protocol/Protocol132.h b/source/Protocol/Protocol132.h
index bf8b4ff0e..dc4d8aeef 100644
--- a/source/Protocol/Protocol132.h
+++ b/source/Protocol/Protocol132.h
@@ -30,20 +30,21 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;
 	
 	// Sending commands (alphabetically sorted):
-	virtual void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
-	virtual void SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
-	virtual void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
-	virtual void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
-	virtual void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player) override;
-	virtual void SendDestroyEntity      (const cEntity & a_Entity) override;
-	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
-	virtual void SendLogin              (const cPlayer & a_Player, const cWorld & a_World) override;
-	virtual void SendPlayerSpawn        (const cPlayer & a_Player) override;
-	virtual void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8
-	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
-	virtual void SendSpawnMob           (const cMonster & a_Mob) override;
-	virtual void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ) override;
-	virtual void SendWholeInventory     (const cWindow & a_Window) override;
+	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
+	virtual void SendBlockBreakAnim      (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
+	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
+	virtual void SendCollectPickup       (const cPickup & a_Pickup, const cPlayer & a_Player) override;
+	virtual void SendDestroyEntity       (const cEntity & a_Entity) override;
+	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) override;
+	virtual void SendPlayerSpawn         (const cPlayer & a_Player) override;
+	virtual void SendSoundEffect         (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8
+	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
+	virtual void SendSpawnMob            (const cMonster & a_Mob) override;
+	virtual void SendTabCompletionResults(const AStringVector & a_Results) override;
+	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) override;
+	virtual void SendWholeInventory      (const cWindow & a_Window) override;
 
 	virtual AString GetAuthServerID(void) override;
 
@@ -60,6 +61,7 @@ public:
 	virtual int ParseClientStatuses       (void);
 	virtual int ParseEncryptionKeyResponse(void);
 	virtual int ParseLocaleViewDistance   (void);
+	virtual int ParseTabCompletion        (void);
 	
 protected:
 	bool m_IsEncrypted;
diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index 3cff9789e..290f2df75 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -511,6 +511,16 @@ void cProtocolRecognizer::SendSpawnVehicle(const cEntity & a_Vehicle, char a_Veh
 
 
 
+void cProtocolRecognizer::SendTabCompletionResults(const AStringVector & a_Results)
+{
+	ASSERT(m_Protocol != NULL);
+	m_Protocol->SendTabCompletionResults(a_Results);
+}
+
+
+
+
+
 void cProtocolRecognizer::SendTeleportEntity(const cEntity & a_Entity)
 {
 	ASSERT(m_Protocol != NULL);
diff --git a/source/Protocol/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h
index 1256f38e0..43d4a15e2 100644
--- a/source/Protocol/ProtocolRecognizer.h
+++ b/source/Protocol/ProtocolRecognizer.h
@@ -57,58 +57,59 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;
 	
 	/// Sending stuff to clients (alphabetically sorted):
-	virtual void SendAttachEntity       (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
-	virtual void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
-	virtual void SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
-	virtual void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
-	virtual void SendBlockChanges       (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;
-	virtual void SendChat               (const AString & a_Message) override;
-	virtual void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
-	virtual void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player) override;
-	virtual void SendDestroyEntity      (const cEntity & a_Entity) override;
-	virtual void SendDisconnect         (const AString & a_Reason) override;
-	virtual void SendEditSign           (int a_BlockX, int a_BlockY, int a_BlockZ) override;  ///< Request the client to open up the sign editor for the sign (1.6+)
-	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
-	virtual void SendEntityHeadLook     (const cEntity & a_Entity) override;
-	virtual void SendEntityLook         (const cEntity & a_Entity) override;
-	virtual void SendEntityMetadata     (const cEntity & a_Entity) override;
-	virtual void SendEntityProperties   (const cEntity & a_Entity) override;
-	virtual void SendEntityRelMove      (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
-	virtual void SendEntityRelMoveLook  (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
-	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) override;
-	virtual void SendEntityVelocity     (const cEntity & a_Entity) override;
-	virtual void SendExplosion          (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) override;
-	virtual void SendGameMode           (eGameMode a_GameMode) override;
-	virtual void SendHealth             (void) override;
-	virtual void SendInventoryProgress  (char a_WindowID, short a_Progressbar, short a_Value) override;
-	virtual void SendInventorySlot      (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;
-	virtual void SendKeepAlive          (int a_PingID) override;
-	virtual void SendLogin              (const cPlayer & a_Player, const cWorld & a_World) override;
-	virtual void SendPickupSpawn        (const cPickup & a_Pickup) override;
-	virtual void SendPlayerAnimation    (const cPlayer & a_Player, char a_Animation) override;
-	virtual void SendPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline) override;
-	virtual void SendPlayerMaxSpeed     (void) override;
-	virtual void SendPlayerMoveLook     (void) override;
-	virtual void SendPlayerPosition     (void) override;
-	virtual void SendPlayerSpawn        (const cPlayer & a_Player) override;
-	virtual void SendRespawn            (void) override;
-	virtual void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;
-	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
-	virtual void SendSpawnFallingBlock  (const cFallingBlock & a_FallingBlock) override;
-	virtual void SendSpawnMob           (const cMonster & a_Mob) override;
-	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override;
-	virtual void SendSpawnVehicle       (const cEntity & a_Vehicle, char a_VehicleType) override;
-	virtual void SendTeleportEntity     (const cEntity & a_Entity) override;
-	virtual void SendThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ) override;
-	virtual void SendTimeUpdate         (Int64 a_WorldAge, Int64 a_TimeOfDay) override;
-	virtual void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ) override;
-	virtual void SendUpdateSign         (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
-	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
-	virtual void SendWeather            (eWeather a_Weather) override;
-	virtual void SendWholeInventory     (const cInventory & a_Inventory) override;
-	virtual void SendWholeInventory     (const cWindow    & a_Window) override;
-	virtual void SendWindowClose        (const cWindow    & a_Window) override;
-	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;
+	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
+	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
+	virtual void SendBlockBreakAnim      (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
+	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;
+	virtual void SendChat                (const AString & a_Message) override;
+	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
+	virtual void SendCollectPickup       (const cPickup & a_Pickup, const cPlayer & a_Player) override;
+	virtual void SendDestroyEntity       (const cEntity & a_Entity) override;
+	virtual void SendDisconnect          (const AString & a_Reason) override;
+	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) override;  ///< Request the client to open up the sign editor for the sign (1.6+)
+	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendEntityHeadLook      (const cEntity & a_Entity) override;
+	virtual void SendEntityLook          (const cEntity & a_Entity) override;
+	virtual void SendEntityMetadata      (const cEntity & a_Entity) override;
+	virtual void SendEntityProperties    (const cEntity & a_Entity) override;
+	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) override;
+	virtual void SendEntityVelocity      (const cEntity & a_Entity) override;
+	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) override;
+	virtual void SendGameMode            (eGameMode a_GameMode) override;
+	virtual void SendHealth              (void) override;
+	virtual void SendInventoryProgress   (char a_WindowID, short a_Progressbar, short a_Value) override;
+	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendKeepAlive           (int a_PingID) override;
+	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) override;
+	virtual void SendPickupSpawn         (const cPickup & a_Pickup) override;
+	virtual void SendPlayerAnimation     (const cPlayer & a_Player, char a_Animation) override;
+	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) override;
+	virtual void SendPlayerMaxSpeed      (void) override;
+	virtual void SendPlayerMoveLook      (void) override;
+	virtual void SendPlayerPosition      (void) override;
+	virtual void SendPlayerSpawn         (const cPlayer & a_Player) override;
+	virtual void SendRespawn             (void) override;
+	virtual void SendSoundEffect         (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;
+	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
+	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) override;
+	virtual void SendSpawnMob            (const cMonster & a_Mob) override;
+	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override;
+	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType) override;
+	virtual void SendTabCompletionResults(const AStringVector & a_Results) override;
+	virtual void SendTeleportEntity      (const cEntity & a_Entity) override;
+	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay) override;
+	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) override;
+	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
+	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
+	virtual void SendWeather             (eWeather a_Weather) override;
+	virtual void SendWholeInventory      (const cInventory & a_Inventory) override;
+	virtual void SendWholeInventory      (const cWindow    & a_Window) override;
+	virtual void SendWindowClose         (const cWindow    & a_Window) override;
+	virtual void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;
 	
 	virtual AString GetAuthServerID(void) override;
 
diff --git a/source/World.cpp b/source/World.cpp
index b632fe7f9..880f6e5b2 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -2364,6 +2364,24 @@ int cWorld::SpawnMob(double a_PosX, double a_PosY, double a_PosZ, int a_EntityTy
 
 
 
+void cWorld::TabCompleteUserName(const AString & a_Text, AStringVector & a_Results)
+{
+	cCSLock Lock(m_CSPlayers);
+	for (cPlayerList::iterator itr = m_Players.begin(), end = m_Players.end(); itr != end; ++itr)
+	{
+		if (NoCaseCompare((*itr)->GetName().substr(0, a_Text.length()), a_Text) != 0)
+		{
+			// Player name doesn't match
+			continue;
+		}
+		a_Results.push_back((*itr)->GetName());
+	}
+}
+
+
+
+
+
 cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const char * a_FluidName, BLOCKTYPE a_SimulateBlock, BLOCKTYPE a_StationaryBlock)
 {
 	AString SimulatorNameKey;
diff --git a/source/World.h b/source/World.h
index e67b06789..9de00ceec 100644
--- a/source/World.h
+++ b/source/World.h
@@ -519,6 +519,9 @@ public:
 	/// Returns a random number from the m_TickRand in range [0 .. a_Range]. To be used only in the tick thread!
 	int GetTickRandomNumber(unsigned a_Range) { return (int)(m_TickRand.randInt(a_Range)); }
 	
+	/// Appends all usernames starting with a_Text (case-insensitive) into Results
+	void TabCompleteUserName(const AString & a_Text, AStringVector & a_Results);
+	
 private:
 
 	friend class cRoot;