summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol132.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-06-27 20:56:29 +0200
committerMattes D <github@xoft.cz>2014-06-27 20:56:44 +0200
commit9926abd4f55d668dec9e06c2ba23fa3bb9209eeb (patch)
tree60c0b01aea8d40c5bb4495bacb57914d3c13933b /src/Protocol/Protocol132.cpp
parentMerge pull request #1129 from mc-server/CodeCoverageCondition (diff)
downloadcuberite-9926abd4f55d668dec9e06c2ba23fa3bb9209eeb.tar
cuberite-9926abd4f55d668dec9e06c2ba23fa3bb9209eeb.tar.gz
cuberite-9926abd4f55d668dec9e06c2ba23fa3bb9209eeb.tar.bz2
cuberite-9926abd4f55d668dec9e06c2ba23fa3bb9209eeb.tar.lz
cuberite-9926abd4f55d668dec9e06c2ba23fa3bb9209eeb.tar.xz
cuberite-9926abd4f55d668dec9e06c2ba23fa3bb9209eeb.tar.zst
cuberite-9926abd4f55d668dec9e06c2ba23fa3bb9209eeb.zip
Diffstat (limited to 'src/Protocol/Protocol132.cpp')
-rw-r--r--src/Protocol/Protocol132.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index 1e3fc8de8..31cf99f53 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -188,19 +188,19 @@ void cProtocol132::SendChunkData(int a_ChunkX, int a_ChunkZ, cChunkDataSerialize
-void cProtocol132::SendCollectPickup(const cPickup & a_Pickup, const cPlayer & a_Player)
+void cProtocol132::SendCollectEntity(const cEntity & a_Entity, const cPlayer & a_Player)
{
cCSLock Lock(m_CSPacket);
WriteByte(PACKET_COLLECT_PICKUP);
- WriteInt (a_Pickup.GetUniqueID());
+ WriteInt (a_Entity.GetUniqueID());
WriteInt (a_Player.GetUniqueID());
Flush();
// Also send the "pop" sound effect with a somewhat random pitch (fast-random using EntityID ;)
SendSoundEffect(
"random.pop",
- (int)(a_Pickup.GetPosX() * 8), (int)(a_Pickup.GetPosY() * 8), (int)(a_Pickup.GetPosZ() * 8),
- 0.5, (float)(0.75 + ((float)((a_Pickup.GetUniqueID() * 23) % 32)) / 64)
+ (int)(a_Entity.GetPosX() * 8), (int)(a_Entity.GetPosY() * 8), (int)(a_Entity.GetPosZ() * 8),
+ 0.5, (float)(0.75 + ((float)((a_Entity.GetUniqueID() * 23) % 32)) / 64)
);
}