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 20:32:21 +08:00
parent 79b320e006
commit aee2a8a5b4
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/gameserver/human.cc
View File

@ -2363,16 +2363,23 @@ void Human::OnDie()
} }
} }
} }
std::set<Human*> sent_over_humans;
if (!leave_) { if (!leave_) {
if (!HasNoDownedTeammate()) { if (!HasNoDownedTeammate()) {
if (team_members) { if (team_members) {
for (auto& member : *team_members) { for (auto& member : *team_members) {
if (sent_over_humans.find(member) != sent_over_humans.end()) {
continue;
}
if (member == this) { if (member == this) {
member->SendGameOver(); member->SendGameOver();
sent_over_humans.insert(member);
} else { } else {
if (member->real_dead) { if (member->real_dead) {
member->SendGameOver(); member->SendGameOver();
sent_over_humans.insert(member);
} else if (member->downed) { } else if (member->downed) {
#if 0
a8::XParams* timer_param = room->xtimer.MutableParams(member->downed_timer); a8::XParams* timer_param = room->xtimer.MutableParams(member->downed_timer);
member->stats.killer_id = timer_param->param1; member->stats.killer_id = timer_param->param1;
member->stats.killer_name = timer_param->param2.GetString(); member->stats.killer_name = timer_param->param2.GetString();
@ -2388,24 +2395,34 @@ void Human::OnDie()
room->xtimer.DeleteTimer(member->downed_timer); room->xtimer.DeleteTimer(member->downed_timer);
} }
member->downed_timer = nullptr; member->downed_timer = nullptr;
sent_over_humans.insert(member);
#endif
} }
} }
} }
} else { } else {
SendGameOver(); SendGameOver();
sent_over_humans.insert(this);
} }
} else { } else {
SendGameOver(); SendGameOver();
sent_over_humans.insert(this);
} }
} }
if (room->GetAliveTeamNum() == 1) { if (room->GetAliveTeamNum() == 1) {
std::set<Human*>* alive_team = room->GetAliveTeam(); std::set<Human*>* alive_team = room->GetAliveTeam();
if (team_members != alive_team) { if (team_members != alive_team) {
SendGameOver(); if (sent_over_humans.find(this) == sent_over_humans.end()) {
SendGameOver();
sent_over_humans.insert(this);
}
} }
if (alive_team) { if (alive_team) {
for (Human* member : *alive_team) { for (Human* member : *alive_team) {
member->SendGameOver(); if (sent_over_humans.find(member) == sent_over_humans.end()) {
member->SendGameOver();
sent_over_humans.insert(member);
}
} }
} }
} }