aboutsummaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server.cpp')
-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);