diff options
author | madmaxoft <github@xoft.cz> | 2014-03-20 09:16:47 +0100 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-03-20 09:16:47 +0100 |
commit | 964647a9006af475bea71272e313f3575cf4d37f (patch) | |
tree | 37a5c353a8fe34469423beadd3cd0e46d9e57eaf /src | |
parent | Merge pull request #790 from mc-server/awesometnt (diff) | |
download | cuberite-964647a9006af475bea71272e313f3575cf4d37f.tar cuberite-964647a9006af475bea71272e313f3575cf4d37f.tar.gz cuberite-964647a9006af475bea71272e313f3575cf4d37f.tar.bz2 cuberite-964647a9006af475bea71272e313f3575cf4d37f.tar.lz cuberite-964647a9006af475bea71272e313f3575cf4d37f.tar.xz cuberite-964647a9006af475bea71272e313f3575cf4d37f.tar.zst cuberite-964647a9006af475bea71272e313f3575cf4d37f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Bindings/LuaState.cpp | 5 | ||||
-rw-r--r-- | src/Bindings/LuaState.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp index 0bb047873..47380b8a7 100644 --- a/src/Bindings/LuaState.cpp +++ b/src/Bindings/LuaState.cpp @@ -689,9 +689,10 @@ void cLuaState::Push(void * a_Ptr) ASSERT(IsValid()); // Investigate the cause of this - what is the callstack? - LOGWARNING("Lua engine encountered an error - attempting to push a plain pointer"); + // One code path leading here is the OnHookExploding / OnHookExploded with exotic parameters. Need to decide what to do with them + LOGWARNING("Lua engine: attempting to push a plain pointer, pushing nil instead."); + LOGWARNING("This indicates an unimplemented part of MCS bindings"); LogStackTrace(); - ASSERT(!"A plain pointer should never be pushed on Lua stack"); lua_pushnil(m_LuaState); m_NumCurrentFunctionArgs += 1; diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h index 356a284e0..f0047b362 100644 --- a/src/Bindings/LuaState.h +++ b/src/Bindings/LuaState.h @@ -200,7 +200,7 @@ public: void Push(const HTTPTemplateRequest * a_Request); void Push(cTNTEntity * a_TNTEntity); void Push(Vector3i * a_Vector); - NORETURNDEBUG void Push(void * a_Ptr); + void Push(void * a_Ptr); void Push(cHopperEntity * a_Hopper); void Push(cBlockEntity * a_BlockEntity); |