From 3a51ccff177722fc079fcd455df8bc810df381ea Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sun, 7 Mar 2021 15:40:01 +0100 Subject: Fix server freezing --- src/server.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server.cpp b/src/server.cpp index ef15ed7ba..cddd7c522 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1471,7 +1471,8 @@ void Server::SendInventory(PlayerSAO *sao, bool incremental) NetworkPacket pkt(TOCLIENT_INVENTORY, 0, sao->getPeerID()); std::ostringstream os(std::ios::binary); - sao->getInventory()->serialize(os, incremental, g_settings->getBool("send_all_item_metadata") || getClient(sao->getPeerID(), CS_InitDone)->mapsaving_enabled); + RemoteClient *client = getClientNoEx(sao->getPeerID(), CS_InitDone); + sao->getInventory()->serialize(os, incremental, g_settings->getBool("send_all_item_metadata") || (client && client->mapsaving_enabled)); sao->getInventory()->setModified(false); player->setModified(true); -- cgit v1.2.3