ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
madmaxoft@gmail.com 2013-05-15 14:52:56 +00:00
parent 464dcc3764
commit 7c094ee220
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Pickup.cpp
View File

@ -132,20 +132,20 @@ bool cPickup::CollectedBy(cPlayer * a_Dest)
if (m_bCollected) 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! return false; // It's already collected!
} }
// 800 is to long // 800 is to long
if (m_Timer < 500.f) 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 return false; // Not old enough
} }
if (cRoot::Get()->GetPluginManager()->CallHookCollectingPickup(a_Dest, *this)) 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; return false;
} }