server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'online' into dev

Browse Source
This commit is contained in:
aozhiwei 2023-04-14 11:09:47 +08:00
commit c9ab65044e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/gameserver/human.cc
View File

@ -2243,13 +2243,16 @@ void Human::OnBulletHit(IBullet* bullet)
Hero* hero = (Hero*)bullet->GetSender().Get(); Hero* hero = (Hero*)bullet->GetSender().Get();
if (hero->GetAbility()->GetSwitchTimes(kEnableDmgForwardTimes) > 0 && if (hero->GetAbility()->GetSwitchTimes(kEnableDmgForwardTimes) > 0 &&
hero->master.Get() && hero->master.Get() &&
!hero->master.Get()->dead && !hero->master.Get()->dead
hero->master.Get()->GetBattleContext()->GetBrainLifePct() > 0.0f){ ){
float recover_hp = dmg_out * if (hero->master.Get()->GetBattleContext()->GetBrainLifePct() > 0.0f) {
hero->master.Get()->GetBattleContext()->GetBrainLifePct(); float recover_hp = dmg_out *
if (recover_hp > 0.0f) { hero->master.Get()->GetBattleContext()->GetBrainLifePct();
hero->master.Get()->AddHp(recover_hp); if (recover_hp > 0.0f) {
hero->master.Get()->AddHp(recover_hp);
}
} }
hero->master.Get()->GetTrigger()->DmgOut(this, dmg_out);
} }
} }
} }