summaryrefslogtreecommitdiffstats
path: root/source/Pickup.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-15 16:52:56 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-15 16:52:56 +0200
commit7c094ee220441a8068e8e7fa43d1bfc30a51185b (patch)
treeac88b64971ec7a38e155e7966f0a7e2b24493b50 /source/Pickup.cpp
parentNoise3D generator is now using linear upscaling (diff)
downloadcuberite-7c094ee220441a8068e8e7fa43d1bfc30a51185b.tar
cuberite-7c094ee220441a8068e8e7fa43d1bfc30a51185b.tar.gz
cuberite-7c094ee220441a8068e8e7fa43d1bfc30a51185b.tar.bz2
cuberite-7c094ee220441a8068e8e7fa43d1bfc30a51185b.tar.lz
cuberite-7c094ee220441a8068e8e7fa43d1bfc30a51185b.tar.xz
cuberite-7c094ee220441a8068e8e7fa43d1bfc30a51185b.tar.zst
cuberite-7c094ee220441a8068e8e7fa43d1bfc30a51185b.zip
Diffstat (limited to '')
-rw-r--r--source/Pickup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/Pickup.cpp b/source/Pickup.cpp
index c6f80495d..76f0701f2 100644
--- a/source/Pickup.cpp
+++ b/source/Pickup.cpp
@@ -132,20 +132,20 @@ bool cPickup::CollectedBy(cPlayer * a_Dest)
if (m_bCollected)
{
- LOG("Pickup %d cannot be collected by \"%s\", because it has already been collected.", a_Dest->GetName().c_str(), m_UniqueID);
+ LOG("Pickup %d cannot be collected by \"%s\", because it has already been collected.", m_UniqueID, a_Dest->GetName().c_str());
return false; // It's already collected!
}
// 800 is to long
if (m_Timer < 500.f)
{
- LOG("Pickup %d cannot be collected by \"%s\", because it is not old enough.", a_Dest->GetName().c_str(), m_UniqueID);
+ LOG("Pickup %d cannot be collected by \"%s\", because it is not old enough.", m_UniqueID, a_Dest->GetName().c_str());
return false; // Not old enough
}
if (cRoot::Get()->GetPluginManager()->CallHookCollectingPickup(a_Dest, *this))
{
- LOG("Pickup %d cannot be collected by \"%s\", because a plugin has said no.", a_Dest->GetName().c_str(), m_UniqueID);
+ LOG("Pickup %d cannot be collected by \"%s\", because a plugin has said no.", m_UniqueID, a_Dest->GetName().c_str());
return false;
}