flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed entity equipment packet in the 1.3.2 protocol.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@874 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-09-23 15:57:25 +00:00
parent 45eddd63ad
commit 60c29274d3
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/Protocol132.cpp
View File

@ -53,6 +53,7 @@ enum
{ {
PACKET_KEEP_ALIVE = 0x00, PACKET_KEEP_ALIVE = 0x00,
PACKET_LOGIN = 0x01, PACKET_LOGIN = 0x01,
PACKET_ENTITY_EQUIPMENT = 0x05,
PACKET_COMPASS = 0x06, PACKET_COMPASS = 0x06,
PACKET_PLAYER_SPAWN = 0x14, PACKET_PLAYER_SPAWN = 0x14,
PACKET_SPAWN_MOB = 0x18, PACKET_SPAWN_MOB = 0x18,
@ -256,6 +257,20 @@ void cProtocol132::SendDestroyEntity(const cEntity & a_Entity)
void cProtocol132::SendEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item)
{
cCSLock Lock(m_CSPacket);
WriteByte (PACKET_ENTITY_EQUIPMENT);
WriteInt (a_Entity.GetUniqueID());
WriteShort(a_SlotNum);
WriteItem (a_Item);
Flush();
}
void cProtocol132::SendKeepAlive(int a_PingID) void cProtocol132::SendKeepAlive(int a_PingID)
{ {
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);

21
source/Protocol132.h
View File

@ -32,16 +32,17 @@ public:
virtual void DataReceived(const char * a_Data, int a_Size) override; virtual void DataReceived(const char * a_Data, int a_Size) override;
// Sending commands: // 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 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 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 SendChunkData (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
virtual void SendDestroyEntity (const cEntity & a_Entity) override; virtual void SendDestroyEntity (const cEntity & a_Entity) override;
virtual void SendLogin (const cPlayer & a_Player, const cWorld & a_World) override; virtual void SendEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
virtual void SendPlayerSpawn (const cPlayer & a_Player) override; virtual void SendLogin (const cPlayer & a_Player, const cWorld & a_World) 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 SendPlayerSpawn (const cPlayer & a_Player) override;
virtual void SendSpawnMob (const cMonster & a_Mob) 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 SendUnloadChunk (int a_ChunkX, int a_ChunkZ) override; virtual void SendSpawnMob (const cMonster & a_Mob) override;
virtual void SendWholeInventory(const cWindow & a_Window) override; virtual void SendUnloadChunk (int a_ChunkX, int a_ChunkZ) override;
virtual void SendWholeInventory (const cWindow & a_Window) override;
virtual AString GetAuthServerID(void) override; virtual AString GetAuthServerID(void) override;