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

1

Browse Source
This commit is contained in:
aozhiwei 2021-08-31 15:59:43 +08:00
parent cd55ba4e28
commit 92d08a8015
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/human.cc
View File

@ -684,19 +684,14 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
stats.killer_name = killer_name; stats.killer_name = killer_name;
stats.weapon_id = weapon_id; stats.weapon_id = weapon_id;
} }
GetTrigger()->Die();
{ {
GetTrigger()->Die();
dead = true; dead = true;
real_dead = true; real_dead = true;
downed = false; downed = false;
SetHP(0.0f); SetHP(0.0f);
dead_frameno = room->GetFrameNo(); dead_frameno = room->GetFrameNo();
if (HasBuffEffect(kBET_Camouflage)) {
RemoveBuffByEffectId(kBET_Camouflage);
}
ClearLordMode();
OnDie(); OnDie();
DoGetDown();
KillMgr::Instance()->OnHumanDead(this, &info); KillMgr::Instance()->OnHumanDead(this, &info);
room->frame_event.AddDead(GetWeakPtrRef(), 0); room->frame_event.AddDead(GetWeakPtrRef(), 0);
} }
@ -2105,6 +2100,13 @@ void Human::ProcSpoils(Loot* entity, MetaData::Equip* item_meta)
void Human::OnDie() void Human::OnDie()
{ {
{
if (HasBuffEffect(kBET_Camouflage)) {
RemoveBuffByEffectId(kBET_Camouflage);
}
ClearLordMode();
DoGetDown();
}
real_dead_frameno = room->GetFrameNo(); real_dead_frameno = room->GetFrameNo();
room->OnHumanDie(this); room->OnHumanDie(this);
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);