diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-09 01:14:42 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-09 01:14:42 +0100 |
commit | 9d1c9097e3a62f11cce94d1807c16a310eba6c2c (patch) | |
tree | f186174dd8567c9f0d43969a19782d8fdb2fb2ed /src/Entities/Pickup.cpp | |
parent | Merge branch 'master' into playerimprovements (diff) | |
parent | Merge pull request #656 from mc-server/ReloadGroups (diff) | |
download | cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.gz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.bz2 cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.lz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.xz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.zst cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.zip |
Diffstat (limited to 'src/Entities/Pickup.cpp')
-rw-r--r-- | src/Entities/Pickup.cpp | 4 |
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) { } |