From a1598e1b83e28503745165d5749cd21b77e97818 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Mon, 14 May 2018 21:03:48 +0200 Subject: Fix segfault in player migration and crash in log_deprecated Makes log_deprecated work when triggered from no function --- src/content_sao.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/content_sao.cpp') diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 1c049c727..6ed78beb0 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -1166,8 +1166,12 @@ void PlayerSAO::setBasePosition(const v3f &position) // This needs to be ran for attachments too ServerActiveObject::setBasePosition(position); - m_env->updateActiveObject(this); - m_position_not_sent = true; + + // Updating is not wanted/required for player migration + if (m_env) { + m_env->updateActiveObject(this); + m_position_not_sent = true; + } } void PlayerSAO::setPos(const v3f &pos) -- cgit v1.2.3