From 0670c384d8c0738dc42e580400b665e8a19636f7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 31 Mar 2020 13:37:03 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 3221955..0cb550a 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -728,11 +728,21 @@ void Human::FillSMGameOver(cs::SMGameOver& msg) std::sort(human_list.begin(), human_list.end(), [] (Human* a, Human* b ) { - if (a->dead_frameno == b->dead_frameno) { - return a->entity_uniid < b->entity_uniid; + if (a->real_dead && b->real_dead) { + if (a->dead_frameno == b->dead_frameno) { + return a->entity_uniid < b->entity_uniid; + } else { + return a->dead_frameno == 0 || + (b->dead_frameno != 0 && a->dead_frameno > b->dead_frameno); + } } else { - return a->dead_frameno == 0 || - (b->dead_frameno != 0 && a->dead_frameno > b->dead_frameno); + if (a->real_dead) { + return false; + } + if (b->real_dead) { + return true; + } + return a->entity_uniid < b->entity_uniid; } }); int rank = human_list.size();