Pickup: fixed logging parameters causing a crash.
http://forum.mc-server.org/showthread.php?tid=434&pid=8059#pid8059 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1483 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
parent
464dcc3764
commit
7c094ee220
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user