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

1

Browse Source
This commit is contained in:
aozhiwei 2020-07-07 11:31:45 +08:00
parent cb1613d162
commit cdd9720056
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/human.cc
View File

@ -283,7 +283,7 @@ void Human::FillMFTeamData(cs::MFTeamData* team_data, bool is_game_over)
last_sync_teamdata_frameno_ = room->GetFrameNo(); last_sync_teamdata_frameno_ = room->GetFrameNo();
team_data->set_player_id(GetEntityUniId()); 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(GetPos(), team_data->mutable_pos());
TypeConvert::ToPb(attack_dir, team_data->mutable_dir()); TypeConvert::ToPb(attack_dir, team_data->mutable_dir());
team_data->set_health(GetHP()); 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); 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 && if (room->GetGasData().gas_mode != GasInactive &&
room->GetFrameNo() - room->GetBattleStartFrameNo() < 4) { room->GetFrameNo() - room->GetBattleStartFrameNo() < 4) {
team_data->set_name(name); team_data->set_name(name);