From bbbffd3c3b26899d0624d897917f69c0dcdee56e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 9 Jan 2024 14:52:37 +0800
Subject: [PATCH] 1

---
 server/gameserver/ability.cc  | 10 +++++-----
 server/gameserver/creature.cc |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/ability.cc b/server/gameserver/ability.cc
index 598579dc..0cf816c2 100644
--- a/server/gameserver/ability.cc
+++ b/server/gameserver/ability.cc
@@ -172,7 +172,7 @@ AttrHandle Ability::AddAttr(int attr_id, float val)
         }
         if (std::fabs(owner_.Get()->GetMaxHP() - old_max_hp) > 0.000001f) {
             owner_.Get()->SetMaxHP(owner_.Get()->GetMaxHP());
-            owner_.Get()->SetHP(owner_.Get()->GetHP() * (old_max_hp / owner_.Get()->GetMaxHP()));
+            owner_.Get()->SetHP(owner_.Get()->GetHP() * (owner_.Get()->GetMaxHP() / old_max_hp));
             owner_.Get()->room->frame_event.AddHpChg(owner_);
         }
         return p;
@@ -195,7 +195,7 @@ void Ability::RemoveAttr(AttrHandle handle)
         p->holder = nullptr;
         if (std::fabs(owner_.Get()->GetMaxHP() - old_max_hp) > 0.000001f) {
             owner_.Get()->SetMaxHP(owner_.Get()->GetMaxHP());
-            owner_.Get()->SetHP(owner_.Get()->GetHP() * (old_max_hp / owner_.Get()->GetMaxHP()));
+            owner_.Get()->SetHP(owner_.Get()->GetHP() * (owner_.Get()->GetMaxHP() / old_max_hp));
             owner_.Get()->room->frame_event.AddHpChg(owner_);
         }
     }
@@ -324,7 +324,7 @@ void Ability::GMDelAttr(int attr_id,  int idx)
         list_for_each_safe(pos, next, head) {
             AttrAddition* e = list_entry(pos,
                                          AttrAddition,
-                                         entry);
+                                         list_entry);
             if (i == idx) {
                 RemoveAttr(e->shared_from_this());
                 return;
@@ -363,7 +363,7 @@ std::vector<std::string> Ability::GMShowAttrs()
             list_for_each_safe(pos, next, head) {
                 AttrAddition* e = list_entry(pos,
                                              AttrAddition,
-                                             entry);
+                                             list_entry);
                 data += "" + a8::XValue(e->value).GetString() + ",";
                 ++i;
             }
@@ -394,7 +394,7 @@ std::vector<std::string> Ability::GMShowAttrs()
             list_for_each_safe(pos, next, head) {
                 AttrAddition* e = list_entry(pos,
                                              AttrAddition,
-                                             entry);
+                                             list_entry);
                 data += "" + a8::XValue(e->value).GetString() + ",";
                 ++i;
             }
diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 520b72a4..ea35b96d 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1970,7 +1970,7 @@ float Creature::GetHP()
 
 float Creature::GetMaxHP()
 {
-    return ability.max_hp;
+    return GetNetData()->GetMaxHP();
 }
 
 float Creature::GetHPRate()