From 26259a5fa4b304f2ee68f369cf5388f7336f4c93 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Mon, 8 Dec 2008 17:53:18 -0600
Subject: *Try to fix the bug that players "do not die" when killed.

--HG--
branch : trunk
---
 src/game/Unit.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index c6a1f17df35..91ad509abc2 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10740,9 +10740,14 @@ void Unit::SetLevel(uint32 lvl)
 
 void Unit::SetHealth(uint32 val)
 {
-    uint32 maxHealth = GetMaxHealth();
-    if(maxHealth < val)
-        val = maxHealth;
+    if(!isAlive())
+        val = 0;
+    else
+    {
+        uint32 maxHealth = GetMaxHealth();
+        if(maxHealth < val)
+            val = maxHealth;
+    }
 
     SetUInt32Value(UNIT_FIELD_HEALTH, val);
 
-- 
cgit v1.2.3