summaryrefslogtreecommitdiffstats
path: root/src/Entities/Pickup.cpp
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-05 20:08:10 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-05 20:08:10 +0100
commit9015e56c604b2ad3ce47ddae8e9556187fe8978e (patch)
tree60b23762504cfb9eb4cba9758f15c0e5fab46123 /src/Entities/Pickup.cpp
parentModified automatic test for boundingBox (diff)
parentMerge pull request #645 from mc-server/GroupsPermissions (diff)
downloadcuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.gz
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.bz2
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.lz
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.xz
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.zst
cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.zip
Diffstat (limited to 'src/Entities/Pickup.cpp')
-rw-r--r--src/Entities/Pickup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index bfe162b69..c5503c16a 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -22,9 +22,9 @@ class cPickupCombiningCallback :
{
public:
cPickupCombiningCallback(Vector3d a_Position, cPickup * a_Pickup) :
+ m_FoundMatchingPickup(false),
m_Position(a_Position),
- m_Pickup(a_Pickup),
- m_FoundMatchingPickup(false)
+ m_Pickup(a_Pickup)
{
}