summaryrefslogtreecommitdiffstats
path: root/source/packets/cPacket_PickupSpawn.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-24 09:58:26 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-24 09:58:26 +0200
commite92b9e7ecbdf2918aab59d4eeb7bb5966430b264 (patch)
tree1a998d44e5faab91c54ea8517dd9fa02b3732ef7 /source/packets/cPacket_PickupSpawn.cpp
parentAdded plugin name to deprecation messages (diff)
downloadcuberite-e92b9e7ecbdf2918aab59d4eeb7bb5966430b264.tar
cuberite-e92b9e7ecbdf2918aab59d4eeb7bb5966430b264.tar.gz
cuberite-e92b9e7ecbdf2918aab59d4eeb7bb5966430b264.tar.bz2
cuberite-e92b9e7ecbdf2918aab59d4eeb7bb5966430b264.tar.lz
cuberite-e92b9e7ecbdf2918aab59d4eeb7bb5966430b264.tar.xz
cuberite-e92b9e7ecbdf2918aab59d4eeb7bb5966430b264.tar.zst
cuberite-e92b9e7ecbdf2918aab59d4eeb7bb5966430b264.zip
Diffstat (limited to 'source/packets/cPacket_PickupSpawn.cpp')
-rw-r--r--source/packets/cPacket_PickupSpawn.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/source/packets/cPacket_PickupSpawn.cpp b/source/packets/cPacket_PickupSpawn.cpp
index 0a858ba76..1d937cd6c 100644
--- a/source/packets/cPacket_PickupSpawn.cpp
+++ b/source/packets/cPacket_PickupSpawn.cpp
@@ -10,16 +10,16 @@
int cPacket_PickupSpawn::Parse(cByteBuffer & a_Buffer)
{
int TotalBytes = 0;
- HANDLE_PACKET_READ(ReadBEInt, m_UniqueID, TotalBytes);
- HANDLE_PACKET_READ(ReadBEShort, m_Item, TotalBytes);
- HANDLE_PACKET_READ(ReadChar, m_Count, TotalBytes);
- HANDLE_PACKET_READ(ReadBEShort, m_Health, TotalBytes);
- HANDLE_PACKET_READ(ReadBEInt, m_PosX, TotalBytes);
- HANDLE_PACKET_READ(ReadBEInt, m_PosY, TotalBytes);
- HANDLE_PACKET_READ(ReadBEInt, m_PosZ, TotalBytes);
- HANDLE_PACKET_READ(ReadChar, m_Rotation, TotalBytes);
- HANDLE_PACKET_READ(ReadChar, m_Pitch, TotalBytes);
- HANDLE_PACKET_READ(ReadChar, m_Roll, TotalBytes);
+ HANDLE_PACKET_READ(ReadBEInt, m_UniqueID, TotalBytes);
+ HANDLE_PACKET_READ(ReadBEShort, m_ItemType, TotalBytes);
+ HANDLE_PACKET_READ(ReadChar, m_ItemCount, TotalBytes);
+ HANDLE_PACKET_READ(ReadBEShort, m_ItemDamage, TotalBytes);
+ HANDLE_PACKET_READ(ReadBEInt, m_PosX, TotalBytes);
+ HANDLE_PACKET_READ(ReadBEInt, m_PosY, TotalBytes);
+ HANDLE_PACKET_READ(ReadBEInt, m_PosZ, TotalBytes);
+ HANDLE_PACKET_READ(ReadChar, m_Rotation, TotalBytes);
+ HANDLE_PACKET_READ(ReadChar, m_Pitch, TotalBytes);
+ HANDLE_PACKET_READ(ReadChar, m_Roll, TotalBytes);
return TotalBytes;
}
@@ -31,9 +31,9 @@ void cPacket_PickupSpawn::Serialize(AString & a_Data) const
{
AppendByte (a_Data, m_PacketID);
AppendInteger(a_Data, m_UniqueID);
- AppendShort (a_Data, m_Item);
- AppendByte (a_Data, m_Count);
- AppendShort (a_Data, m_Health);
+ AppendShort (a_Data, m_ItemType);
+ AppendByte (a_Data, m_ItemCount);
+ AppendShort (a_Data, m_ItemDamage);
AppendInteger(a_Data, m_PosX);
AppendInteger(a_Data, m_PosY);
AppendInteger(a_Data, m_PosZ);