aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2021-03-07 15:40:01 +0100
committerElias Fleckenstein <eliasfleckenstein@web.de>2021-03-07 15:40:01 +0100
commit3a51ccff177722fc079fcd455df8bc810df381ea (patch)
tree2ff2c5831647b45b5f141f9d47dc55638047d51c
parentb36ab2d0637503c647a74131eac2cf2c38d670f5 (diff)
downloadminetest-3a51ccff177722fc079fcd455df8bc810df381ea.tar.xz
Fix server freezing
-rw-r--r--src/server.cpp3
1 files changed, 2 insertions, 1 deletions
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);