From 9472c547c5783fabfe5ed695fabef6fd15e2867e Mon Sep 17 00:00:00 2001 From: gregorycu Date: Sun, 8 May 2016 17:51:50 +1000 Subject: [PATCH] Fixes #4098 ce8a9ed didn't quite go far enough, and left this bug in --- src/server.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 6c008a2a138c..2c3623680109 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2515,9 +2515,11 @@ void Server::sendDetachedInventories(u16 peer_id) void Server::DiePlayer(u16 peer_id) { DSTACK(FUNCTION_NAME); - PlayerSAO *playersao = getPlayerSAO(peer_id); - assert(playersao); + // In some rare case, if the player is disconnected + // while Lua call l_punch, for example, this can be NULL + if (!playersao) + return; infostream << "Server::DiePlayer(): Player " << playersao->getPlayer()->getName()