summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-17 16:30:18 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-17 16:30:18 +0200
commitb7041c1bd28cd1aa4806f6b4d9d17b699b32c1e2 (patch)
treece309077ffc2798130fe199ac7b3e72d11527ea7 /source
parentDistortedHeightmap: Rewritten to use the optimized cPerlinNoise and linear upscaling (diff)
downloadcuberite-b7041c1bd28cd1aa4806f6b4d9d17b699b32c1e2.tar
cuberite-b7041c1bd28cd1aa4806f6b4d9d17b699b32c1e2.tar.gz
cuberite-b7041c1bd28cd1aa4806f6b4d9d17b699b32c1e2.tar.bz2
cuberite-b7041c1bd28cd1aa4806f6b4d9d17b699b32c1e2.tar.lz
cuberite-b7041c1bd28cd1aa4806f6b4d9d17b699b32c1e2.tar.xz
cuberite-b7041c1bd28cd1aa4806f6b4d9d17b699b32c1e2.tar.zst
cuberite-b7041c1bd28cd1aa4806f6b4d9d17b699b32c1e2.zip
Diffstat (limited to '')
-rw-r--r--source/Chunk.cpp4
-rw-r--r--source/Pickup.cpp8
2 files changed, 8 insertions, 4 deletions
diff --git a/source/Chunk.cpp b/source/Chunk.cpp
index c8cceb6ed..72313fa08 100644
--- a/source/Chunk.cpp
+++ b/source/Chunk.cpp
@@ -1565,17 +1565,21 @@ void cChunk::CollectPickupsByPlayer(cPlayer * a_Player)
float SqrDist = DiffX * DiffX + DiffY * DiffY + DiffZ * DiffZ;
if (SqrDist < 1.5f * 1.5f) // 1.5 block
{
+ /*
LOG("Pickup %d being collected by player \"%s\", distance %f",
(*itr)->GetUniqueID(), a_Player->GetName().c_str(), SqrDist
);
+ */
MarkDirty();
(reinterpret_cast<cPickup *>(*itr))->CollectedBy( a_Player );
}
else if (SqrDist < 5 * 5)
{
+ /*
LOG("Pickup %d close to player \"%s\", but still too far to collect: %f",
(*itr)->GetUniqueID(), a_Player->GetName().c_str(), SqrDist
);
+ */
}
}
}
diff --git a/source/Pickup.cpp b/source/Pickup.cpp
index 76f0701f2..bf48daf82 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.", m_UniqueID, a_Dest->GetName().c_str());
+ // 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.", m_UniqueID, a_Dest->GetName().c_str());
+ // 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.", m_UniqueID, a_Dest->GetName().c_str());
+ // LOG("Pickup %d cannot be collected by \"%s\", because a plugin has said no.", m_UniqueID, a_Dest->GetName().c_str());
return false;
}
@@ -163,7 +163,7 @@ bool cPickup::CollectedBy(cPlayer * a_Dest)
return true;
}
- LOG("Pickup %d cannot be collected by \"%s\", because there's no space in the inventory.", a_Dest->GetName().c_str(), m_UniqueID);
+ // LOG("Pickup %d cannot be collected by \"%s\", because there's no space in the inventory.", a_Dest->GetName().c_str(), m_UniqueID);
return false;
}