From 12db6a66791d5ad946cb08762bced57d0c02272a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 9 Mar 2023 12:15:17 +0800
Subject: [PATCH] 1

---
 server/gameserver/battledatacontext.cc | 2 +-
 server/gameserver/human.cc             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index e1463df2..cd7571cb 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -548,7 +548,7 @@ float BattleDataContext::CalcDmg(Creature* target, IBullet* bullet)
     float crit = g_calc_dmg_context.is_crit ? GetCritRate(bullet) : 0;
     float dodge = IsDodge(bullet) ? GetDodgeRuduce(bullet) : 0;
     float finaly_dmg = normal_dmg * (1.0f + crit + dodge);
-    finaly_dmg *= (1 + owner_->GetAbility()->GetDmgAddition());
+    finaly_dmg *= (1 + owner_.Get()->GetAbility()->GetDmgAddition());
     finaly_dmg *= (1 - target->GetAbility()->GetDmgRuduce());
 #if 1
     finaly_dmg *= (1 + bullet->GetStrengthenWall());
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 485aa338..e8da021e 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -3511,15 +3511,15 @@ void Human::ProcGemStoneItem(AddItemDTO& dto)
         (
          GetWeakPtrRef(),
          kPropHp,
-         GetHP(),
          0,
+         GetHP(),
          true);
     room->frame_event.AddPropChg
         (
          GetWeakPtrRef(),
          kPropMaxHp,
-         GetMaxHP(),
          0,
+         GetMaxHP(),
          true);
     dto.handled = true;
 }