4 files changed, 11 insertions, 13 deletions

diff --git a/src/Bindings/LuaChunkStay.cpp b/src/Bindings/LuaChunkStay.cpp
index 0e982637f..db865cfa4 100644
--- a/src/Bindings/LuaChunkStay.cpp
+++ b/src/Bindings/LuaChunkStay.cpp
@@ -131,9 +131,6 @@ void cLuaChunkStay::Enable(cChunkMap & a_ChunkMap, int a_OnChunkAvailableStackPo
 
 void cLuaChunkStay::OnChunkAvailable(int a_ChunkX, int a_ChunkZ)
 {
-	// DEBUG:
-	LOGD("LuaChunkStay: Chunk [%d, %d] is now available, calling the callback...", a_ChunkX, a_ChunkZ);
-	
 	cPluginLua::cOperation Op(m_Plugin);
 	Op().Call((int)m_OnChunkAvailable, a_ChunkX, a_ChunkZ);
 }
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp
index f24e15c3b..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;
@@ -1080,20 +1081,20 @@ bool cLuaState::ReportErrors(lua_State * a_LuaState, int a_Status)
 
 
 
-void cLuaState::LogStackTrace(void)
+void cLuaState::LogStackTrace(int a_StartingDepth)
 {
-	LogStackTrace(m_LuaState);
+	LogStackTrace(m_LuaState, a_StartingDepth);
 }
 
 
 
 
 
-void cLuaState::LogStackTrace(lua_State * a_LuaState)
+void cLuaState::LogStackTrace(lua_State * a_LuaState, int a_StartingDepth)
 {
 	LOGWARNING("Stack trace:");
 	lua_Debug entry;
-	int depth = 0;
+	int depth = a_StartingDepth;
 	while (lua_getstack(a_LuaState, depth, &entry))
 	{
 		lua_getinfo(a_LuaState, "Sln", &entry);
@@ -1312,7 +1313,7 @@ void cLuaState::LogStack(lua_State * a_LuaState, const char * a_Header)
 int cLuaState::ReportFnCallErrors(lua_State * a_LuaState)
 {
 	LOGWARNING("LUA: %s", lua_tostring(a_LuaState, -1));
-	LogStackTrace(a_LuaState);
+	LogStackTrace(a_LuaState, 1);
 	return 1;  // We left the error message on the stack as the return value
 }
 
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index f5cb8379d..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);
 	
@@ -868,10 +868,10 @@ public:
 	static bool ReportErrors(lua_State * a_LuaState, int status);
 	
 	/** Logs all items in the current stack trace to the server console */
-	void LogStackTrace(void);
+	void LogStackTrace(int a_StartingDepth = 0);
 	
 	/** Logs all items in the current stack trace to the server console */
-	static void LogStackTrace(lua_State * a_LuaState);
+	static void LogStackTrace(lua_State * a_LuaState, int a_StartingDepth = 0);
 	
 	/** Returns the type of the item on the specified position in the stack */
 	AString GetTypeText(int a_StackPos);
diff --git a/src/Bindings/tolua++.exe b/src/Bindings/tolua++.exe
index e5cec6d78..86ab1d70f 100644
--- a/src/Bindings/tolua++.exe
+++ b/src/Bindings/tolua++.exe