From 4fca04c2e3c923309a951ed87a89499abba656fc Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 30 Jun 2023 19:55:56 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 47 +++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 5d79505b..42cbf1e5 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -3334,27 +3334,36 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we room->frame_event.AddDead(GetWeakPtrRef(), 0); } } else { - if (room->GetGasData().old_area_meta->CanRevive() && - revive_count < mt::Param::s().revive_count) { - } else { - real_dead = true; - dead_frameno = room->GetFrameNo(); - GetTrigger()->Die(killer_id, weapon_id); - OnDie(); - KillMgr::Instance()->OnHumanDead(this, &info); - room->frame_event.AddDead(GetWeakPtrRef(), 0); - } + real_dead = true; + dead_frameno = room->GetFrameNo(); + GetTrigger()->Die(killer_id, weapon_id); + OnDie(); + KillMgr::Instance()->OnHumanDead(this, &info); + room->frame_event.AddDead(GetWeakPtrRef(), 0); } } else { - dead = true; - real_dead = true; - downed = false; - SetHP(0.0f); - dead_frameno = room->GetFrameNo(); - GetTrigger()->Die(killer_id, weapon_id); - OnDie(); - KillMgr::Instance()->OnHumanDead(this, &info); - room->frame_event.AddDead(GetWeakPtrRef(), 0); + if (room->GetGasData().old_area_meta->CanRevive() && + revive_count < mt::Param::s().revive_count) { + dead = true; + real_dead = false; + downed = false; + SetHP(0.0f); + dead_frameno = room->GetFrameNo(); + GetTrigger()->Die(killer_id, weapon_id); + OnDie(); + KillMgr::Instance()->OnHumanDead(this, &info); + room->frame_event.AddDead(GetWeakPtrRef(), 0); + } else { + dead = true; + real_dead = true; + downed = false; + SetHP(0.0f); + dead_frameno = room->GetFrameNo(); + GetTrigger()->Die(killer_id, weapon_id); + OnDie(); + KillMgr::Instance()->OnHumanDead(this, &info); + room->frame_event.AddDead(GetWeakPtrRef(), 0); + } } } }