From 01c8e9007ebeee99e8820134f6d06ed61838d5ee Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 16 Apr 2019 17:37:33 +0800 Subject: [PATCH] 1 --- server/gameserver/player.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index e972700..3569572 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -872,12 +872,11 @@ void Player::FillMFActivePlayerData(cs::MFActivePlayerData* player_data) int left_time = std::max(0, pain_killer_lastingtime * 1000 - passed_time); int anodyne_max_time = MetaMgr::Instance()->GetSysParamAsInt("anodyne_max_time"); left_time = std::min(left_time, anodyne_max_time * 1000); - int lasting_time = std::min(pain_killer_lastingtime * 1000, anodyne_max_time * 1000); cs::MFBodyState* p = player_data->add_states(); p->set_state_type(1); p->set_left_time(left_time); - p->set_lasting_time(lasting_time); + p->set_lasting_time(anodyne_max_time); } }