1 files changed, 74 insertions, 70 deletions

diff --git a/src/Protocol/Protocol.h b/src/Protocol/Protocol.h
index eceec4974..f351ee4b9 100644
--- a/src/Protocol/Protocol.h
+++ b/src/Protocol/Protocol.h
@@ -57,76 +57,80 @@ public:
 	virtual void DataReceived(const char * a_Data, size_t 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 SendChat                (const cCompositeChat & a_Message) = 0;
-	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) = 0;
-	virtual void SendCollectEntity       (const cEntity & a_Entity, 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 SendEntityEffect        (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration) = 0;
-	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 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 SendLoginSuccess        (void) = 0;
-	virtual void SendMapColumn           (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length, unsigned int m_Scale) = 0;
-	virtual void SendMapDecorators       (int a_ID, const cMapDecoratorList & a_Decorators, unsigned int m_Scale) = 0;
-	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) = 0;
-	virtual void SendPaintingSpawn       (const cPainting & a_Painting) = 0;
-	virtual void SendPickupSpawn         (const cPickup & a_Pickup) = 0;
-	virtual void SendPlayerAbilities     (void) = 0;
-	virtual void SendEntityAnimation     (const cEntity & a_Entity, char a_Animation) = 0;
-	virtual void SendParticleEffect      (const AString & a_SoundName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmount) = 0;
-	virtual void SendPlayerListItem      (const cPlayer & a_Player, char a_Action) = 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 SendPluginMessage       (const AString & a_Channel, const AString & a_Message) = 0;
-	virtual void SendRemoveEntityEffect  (const cEntity & a_Entity, int a_EffectID) = 0;
-	virtual void SendRespawn             (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) = 0;
-	virtual void SendExperience          (void) = 0;
-	virtual void SendExperienceOrb       (const cExpOrb & a_ExpOrb) = 0;
-	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) = 0;
-	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) = 0;
-	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) = 0;
-	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) = 0;
-	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, char a_VehicleSubType) = 0;
-	virtual void SendStatistics          (const cStatManager & a_Manager) = 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, bool a_DoDaylightCycle) = 0;
-	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) = 0;
-	virtual void SendUpdateBlockEntity   (cBlockEntity & a_BlockEntity) = 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 cWindow    & a_Window) = 0;
-	virtual void SendWindowClose         (const cWindow    & a_Window) = 0;
-	virtual void SendWindowOpen          (const cWindow & a_Window) = 0;
-	virtual void SendWindowProperty      (const cWindow & a_Window, int a_Property, int a_Value) = 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 SendChat                       (const cCompositeChat & a_Message) = 0;
+	virtual void SendChunkData                  (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) = 0;
+	virtual void SendCollectEntity              (const cEntity & a_Entity, 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 SendEntityEffect               (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration) = 0;
+	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 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 SendLoginSuccess               (void) = 0;
+	virtual void SendMapColumn                  (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length, unsigned int m_Scale) = 0;
+	virtual void SendMapDecorators              (int a_ID, const cMapDecoratorList & a_Decorators, unsigned int m_Scale) = 0;
+	virtual void SendMapInfo                    (int a_ID, unsigned int a_Scale) = 0;
+	virtual void SendPaintingSpawn              (const cPainting & a_Painting) = 0;
+	virtual void SendPickupSpawn                (const cPickup & a_Pickup) = 0;
+	virtual void SendPlayerAbilities            (void) = 0;
+	virtual void SendEntityAnimation            (const cEntity & a_Entity, char a_Animation) = 0;
+	virtual void SendParticleEffect             (const AString & a_SoundName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmount) = 0;
+	virtual void SendPlayerListAddPlayer        (const cPlayer & a_Player) = 0;
+	virtual void SendPlayerListRemovePlayer     (const cPlayer & a_Player) = 0;
+	virtual void SendPlayerListUpdateGameMode   (const cPlayer & a_Player) = 0;
+	virtual void SendPlayerListUpdatePing       (const cPlayer & a_Player) = 0;
+	virtual void SendPlayerListUpdateDisplayName(const cPlayer & a_Player, const AString & a_OldListName) = 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 SendPluginMessage              (const AString & a_Channel, const AString & a_Message) = 0;
+	virtual void SendRemoveEntityEffect         (const cEntity & a_Entity, int a_EffectID) = 0;
+	virtual void SendRespawn                    (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) = 0;
+	virtual void SendExperience                 (void) = 0;
+	virtual void SendExperienceOrb              (const cExpOrb & a_ExpOrb) = 0;
+	virtual void SendScoreboardObjective        (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) = 0;
+	virtual void SendScoreUpdate                (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) = 0;
+	virtual void SendDisplayObjective           (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) = 0;
+	virtual void SendSoundEffect                (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) = 0;
+	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, char a_VehicleSubType) = 0;
+	virtual void SendStatistics                 (const cStatManager & a_Manager) = 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, bool a_DoDaylightCycle) = 0;
+	virtual void SendUnloadChunk                (int a_ChunkX, int a_ChunkZ) = 0;
+	virtual void SendUpdateBlockEntity          (cBlockEntity & a_BlockEntity) = 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 cWindow    & a_Window) = 0;
+	virtual void SendWindowClose                (const cWindow    & a_Window) = 0;
+	virtual void SendWindowOpen                 (const cWindow & a_Window) = 0;
+	virtual void SendWindowProperty             (const cWindow & a_Window, int a_Property, int a_Value) = 0;
 
 	/// Returns the ServerID used for authentication through session.minecraft.net
 	virtual AString GetAuthServerID(void) = 0;