diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-13 08:57:19 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-13 08:57:58 +0100 |
| commit | 4e63c977c782e81e828445d20c836d84e3ba1766 (patch) | |
| tree | 80467660176c9ddfab9880e2204687de3d01dbb3 /src/environment.cpp | |
| parent | 7c19933a8cca173157e0c21923cafe56b2334708 (diff) | |
| download | minetest-4e63c977c782e81e828445d20c836d84e3ba1766.tar.gz minetest-4e63c977c782e81e828445d20c836d84e3ba1766.tar.bz2 minetest-4e63c977c782e81e828445d20c836d84e3ba1766.zip | |
Use the new Player::isDead function when it's the case
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index f75e7a0b7..953fa2860 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -2563,9 +2563,11 @@ void ClientEnvironment::damageLocalPlayer(u8 damage, bool handle_hp) LocalPlayer *lplayer = getLocalPlayer(); assert(lplayer); - if(handle_hp){ - if (lplayer->hp == 0) // Don't damage a dead player + if(handle_hp) { + // Don't damage a dead player + if (lplayer->isDead()) return; + if(lplayer->hp > damage) lplayer->hp -= damage; else |