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

Fixed a potential crash in cEntity bindings.

This commit is contained in:
Mattes D 2014-10-20 17:32:09 +02:00
parent 1f301d7560
commit b78078a3a6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bindings/LuaState.cpp
View File

@ -558,7 +558,11 @@ void cLuaState::Push(cEntity * a_Entity)
{
ASSERT(IsValid());
if (a_Entity->IsMob())
if (a_Entity == nullptr)
{
lua_pushnil(m_LuaState);
}
else if (a_Entity->IsMob())
{
// Don't push specific mob types, as those are not exported in the API:
tolua_pushusertype(m_LuaState, a_Entity, "cMonster");
@ -566,7 +570,7 @@ void cLuaState::Push(cEntity * a_Entity)
else
{
// Push the specific class type:
tolua_pushusertype(m_LuaState, a_Entity, (a_Entity == nullptr) ? "cEntity" : a_Entity->GetClass());
tolua_pushusertype(m_LuaState, a_Entity, a_Entity->GetClass());
}
m_NumCurrentFunctionArgs += 1;
}