flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

cPickup doesn't use cPackets.

Browse Source 
Also, Lua API change, OnCollectItem -> OnCollectPickup; first param is cPlayer to match other callbacks.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@786 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-08-24 09:49:00 +00:00
parent 0c5910c4fb
commit f0fc0edd21
19 changed files with 178 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/cPlugin_Squirrel.cpp
View File

@@ -99,13 +99,16 @@ void cPlugin_Squirrel::Tick(float a_Dt)
bool cPlugin_Squirrel::OnCollectItem( cPickup* a_Pickup, cPlayer* a_Player )
bool cPlugin_Squirrel::OnCollectPickup(cPlayer * a_Player, cPickup * a_Pickup)
{
cCSLock Lock( m_CriticalSection );
cCSLock Lock(m_CriticalSection);
if(!m_Plugin->HasFunction("OnCollectItem")) return false;
if (!m_Plugin->HasFunction("OnCollectPickup"))
{
return false;
}
return m_Plugin->GetFunction("OnCollectItem").Evaluate<bool>(a_Pickup, a_Player);
return m_Plugin->GetFunction("OnCollectPickup").Evaluate<bool>(a_Player, a_Pickup);
}