From b93bbfde2c0f6f6217ed3e358ed898049f98e448 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Sat, 10 Jul 2021 14:18:35 +0200 Subject: Script API: Fix segfault in remove_detached_inventory when minetest.remove_detached_inventory is called on script init, the environment is yet not set up, hence m_env is still nullptr until all scripts are loaded --- src/server/serverinventorymgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/serverinventorymgr.cpp') diff --git a/src/server/serverinventorymgr.cpp b/src/server/serverinventorymgr.cpp index 2a80c9bbe..3aee003b4 100644 --- a/src/server/serverinventorymgr.cpp +++ b/src/server/serverinventorymgr.cpp @@ -157,8 +157,8 @@ bool ServerInventoryManager::removeDetachedInventory(const std::string &name) m_env->getGameDef()->sendDetachedInventory( nullptr, name, player->getPeerId()); - } else { - // Notify all players about the change + } else if (m_env) { + // Notify all players about the change as soon ServerEnv exists m_env->getGameDef()->sendDetachedInventory( nullptr, name, PEER_ID_INEXISTENT); } -- cgit v1.2.3