From 553c82854a643a3c158f1e467d21411d444f4801 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Wed, 23 Jan 2008 17:12:13 +0000
Subject: Fixed "immortal monster" bug.

---
 src/game-server/being.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index ce7f06db..e0b16ed7 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -83,16 +83,12 @@ int Being::damage(Object *, Damage const &damage)
     if (HPloss < 0) HPloss = 0;
 
     mHitsTaken.push_back(HPloss);
-    LOG_DEBUG("Being " << getPublicID() << " got hit.");
 
     Attribute &HP = mAttributes[BASE_ATTR_HP];
-    if (HPloss >= HP.base + HP.mod) HPloss = HP.base + HP.mod;
-    if (HPloss > 0)
-    {
-        HP.mod -= HPloss;
-        modifiedAttribute(BASE_ATTR_HP);
-        if (HP.base + HP.mod == 0) died();
-    }
+    LOG_DEBUG("Being " << getPublicID() << " suffered "<<HPloss<<" damage. HP: "<<HP.base + HP.mod<<"/"<<HP.base);
+    HP.mod -= HPloss;
+    modifiedAttribute(BASE_ATTR_HP);
+    if (HP.base + HP.mod <= 0) died();
 
     return HPloss;
 }
-- 
cgit v1.2.3-70-g09d2