From 89a9136b441877b02a8e92eb5ffdf770d295698d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 26 Feb 2024 16:47:18 +0800
Subject: [PATCH] 1

---
 server/gameserver/buff/select_target_with_self_pos.cc | 5 ++++-
 server/gameserver/team.cc                             | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/buff/select_target_with_self_pos.cc b/server/gameserver/buff/select_target_with_self_pos.cc
index 3118e5a1..89245971 100644
--- a/server/gameserver/buff/select_target_with_self_pos.cc
+++ b/server/gameserver/buff/select_target_with_self_pos.cc
@@ -20,7 +20,10 @@ void SelectTargetWithSelfPosBuff::Activate()
          [this, &targets] (Creature* c, bool& stop)
          {
              if (c->dead ||
-                 c->IsCar()) {
+                 c->IsCar() ||
+                 a8::HasBitFlag(c->status, CS_Disable) ||
+                 c->HasBuffEffect(kBET_Dive)
+                 ) {
                  return;
              }
              float distance = owner->GetPos().Distance2D2(c->GetPos());
diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc
index 28ffd95f..97822b6f 100644
--- a/server/gameserver/team.cc
+++ b/server/gameserver/team.cc
@@ -399,6 +399,7 @@ void Team::GenBattleReportData(Human* player, a8::MutableXObject* params)
             member_pb->SetVal("ride_car_kills", hum->stats->ride_car_kills);
             member_pb->SetVal("max_hero_skill_lv", hum->stats->max_hero_skill_lv);
             member_pb->SetVal("abandon_battle", hum->stats->abandon_battle);
+            member_pb->SetVal("assist", hum->stats->assist);
             {
                 std::string weapons_type;
                 std::string weapons_slot;