From cdd972005624c85bd87c2836ee564cd8ab717453 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 7 Jul 2020 11:31:45 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 21c8bc7..8fab118 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -283,7 +283,7 @@ void Human::FillMFTeamData(cs::MFTeamData* team_data, bool is_game_over) last_sync_teamdata_frameno_ = room->GetFrameNo(); team_data->set_player_id(GetEntityUniId()); - if (!real_dead || room->GetFrameNo() - GetRealDeadFrameNo(room) < 4) { + if (is_game_over || !real_dead || room->GetFrameNo() - GetRealDeadFrameNo(room) < 4) { TypeConvert::ToPb(GetPos(), team_data->mutable_pos()); TypeConvert::ToPb(attack_dir, team_data->mutable_dir()); team_data->set_health(GetHP()); @@ -292,6 +292,10 @@ void Human::FillMFTeamData(cs::MFTeamData* team_data, bool is_game_over) team_data->set_downed(downed); } + if (is_game_over || room->GetGasData().gas_mode == GasInactive) { + team_data->set_name(name); + } + if (room->GetGasData().gas_mode != GasInactive && room->GetFrameNo() - room->GetBattleStartFrameNo() < 4) { team_data->set_name(name);