Skip to content
Permalink
Browse files

Fix multiple death messages (#5305)

Fix multiple death messages (#3565) and damage server logs after death.
  • Loading branch information
presstabstart authored and sofar committed Apr 7, 2017
1 parent 63e175d commit 351cc2e79a7d78f7ec97ff9b33e4f0bad4042b19
Showing with 14 additions and 8 deletions.
  1. +2 −2 src/content_sao.cpp
  2. +7 −0 src/network/serverpackethandler.cpp
  3. +5 −6 src/server.cpp
@@ -919,8 +919,8 @@ void PlayerSAO::step(float dtime, bool send_recommended)
MapNode n = m_env->getMap().getNodeNoEx(p);
const ContentFeatures &c = m_env->getGameDef()->ndef()->get(n);
// If node generates drown
if (c.drowning > 0) {
if (m_hp > 0 && m_breath > 0)
if (c.drowning > 0 && m_hp > 0) {
if (m_breath > 0)
setBreath(m_breath - 1);

// No more breath, damage player
@@ -1107,6 +1107,13 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
}

if (g_settings->getBool("enable_damage")) {
if (playerSAO->isDead()) {
verbosestream << "Server::ProcessData(): Info: "
"Ignoring damage as player " << player->getName()
<< " is already dead." << std::endl;
return;
}

actionstream << player->getName() << " damaged by "
<< (int)damage << " hp at " << PP(playersao->getBasePosition() / BS)
<< std::endl;
@@ -1111,16 +1111,15 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
// Send inventory
SendInventory(playersao);

// Send HP
SendPlayerHPOrDie(playersao);
// Send HP or death screen
if (playersao->isDead())
SendDeathscreen(peer_id, false, v3f(0,0,0));
else
SendPlayerHPOrDie(playersao);

// Send Breath
SendPlayerBreath(playersao);

// Show death screen if necessary
if (playersao->isDead())
SendDeathscreen(peer_id, false, v3f(0,0,0));

// Note things in chat if not in simple singleplayer mode
if (!m_simple_singleplayer_mode && g_settings->getBool("show_statusline_on_connect")) {
// Send information about server to player in chat

0 comments on commit 351cc2e

Please sign in to comment.
You can’t perform that action at this time.