oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fix damage flash when damage disabled

Browse source
This commit is contained in:
kwolekr 2015-07-10 15:58:32 -04:00
parent 8eb272cea3
commit 1a1774a105
4 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/network/serverpackethandler.cpp
View file

@ -1151,7 +1151,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
<< std::endl;
playersao->setHP(playersao->getHP() - damage);
SendPlayerHPOrDie(playersao->getPeerID(), playersao->getHP() == 0);
SendPlayerHPOrDie(playersao);
}
}
@ -1510,14 +1510,12 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
// If the object is a player and its HP changed
if (src_original_hp != pointed_object->getHP() &&
pointed_object->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
SendPlayerHPOrDie(((PlayerSAO*)pointed_object)->getPeerID(),
pointed_object->getHP() == 0);
SendPlayerHPOrDie((PlayerSAO *)pointed_object);
}
// If the puncher is a player and its HP changed
if (dst_origin_hp != playersao->getHP()) {
SendPlayerHPOrDie(playersao->getPeerID(), playersao->getHP() == 0);
}
if (dst_origin_hp != playersao->getHP())
SendPlayerHPOrDie(playersao);
}
} // action == 0