1 files changed, 80 insertions, 61 deletions

diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index bce24498a..f4976b9d8 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -277,23 +277,22 @@ void cProtocol125::SendDisconnect(const AString & a_Reason)
 

 

 

-void cProtocol125::SendEntVelocity(const cEntity & a_Entity)

+void cProtocol125::SendEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item)

 {

-	ASSERT(a_Entity.GetUniqueID() != m_Client->GetPlayer()->GetUniqueID());  // Must not send for self

-	

 	cCSLock Lock(m_CSPacket);

-	WriteByte(PACKET_ENTITY_VELOCITY);

-	WriteInt (a_Entity.GetUniqueID());

-	WriteShort((short) (a_Entity.GetSpeedX() * 400)); //400 = 8000 / 20 

-	WriteShort((short) (a_Entity.GetSpeedY() * 400));

-	WriteShort((short) (a_Entity.GetSpeedZ() * 400));

+	WriteByte (PACKET_ENTITY_EQUIPMENT);

+	WriteInt  (a_Entity.GetUniqueID());

+	WriteShort(a_SlotNum);

+	WriteShort(a_Item.m_ItemType);

+	WriteShort(a_Item.m_ItemDamage);

 	Flush();

 }

 

 

 

 

-void cProtocol125::SendEntHeadLook(const cEntity & a_Entity)

+

+void cProtocol125::SendEntityHeadLook(const cEntity & a_Entity)

 {

 	ASSERT(a_Entity.GetUniqueID() != m_Client->GetPlayer()->GetUniqueID());  // Must not send for self

 	

@@ -308,7 +307,7 @@ void cProtocol125::SendEntHeadLook(const cEntity & a_Entity)
 

 

 

-void cProtocol125::SendEntLook(const cEntity & a_Entity)

+void cProtocol125::SendEntityLook(const cEntity & a_Entity)

 {

 	ASSERT(a_Entity.GetUniqueID() != m_Client->GetPlayer()->GetUniqueID());  // Must not send for self

 	

@@ -324,14 +323,13 @@ void cProtocol125::SendEntLook(const cEntity & a_Entity)
 

 

 

-void cProtocol125::SendEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item)

+void cProtocol125::SendEntityMetadata(const cEntity & a_Entity)

 {

 	cCSLock Lock(m_CSPacket);

-	WriteByte (PACKET_ENTITY_EQUIPMENT);

-	WriteInt  (a_Entity.GetUniqueID());

-	WriteShort(a_SlotNum);

-	WriteShort(a_Item.m_ItemType);

-	WriteShort(a_Item.m_ItemDamage);

+	WriteByte(PACKET_METADATA);

+	WriteInt (a_Entity.GetUniqueID());

+	AString MetaData = GetEntityMetaData(a_Entity);

+	SendData(MetaData.data(), MetaData.size());

 	Flush();

 }

 

@@ -339,37 +337,25 @@ void cProtocol125::SendEntityEquipment(const cEntity & a_Entity, short a_SlotNum
 

 

 

-void cProtocol125::SendEntityStatus(const cEntity & a_Entity, char a_Status)

+void cProtocol125::SendEntityProperties(const cEntity & a_Entity)

 {

-	cCSLock Lock(m_CSPacket);

-	WriteByte(PACKET_ENT_STATUS);

-	WriteInt (a_Entity.GetUniqueID());

-	WriteByte(a_Status);

-	Flush();

+	// Not supported in this protocol version

 }

 

 

 

 

 

-void cProtocol125::SendExplosion(double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion)

+void cProtocol125::SendEntityRelMove(const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ)

 {

+	ASSERT(a_Entity.GetUniqueID() != m_Client->GetPlayer()->GetUniqueID());  // Must not send for self

+	

 	cCSLock Lock(m_CSPacket);

-	WriteByte(PACKET_EXPLOSION);

-	WriteDouble (a_BlockX);

-	WriteDouble (a_BlockY);

-	WriteDouble (a_BlockZ);

-	WriteFloat  (a_Radius);

-	WriteInt    (a_BlocksAffected.size());

-	for (cVector3iArray::const_iterator itr = a_BlocksAffected.begin(); itr != a_BlocksAffected.end(); ++itr)

-	{

-		WriteByte   ((Byte)(itr->x - a_BlockX));

-		WriteByte   ((Byte)(itr->y - a_BlockY));

-		WriteByte   ((Byte)(itr->z - a_BlockZ));

-	}

-	WriteFloat  ((float)a_PlayerMotion.x);

-	WriteFloat  ((float)a_PlayerMotion.y);

-	WriteFloat  ((float)a_PlayerMotion.z);

+	WriteByte(PACKET_ENT_REL_MOVE);

+	WriteInt (a_Entity.GetUniqueID());

+	WriteByte(a_RelX);

+	WriteByte(a_RelY);

+	WriteByte(a_RelZ);

 	Flush();

 }

 

@@ -377,16 +363,31 @@ void cProtocol125::SendExplosion(double a_BlockX, double a_BlockY, double a_Bloc
 

 

 

-void cProtocol125::SendEntRelMove(const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ)

+void cProtocol125::SendEntityRelMoveLook(const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ)

 {

 	ASSERT(a_Entity.GetUniqueID() != m_Client->GetPlayer()->GetUniqueID());  // Must not send for self

 	

 	cCSLock Lock(m_CSPacket);

-	WriteByte(PACKET_ENT_REL_MOVE);

+	WriteByte(PACKET_ENT_REL_MOVE_LOOK);

 	WriteInt (a_Entity.GetUniqueID());

 	WriteByte(a_RelX);

 	WriteByte(a_RelY);

 	WriteByte(a_RelZ);

+	WriteByte((char)((a_Entity.GetRotation() / 360.f) * 256));

+	WriteByte((char)((a_Entity.GetPitch()    / 360.f) * 256));

+	Flush();

+}

+

+

+

+

+

+void cProtocol125::SendEntityStatus(const cEntity & a_Entity, char a_Status)

+{

+	cCSLock Lock(m_CSPacket);

+	WriteByte(PACKET_ENT_STATUS);

+	WriteInt (a_Entity.GetUniqueID());

+	WriteByte(a_Status);

 	Flush();

 }

 

@@ -394,18 +395,41 @@ void cProtocol125::SendEntRelMove(const cEntity & a_Entity, char a_RelX, char a_
 

 

 

-void cProtocol125::SendEntRelMoveLook(const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ)

+void cProtocol125::SendEntityVelocity(const cEntity & a_Entity)

 {

 	ASSERT(a_Entity.GetUniqueID() != m_Client->GetPlayer()->GetUniqueID());  // Must not send for self

 	

 	cCSLock Lock(m_CSPacket);

-	WriteByte(PACKET_ENT_REL_MOVE_LOOK);

+	WriteByte(PACKET_ENTITY_VELOCITY);

 	WriteInt (a_Entity.GetUniqueID());

-	WriteByte(a_RelX);

-	WriteByte(a_RelY);

-	WriteByte(a_RelZ);

-	WriteByte((char)((a_Entity.GetRotation() / 360.f) * 256));

-	WriteByte((char)((a_Entity.GetPitch()    / 360.f) * 256));

+	WriteShort((short) (a_Entity.GetSpeedX() * 400)); //400 = 8000 / 20 

+	WriteShort((short) (a_Entity.GetSpeedY() * 400));

+	WriteShort((short) (a_Entity.GetSpeedZ() * 400));

+	Flush();

+}

+

+

+

+

+

+void cProtocol125::SendExplosion(double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion)

+{

+	cCSLock Lock(m_CSPacket);

+	WriteByte(PACKET_EXPLOSION);

+	WriteDouble (a_BlockX);

+	WriteDouble (a_BlockY);

+	WriteDouble (a_BlockZ);

+	WriteFloat  (a_Radius);

+	WriteInt    (a_BlocksAffected.size());

+	for (cVector3iArray::const_iterator itr = a_BlocksAffected.begin(); itr != a_BlocksAffected.end(); ++itr)

+	{

+		WriteByte   ((Byte)(itr->x - a_BlockX));

+		WriteByte   ((Byte)(itr->y - a_BlockY));

+		WriteByte   ((Byte)(itr->z - a_BlockZ));

+	}

+	WriteFloat  ((float)a_PlayerMotion.x);

+	WriteFloat  ((float)a_PlayerMotion.y);

+	WriteFloat  ((float)a_PlayerMotion.z);

 	Flush();

 }

 

@@ -513,20 +537,6 @@ void cProtocol125::SendLogin(const cPlayer & a_Player, const cWorld & a_World)
 

 

 

-void cProtocol125::SendMetadata(const cEntity & a_Entity)

-{

-	cCSLock Lock(m_CSPacket);

-	WriteByte(PACKET_METADATA);

-	WriteInt (a_Entity.GetUniqueID());

-	AString MetaData = GetEntityMetaData(a_Entity);

-	SendData(MetaData.data(), MetaData.size());

-	Flush();

-}

-

-

-

-

-

 void cProtocol125::SendPickupSpawn(const cPickup & a_Pickup)

 {

 	cCSLock Lock(m_CSPacket);

@@ -581,6 +591,15 @@ void cProtocol125::SendPlayerListItem(const cPlayer & a_Player, bool a_IsOnline)
 

 

 

+void cProtocol125::SendPlayerMaxSpeed(void)

+{

+	// Not supported by this protocol version

+}

+

+

+

+

+

 void cProtocol125::SendPlayerMoveLook(void)

 {

 	cCSLock Lock(m_CSPacket);