*Temporary fix to permadeath issue.. still uncertain why this was happening at all...

--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-02 05:45:08 -07:00
parent 18995c8785
commit 3dc4df381f
+4 -3
View File
@@ -11958,10 +11958,11 @@ void Unit::SetLevel(uint32 lvl)
void Unit::SetHealth(uint32 val) void Unit::SetHealth(uint32 val)
{ {
if((getDeathState() & JUST_DIED) != 0) if(getDeathState() == JUST_DIED)
val = 0; val = 0;
else if((getDeathState() & (DEAD | DEAD_FALLING)) != 0) // causes instant permadeath if you exit game while in combat?! :-|
val = 1; //else if((getDeathState() & (DEAD | DEAD_FALLING)) != 0)
// val = 1;
else else
{ {
uint32 maxHealth = GetMaxHealth(); uint32 maxHealth = GetMaxHealth();