diff options
author | Biglad <none@none> | 2009-10-06 15:15:26 +0100 |
---|---|---|
committer | Biglad <none@none> | 2009-10-06 15:15:26 +0100 |
commit | 5722d5c402c8fc8a340d1f6f81d34f2162ef8f1a (patch) | |
tree | f7c15776fdcac431a2891a40b89e2b1bffdc3c03 /src/game/Unit.cpp | |
parent | 23d0a6c22b7d2f6c436daebadf0d32e43177d209 (diff) |
* Update death checks to prevent death in ghost form, this "should" finnaly fix the perma death bug
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r-- | src/game/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 98760807e4f..4d21945fe3e 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -11960,8 +11960,8 @@ void Unit::SetHealth(uint32 val) if(getDeathState() == JUST_DIED) val = 0; // causes instant permadeath if you exit game while in combat?! :-| - //else if((getDeathState() & (DEAD | DEAD_FALLING)) != 0) - // val = 1; + else if((GetTypeId() == TYPEID_PLAYER) && (getDeathState() & (DEAD | DEAD_FALLING)) != 0) + val = 1; else { uint32 maxHealth = GetMaxHealth(); |