From: Ner'zhul Date: Sat, 11 Apr 2015 08:07:23 +0000 (+0200) Subject: Fix a rare crash case un SendPlayerHP X-Git-Tag: 0.4.13~377 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce8a9ed;p=oweals%2Fminetest.git Fix a rare crash case un SendPlayerHP If the player is disconnected while Lua API is doing a l_punch call, for example, the playersao is NULL and the server crash. Fix it. --- diff --git a/src/server.cpp b/src/server.cpp index 6597ee64f..4d5938205 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1802,7 +1802,11 @@ void Server::SendPlayerHP(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; + SendHP(peer_id, playersao->getHP()); m_script->player_event(playersao,"health_changed");