From adcfb27b2bc5bcbb825efde10db9df68f9d0b50d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 6 Nov 2019 11:21:14 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index c53935c..256de56 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -805,6 +805,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i downed = false; downed_timer = nullptr; BeKill(killer_id, killer_name, weapon_id); + SyncAroundPlayers(__FILE__, __LINE__, __func__); } else { if (HasNoDownedTeammate()) { 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, &xtimer_attacher.timer_list_ ); + SyncAroundPlayers(__FILE__, __LINE__, __func__); } else { BeKill(killer_id, killer_name, weapon_id); } } } + room->frame_event.AddHpChg(this); } - #if 1 - room->frame_event.AddHpChg(this); - #else - SyncAroundPlayers(__FILE__, __LINE__, __func__); - #endif } void Human::AddToNewObjects(Entity* entity)