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

1

Browse Source
This commit is contained in:
aozhiwei 2023-06-30 19:55:56 +08:00
parent b77d8a3125
commit 4fca04c2e3
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
server/gameserver/human.cc
View File

@ -3334,27 +3334,36 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we
room->frame_event.AddDead(GetWeakPtrRef(), 0); room->frame_event.AddDead(GetWeakPtrRef(), 0);
} }
} else { } else {
if (room->GetGasData().old_area_meta->CanRevive() && real_dead = true;
revive_count < mt::Param::s().revive_count) { dead_frameno = room->GetFrameNo();
} else { GetTrigger()->Die(killer_id, weapon_id);
real_dead = true; OnDie();
dead_frameno = room->GetFrameNo(); KillMgr::Instance()->OnHumanDead(this, &info);
GetTrigger()->Die(killer_id, weapon_id); room->frame_event.AddDead(GetWeakPtrRef(), 0);
OnDie();
KillMgr::Instance()->OnHumanDead(this, &info);
room->frame_event.AddDead(GetWeakPtrRef(), 0);
}
} }
} else { } else {
dead = true; if (room->GetGasData().old_area_meta->CanRevive() &&
real_dead = true; revive_count < mt::Param::s().revive_count) {
downed = false; dead = true;
SetHP(0.0f); real_dead = false;
dead_frameno = room->GetFrameNo(); downed = false;
GetTrigger()->Die(killer_id, weapon_id); SetHP(0.0f);
OnDie(); dead_frameno = room->GetFrameNo();
KillMgr::Instance()->OnHumanDead(this, &info); GetTrigger()->Die(killer_id, weapon_id);
room->frame_event.AddDead(GetWeakPtrRef(), 0); 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);
}
} }
} }
} }