summaryrefslogtreecommitdiffstats
path: root/source/Protocol
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-12-28 03:45:20 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-12-28 03:45:20 +0100
commit0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec (patch)
tree4d421bba734bb56e7021b170f94f11a3daa54158 /source/Protocol
parentFixed OnBlockPlace hook (diff)
downloadcuberite-0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec.tar
cuberite-0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec.tar.gz
cuberite-0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec.tar.bz2
cuberite-0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec.tar.lz
cuberite-0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec.tar.xz
cuberite-0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec.tar.zst
cuberite-0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec.zip
Diffstat (limited to 'source/Protocol')
-rw-r--r--source/Protocol/Protocol125.cpp6
-rw-r--r--source/Protocol/Protocol14x.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index cb1e46193..0b5acc771 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -477,9 +477,9 @@ void cProtocol125::SendPickupSpawn(const cPickup & a_Pickup)
cCSLock Lock(m_CSPacket);
WriteByte (PACKET_PICKUP_SPAWN);
WriteInt (a_Pickup.GetUniqueID());
- WriteShort (a_Pickup.GetItem()->m_ItemType);
- WriteByte (a_Pickup.GetItem()->m_ItemCount);
- WriteShort (a_Pickup.GetItem()->m_ItemDamage);
+ WriteShort (a_Pickup.GetItem().m_ItemType);
+ WriteByte (a_Pickup.GetItem().m_ItemCount);
+ WriteShort (a_Pickup.GetItem().m_ItemDamage);
WriteVectorI((Vector3i)(a_Pickup.GetPosition() * 32));
WriteByte ((char)(a_Pickup.GetSpeed().x * 8));
WriteByte ((char)(a_Pickup.GetSpeed().y * 8));
diff --git a/source/Protocol/Protocol14x.cpp b/source/Protocol/Protocol14x.cpp
index 1cb4c922d..912a1a266 100644
--- a/source/Protocol/Protocol14x.cpp
+++ b/source/Protocol/Protocol14x.cpp
@@ -98,7 +98,7 @@ void cProtocol142::SendPickupSpawn(const cPickup & a_Pickup)
cCSLock Lock(m_CSPacket);
WriteByte (PACKET_PICKUP_SPAWN);
WriteInt (a_Pickup.GetUniqueID());
- WriteItem (*(a_Pickup.GetItem()));
+ WriteItem (a_Pickup.GetItem());
WriteVectorI((Vector3i)(a_Pickup.GetPosition() * 32));
WriteByte ((char)(a_Pickup.GetSpeed().x * 8));
WriteByte ((char)(a_Pickup.GetSpeed().y * 8));
@@ -155,7 +155,7 @@ cProtocol146::cProtocol146(cClientHandle * a_Client) :
void cProtocol146::SendPickupSpawn(const cPickup & a_Pickup)
{
- ASSERT(!a_Pickup.GetItem()->IsEmpty());
+ ASSERT(!a_Pickup.GetItem().IsEmpty());
cCSLock Lock(m_CSPacket);
@@ -177,7 +177,7 @@ void cProtocol146::SendPickupSpawn(const cPickup & a_Pickup)
WriteByte(PACKET_ENTITY_METADATA);
WriteInt(a_Pickup.GetUniqueID());
WriteByte(0xaa); // a slot value at index 10
- WriteItem(*a_Pickup.GetItem());
+ WriteItem(a_Pickup.GetItem());
WriteByte(0x7f); // End of metadata
Flush();
}