* Update death checks to prevent death in ghost form, this "should" finnaly fix the perma death bug

--HG--
branch : trunk

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();