BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix segfault in player migration and crash in log_deprecated

Browse Source 
Makes log_deprecated work when triggered from no function
This commit is contained in:
SmallJoker 2018-05-14 21:03:48 +02:00
parent a01a9ca24c
commit a1598e1b83
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/content_sao.cpp
View File

@ -1166,8 +1166,12 @@ void PlayerSAO::setBasePosition(const v3f &position)
// This needs to be ran for attachments too // This needs to be ran for attachments too
ServerActiveObject::setBasePosition(position); ServerActiveObject::setBasePosition(position);
// Updating is not wanted/required for player migration
if (m_env) {
m_env->updateActiveObject(this); m_env->updateActiveObject(this);
m_position_not_sent = true; m_position_not_sent = true;
}
} }
void PlayerSAO::setPos(const v3f &pos) void PlayerSAO::setPos(const v3f &pos)

4
src/script/common/c_internal.cpp
View File

@ -153,7 +153,9 @@ void log_deprecated(lua_State *L, const std::string &message)
warningstream << message; warningstream << message;
if (L) { // L can be NULL if we get called from scripting_game.cpp if (L) { // L can be NULL if we get called from scripting_game.cpp
lua_Debug ar; lua_Debug ar;
FATAL_ERROR_IF(!lua_getstack(L, 2, &ar), "lua_getstack() failed");
if (!lua_getstack(L, 2, &ar))
FATAL_ERROR_IF(!lua_getstack(L, 1, &ar), "lua_getstack() failed");
FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed"); FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed");
warningstream << " (at " << ar.short_src << ":" << ar.currentline << ")"; warningstream << " (at " << ar.short_src << ":" << ar.currentline << ")";
} }