7 files changed, 200 insertions, 157 deletions

diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h
index 2e2afd364..b4235129e 100644
--- a/source/Protocol/Protocol.h
+++ b/source/Protocol/Protocol.h
@@ -43,49 +43,50 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) = 0;

 	

 	// Sending stuff to clients:

-	virtual void SendBlockAction      (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) = 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 SendEntHeadLook      (const cEntity & a_Entity) = 0;

-	virtual void SendEntLook          (const cEntity & a_Entity) = 0;

-	virtual void SendEntityEquipment  (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) = 0;

-	virtual void SendEntityStatus     (const cEntity & a_Entity, char a_Status) = 0;

-	virtual void SendEntRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;

-	virtual void SendEntRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 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 SendMetadata         (const cEntity & a_Entity) = 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 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 SendBlockBreakAnim   (int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage) = 0;

-	virtual void SendSpawnMob         (const cMonster & a_Mob) = 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_WorldTime) = 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 SendWeather          (eWeather a_Weather) = 0;

-	virtual void SendWholeInventory   (const cInventory & a_Inventory) = 0;

-	virtual void SendWholeInventory   (const cWindow    & a_Window) = 0;

-	virtual void SendWindowClose      (char a_WindowID) = 0;

-	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) = 0;

-	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) = 0;

-	virtual void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) = 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 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 SendEntHeadLook        (const cEntity & a_Entity) = 0;

+	virtual void SendEntLook            (const cEntity & a_Entity) = 0;

+	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) = 0;

+	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) = 0;

+	virtual void SendEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;

+	virtual void SendEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 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 SendMetadata           (const cEntity & a_Entity) = 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 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 SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) = 0;

+	virtual void SendSpawnMob           (const cMonster & a_Mob) = 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_WorldTime) = 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 SendWeather            (eWeather a_Weather) = 0;

+	virtual void SendWholeInventory     (const cInventory & a_Inventory) = 0;

+	virtual void SendWholeInventory     (const cWindow    & a_Window) = 0;

+	virtual void SendWindowClose        (char a_WindowID) = 0;

+	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) = 0;

+	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) = 0;

+	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) = 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 66519b0dd..e92197a9b 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -69,7 +69,8 @@ enum
 	PACKET_BLOCK_CHANGE              = 0x35,

 	PACKET_BLOCK_ACTION              = 0x36,

 	PACKET_EXPLOSION                 = 0x3C,

-	PACKET_SOUND_EFFECT              = 0x3D,

+	PACKET_SOUND_EFFECT              = 0x3e,

+	PACKET_SOUND_PARTICLE_EFFECT     = 0x3d,

 	PACKET_CHANGE_GAME_STATE         = 0x46,

 	PACKET_THUNDERBOLT               = 0x47,

 	PACKET_WINDOW_OPEN               = 0x64,

@@ -592,6 +593,15 @@ void cProtocol125::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int
 

 

 

+void cProtocol125::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data)

+{

+	// Not implemented in this protocol version

+}

+

+

+

+

+

 void cProtocol125::SendBlockBreakAnim(int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage)

 {

 	// Not supported in this protocol version

diff --git a/source/Protocol/Protocol125.h b/source/Protocol/Protocol125.h
index 898a53008..716bfe7b1 100644
--- a/source/Protocol/Protocol125.h
+++ b/source/Protocol/Protocol125.h
@@ -27,49 +27,50 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;

 	

 	/// Sending stuff to clients:

-	virtual void SendBlockAction      (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) 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 SendEntHeadLook      (const cEntity & a_Entity) override;

-	virtual void SendEntLook          (const cEntity & a_Entity) override;

-	virtual void SendEntityEquipment  (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

-	virtual void SendEntityStatus     (const cEntity & a_Entity, char a_Status) override;

-	virtual void SendEntRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

-	virtual void SendEntRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) 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 SendMetadata         (const cEntity & a_Entity) 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 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 SendBlockBreakAnim	  (int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage) override;

-	virtual void SendSpawnMob         (const cMonster & a_Mob) 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_WorldTime) 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 SendWeather          (eWeather a_Weather) override;

-	virtual void SendWholeInventory   (const cInventory & a_Inventory) override;

-	virtual void SendWholeInventory   (const cWindow    & a_Window) override;

-	virtual void SendWindowClose      (char a_WindowID) override;

-	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;

-	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;

-	virtual void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) 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 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 SendEntHeadLook        (const cEntity & a_Entity) override;

+	virtual void SendEntLook            (const cEntity & a_Entity) override;

+	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

+	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) override;

+	virtual void SendEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

+	virtual void SendEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) 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 SendMetadata           (const cEntity & a_Entity) 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 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 SendBlockBreakAnim	    (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;

+	virtual void SendSpawnMob           (const cMonster & a_Mob) 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_WorldTime) 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 SendWeather            (eWeather a_Weather) override;

+	virtual void SendWholeInventory     (const cInventory & a_Inventory) override;

+	virtual void SendWholeInventory     (const cWindow    & a_Window) override;

+	virtual void SendWindowClose        (char a_WindowID) override;

+	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;

+	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;

+	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) override;

 	

 	virtual AString GetAuthServerID(void) override;

 	

diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 2e5803273..9c0047c16 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -52,19 +52,20 @@ const int MAX_ENC_LEN = 512;  // Maximum size of the encrypted message; should b
 

 enum

 {

-	PACKET_KEEP_ALIVE         = 0x00,

-	PACKET_LOGIN              = 0x01,

-	PACKET_ENTITY_EQUIPMENT   = 0x05,

-	PACKET_COMPASS            = 0x06,

-	PACKET_PLAYER_SPAWN       = 0x14,

-	PACKET_COLLECT_PICKUP     = 0x16,

-	PACKET_SPAWN_MOB          = 0x18,

-	PACKET_DESTROY_ENTITIES   = 0x1d,

-	PACKET_CHUNK_DATA         = 0x33,

-	PACKET_BLOCK_CHANGE       = 0x35,

-	PACKET_BLOCK_ACTION       = 0x36,

-	PACKET_BLOCK_BREAK_ANIM   = 0x37,

-	PACKET_SOUND_EFFECT       = 0x3e

+	PACKET_KEEP_ALIVE            = 0x00,

+	PACKET_LOGIN                 = 0x01,

+	PACKET_ENTITY_EQUIPMENT      = 0x05,

+	PACKET_COMPASS               = 0x06,

+	PACKET_PLAYER_SPAWN          = 0x14,

+	PACKET_COLLECT_PICKUP        = 0x16,

+	PACKET_SPAWN_MOB             = 0x18,

+	PACKET_DESTROY_ENTITIES      = 0x1d,

+	PACKET_CHUNK_DATA            = 0x33,

+	PACKET_BLOCK_CHANGE          = 0x35,

+	PACKET_BLOCK_ACTION          = 0x36,

+	PACKET_BLOCK_BREAK_ANIM      = 0x37,

+	PACKET_SOUND_EFFECT          = 0x3e,

+	PACKET_SOUND_PARTICLE_EFFECT = 0x3d

 } ;

 

 

@@ -378,6 +379,22 @@ void cProtocol132::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int
 

 

 

+void cProtocol132::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data)

+{

+	cCSLock Lock(m_CSPacket);

+	WriteByte(PACKET_SOUND_PARTICLE_EFFECT);

+	WriteInt (a_EffectID);

+	WriteInt (a_SrcX / 8);

+	WriteByte(a_SrcY / 8);

+	WriteInt (a_SrcZ / 8);

+	WriteInt (a_Data);

+	Flush();

+}

+

+

+

+

+

 void cProtocol132::SendBlockBreakAnim(int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage)

 {

 	cCSLock Lock(m_CSPacket);

diff --git a/source/Protocol/Protocol132.h b/source/Protocol/Protocol132.h
index f5175e3bb..a14f8d9a4 100644
--- a/source/Protocol/Protocol132.h
+++ b/source/Protocol/Protocol132.h
@@ -30,19 +30,20 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;

 	

 	// Sending commands:

-	virtual void SendBlockAction    (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) 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 SendBlockBreakAnim (int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage) 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 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 SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) 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 AString GetAuthServerID(void) override;

 

diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index 3d71c95ee..79bdf2457 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -356,7 +356,9 @@ void cProtocolRecognizer::SendRespawn(void)
 

 

 

-void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) {

+

+void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch)

+{

 	ASSERT(m_Protocol != NULL);

 	m_Protocol->SendSoundEffect(a_SoundName, a_SrcX, a_SrcY, a_SrcZ, a_Volume, a_Pitch);

 }

@@ -365,6 +367,16 @@ void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_Src
 

 

 

+void cProtocolRecognizer::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data)

+{

+	ASSERT(m_Protocol != NULL);

+	m_Protocol->SendSoundParticleEffect(a_EffectID, a_SrcX, a_SrcY, a_SrcZ, a_Data);

+}

+

+

+

+

+

 void cProtocolRecognizer::SendBlockBreakAnim(int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage)

 {

 	ASSERT(m_Protocol != NULL);

diff --git a/source/Protocol/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h
index a5099367a..46c29386e 100644
--- a/source/Protocol/ProtocolRecognizer.h
+++ b/source/Protocol/ProtocolRecognizer.h
@@ -38,49 +38,50 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;

 	

 	/// Sending stuff to clients:

-	virtual void SendBlockAction      (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) 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 SendEntHeadLook      (const cEntity & a_Entity) override;

-	virtual void SendEntLook          (const cEntity & a_Entity) override;

-	virtual void SendEntityEquipment  (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

-	virtual void SendEntityStatus     (const cEntity & a_Entity, char a_Status) override;

-	virtual void SendEntRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

-	virtual void SendEntRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) 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 SendMetadata         (const cEntity & a_Entity) 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 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 SendBlockBreakAnim   (int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage) override;

-	virtual void SendSpawnMob         (const cMonster & a_Mob) 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_WorldTime) 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 SendWeather          (eWeather a_Weather) override;

-	virtual void SendWholeInventory   (const cInventory & a_Inventory) override;

-	virtual void SendWholeInventory   (const cWindow    & a_Window) override;

-	virtual void SendWindowClose      (char a_WindowID) override;

-	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;

-	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;

-	virtual void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) 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 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 SendEntHeadLook        (const cEntity & a_Entity) override;

+	virtual void SendEntLook            (const cEntity & a_Entity) override;

+	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

+	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) override;

+	virtual void SendEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

+	virtual void SendEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) 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 SendMetadata           (const cEntity & a_Entity) 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 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 SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;

+	virtual void SendSpawnMob           (const cMonster & a_Mob) 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_WorldTime) 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 SendWeather            (eWeather a_Weather) override;

+	virtual void SendWholeInventory     (const cInventory & a_Inventory) override;

+	virtual void SendWholeInventory     (const cWindow    & a_Window) override;

+	virtual void SendWindowClose        (char a_WindowID) override;

+	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;

+	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;

+	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) override;

 	

 	virtual AString GetAuthServerID(void) override;