diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 76de7b0..3221955 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -2006,11 +2006,21 @@ void Human::GenBattleReportData(a8::MutableXObject* params) 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; } }); rank = human_list.size();