BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix various damage related bugs (client-side)

Browse Source 
E.g. spawning or teleporting into lava to become invinsible
This commit is contained in:
Craig Robbins 2015-03-17 16:21:48 +10:00
parent 34c5a5b377
commit c552d293fa
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/environment.cpp
View File

@ -2563,16 +2563,10 @@ void ClientEnvironment::damageLocalPlayer(u8 damage, bool handle_hp)
LocalPlayer *lplayer = getLocalPlayer(); LocalPlayer *lplayer = getLocalPlayer();
assert(lplayer); assert(lplayer);
if(handle_hp) { if (handle_hp && lplayer->hp > damage)
// Don't damage a dead player lplayer->hp -= damage;
if (lplayer->isDead()) else
return; lplayer->hp = 0;
if(lplayer->hp > damage)
lplayer->hp -= damage;
else
lplayer->hp = 0;
}
ClientEnvEvent event; ClientEnvEvent event;
event.type = CEE_PLAYER_DAMAGE; event.type = CEE_PLAYER_DAMAGE;