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

Merge branch 'master' into potions

Browse Source
This commit is contained in:
madmaxoft
2014-07-17 11:01:26 +02:00
parent 64c8b0d51b 98244e96d1
commit 7d0fc85d00
21 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bindings/PluginLua.cpp
View File

@@ -595,14 +595,14 @@ bool cPluginLua::OnHopperPushingItem(cWorld & a_World, cHopperEntity & a_Hopper,
bool cPluginLua::OnKilling(cEntity & a_Victim, cEntity * a_Killer)
bool cPluginLua::OnKilling(cEntity & a_Victim, cEntity * a_Killer, TakeDamageInfo & a_TDI)
{
cCSLock Lock(m_CriticalSection);
bool res = false;
cLuaRefs & Refs = m_HookMap[cPluginManager::HOOK_KILLING];
for (cLuaRefs::iterator itr = Refs.begin(), end = Refs.end(); itr != end; ++itr)
{
m_LuaState.Call((int)(**itr), &a_Victim, a_Killer, cLuaState::Return, res);
m_LuaState.Call((int)(**itr), &a_Victim, a_Killer, &a_TDI, cLuaState::Return, res);
if (res)
{
return true;