diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 6ad31f5..4eace34 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -86,9 +86,6 @@ void Bullet::OnHit(std::set& objects) switch (target->entity_type) { case kET_Player: { - if (App::Instance()->HasFlag(8)) { - return; - } Human* hum = (Human*)target; if (hum->HasBuffEffect(kBET_Invincible)) { continue; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 9e3a679..abcc72c 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1067,16 +1067,16 @@ void Room::BattleReport() [] (Human* a, Human* b) -> bool { if (a->stats.kills > b->stats.kills) { - return true; + return false; } if (a->stats.dead_times < b->stats.dead_times) { - return true; + return false; } if (a->stats.damage_amount_out > b->stats.damage_amount_out) { - return true; + return false; } if (a->stats.last_kill_timeseq < b->stats.last_kill_timeseq) { - return true; + return false; } return false; }); @@ -1084,6 +1084,14 @@ void Room::BattleReport() int rank = 1; for (Human* hum : human_list) { hum->stats.rank = rank++; + a8::XPrintf("rank:%d kills:%d dead_times:%d damage_amount_out:%d last_kill_timeseq:%d\n", + { + hum->stats.rank, + hum->stats.kills, + hum->stats.dead_times, + hum->stats.damage_amount_out, + hum->stats.last_kill_timeseq, + }); hum->SendGameOver(); } game_over = true;