diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2019-06-09 11:25:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-09 11:25:41 +0200 |
| commit | a687efa6dfb97927d94db4d2f05970cde9d4181f (patch) | |
| tree | f3f5712e65a12a20bc87beba95d8a2b6011bbb75 /src/server.cpp | |
| parent | 2ba6785f090bcf0dbc6fadb77a6ec0fab84d0690 (diff) | |
| download | minetest-a687efa6dfb97927d94db4d2f05970cde9d4181f.tar.gz minetest-a687efa6dfb97927d94db4d2f05970cde9d4181f.tar.bz2 minetest-a687efa6dfb97927d94db4d2f05970cde9d4181f.zip | |
Damage: Play no damage sound when immortal (#8350)
Add isImmortal server-side for proper enable_damage handling
Rework log messages
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp index 7167a6686..f3c13bad1 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1426,7 +1426,7 @@ void Server::SendMovement(session_t peer_id) void Server::SendPlayerHPOrDie(PlayerSAO *playersao, const PlayerHPChangeReason &reason) { - if (!g_settings->getBool("enable_damage")) + if (playersao->isImmortal()) return; session_t peer_id = playersao->getPeerID(); |