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

1

Browse Source
This commit is contained in:
aozhiwei 2019-11-06 11:21:14 +08:00
parent e2a730e49b
commit adcfb27b2b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/human.cc
View File

@ -805,6 +805,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
downed = false; downed = false;
downed_timer = nullptr; downed_timer = nullptr;
BeKill(killer_id, killer_name, weapon_id); BeKill(killer_id, killer_name, weapon_id);
SyncAroundPlayers(__FILE__, __LINE__, __func__);
} else { } else {
if (HasNoDownedTeammate()) { if (HasNoDownedTeammate()) {
health = MetaMgr::Instance()->GetSysParamAsInt("downed_recover_hp"); health = MetaMgr::Instance()->GetSysParamAsInt("downed_recover_hp");
@ -819,17 +820,14 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
downed_func, downed_func,
&xtimer_attacher.timer_list_ &xtimer_attacher.timer_list_
); );
SyncAroundPlayers(__FILE__, __LINE__, __func__);
} else { } else {
BeKill(killer_id, killer_name, weapon_id); BeKill(killer_id, killer_name, weapon_id);
} }
} }
} }
}
#if 1
room->frame_event.AddHpChg(this); room->frame_event.AddHpChg(this);
#else }
SyncAroundPlayers(__FILE__, __LINE__, __func__);
#endif
} }
void Human::AddToNewObjects(Entity* entity) void Human::AddToNewObjects(Entity* entity)