Skip to content
Permalink
Browse files
Fixes #4098 ce8a9ed didn't quite go far enough, and left this bug in
  • Loading branch information
gregorycu authored and Zeno- committed May 8, 2016
1 parent 2cdd9b4 commit b8aed9dfc2ae5e1c877707c856b061ee76b0e1c4
Showing 1 changed file with 5 additions and 3 deletions.
@@ -1846,7 +1846,7 @@ void Server::SendPlayerHP(u16 peer_id)
{
DSTACK(FUNCTION_NAME);
PlayerSAO *playersao = getPlayerSAO(peer_id);
// In some rare case, if the player is disconnected
// In some rare case if the player is disconnected
// while Lua call l_punch, for example, this can be NULL
if (!playersao)
return;
@@ -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 cases this can be NULL -- if the player is disconnected
// when a Lua function modifies l_punch, for example
if (!playersao)
return;

infostream << "Server::DiePlayer(): Player "
<< playersao->getPlayer()->getName()

0 comments on commit b8aed9d

Please sign in to comment.