7 files changed, 42 insertions, 3 deletions

diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h
index e871e958a..ada63af6b 100644
--- a/source/Protocol/Protocol.h
+++ b/source/Protocol/Protocol.h
@@ -72,6 +72,7 @@ public:
 	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;

diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 2ae82fb43..1f2edad63 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -585,8 +585,16 @@ void cProtocol125::SendRespawn(void)
 

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

 {

-	cCSLock Lock(m_CSPacket);

-	//TODO: Not needed in this protocol?

+	// Not needed 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 62c91c2e1..19a080506 100644
--- a/source/Protocol/Protocol125.h
+++ b/source/Protocol/Protocol125.h
@@ -56,6 +56,7 @@ public:
 	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;

diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index a39697526..d8c9f1f27 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -61,7 +61,8 @@ enum
 	PACKET_CHUNK_DATA       = 0x33,

 	PACKET_BLOCK_CHANGE     = 0x35,

 	PACKET_BLOCK_ACTION     = 0x36,

-	PACKET_SOUND_EFFECT		= 0x3e

+	PACKET_BLOCK_BREAK_ANIM = 0x37,

+	PACKET_SOUND_EFFECT     = 0x3e

 } ;

 

 

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

 

 

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

+{

+	cCSLock Lock(m_CSPacket);

+	WriteByte   (PACKET_BLOCK_BREAK_ANIM);

+	WriteInt    (a_entityID);

+	WriteInt    (a_BlockX);

+	WriteInt    (a_BlockY);

+	WriteInt    (a_BlockZ);

+	WriteByte   (stage);

+	Flush();

+}

+

+

+

+

+

 void cProtocol132::SendSpawnMob(const cMonster & a_Mob)

 {

 	cCSLock Lock(m_CSPacket);

diff --git a/source/Protocol/Protocol132.h b/source/Protocol/Protocol132.h
index 5fb82148d..977ddca92 100644
--- a/source/Protocol/Protocol132.h
+++ b/source/Protocol/Protocol132.h
@@ -38,6 +38,7 @@ public:
 	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;

diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index 96a831063..aadd20de0 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -364,6 +364,16 @@ void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_Src
 

 

 

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

+{

+	ASSERT(m_Protocol != NULL);

+	m_Protocol->SendBlockBreakAnim(a_entityID, a_BlockX, a_BlockY, a_BlockZ, stage);

+}

+

+

+

+

+

 void cProtocolRecognizer::SendSpawnMob(const cMonster & a_Mob)

 {

 	ASSERT(m_Protocol != NULL);

diff --git a/source/Protocol/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h
index 0a42c279f..e870eca29 100644
--- a/source/Protocol/ProtocolRecognizer.h
+++ b/source/Protocol/ProtocolRecognizer.h
@@ -67,6 +67,7 @@ public:
 	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;