From 737f7eb07b0206fd277759658bb2ddeb03af0222 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 21 Jul 2023 15:04:44 +0800
Subject: [PATCH] 1

---
 server/bin/exported/boss_40101_chase_to_kill.xml | 5 +++++
 server/gameserver/base_agent.cc                  | 4 ++--
 server/gameserver/netdata.cc                     | 8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/bin/exported/boss_40101_chase_to_kill.xml b/server/bin/exported/boss_40101_chase_to_kill.xml
index c67106f1..6dd2ccef 100644
--- a/server/bin/exported/boss_40101_chase_to_kill.xml
+++ b/server/bin/exported/boss_40101_chase_to_kill.xml
@@ -9,6 +9,11 @@
     <property Prototype="Self.BaseAgent::ChaseToKill(0)" />
     <property IsHTN="false" />
     <node class="Sequence" id="1">
+      <node class="Assignment" id="10">
+        <property CastRight="true" />
+        <property Opl="int Self.BaseAgent::_$local_task_param_$_0" />
+        <property Opr="int Self.BaseAgent::find_enemy_target_uniid" />
+      </node>
       <node class="Action" id="2">
         <property Method="Self.BaseAgent::SetCurrentTarget(int Self.BaseAgent::_$local_task_param_$_0)" />
         <property ResultOption="BT_SUCCESS" />
diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc
index 01a8351f..8349dea0 100644
--- a/server/gameserver/base_agent.cc
+++ b/server/gameserver/base_agent.cc
@@ -404,7 +404,7 @@ bool BaseAgent::CurrentTargetIsValid()
 {
     bool ret = current_target_.Get() && !current_target_.Get()->dead;
     #ifdef DEBUG
-    if (GetOwner()->GetHeroMeta()->id() == 60100) {
+    if (GetOwner()->GetHeroMeta()->id() == 60100 && !ret) {
         a8::XPrintf("CurrentTargetIsValid %d\n", {ret});
     }
     #endif
@@ -429,7 +429,7 @@ float BaseAgent::GetCurrentTargetDistance()
     if (current_target_.Get()) {
         distance =  current_target_.Get()->GetPos().Distance2D2(GetOwner()->GetPos());
     }
-    #ifdef DEBUG
+    #ifdef DEBUG1
     if (GetOwner()->GetHeroMeta()->id() == 60100) {
         a8::XPrintf("GetCurrentTargetDistance %f\n", {distance});
     }
diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc
index 857d46d6..db2dd4e3 100644
--- a/server/gameserver/netdata.cc
+++ b/server/gameserver/netdata.cc
@@ -904,10 +904,6 @@ void BattleDataContext::ForceInit(long long hero_uniid,
         weapon2_ability_->weapon_uniid = weapon2_uniid;
         weapon2_ability_->weapon_meta = weapon2_meta;
     }
-    auto match_conf = owner_.Get()->room->GetRankMatchConf();
-    if (owner_.Get()->IsAndroid() && match_conf) {
-
-    }
 }
 
 void BattleDataContext::Init(Creature* c)
@@ -942,6 +938,10 @@ void BattleDataContext::Init(Creature* c)
                 spec_weapon.ammo = spec_weapon.GetClipVolume(c);
             }
         }
+    }
+    auto match_conf = owner_.Get()->room->GetRankMatchConf();
+    if (owner_.Get()->IsAndroid() && match_conf) {
+
     }
     c->NetInitOk();
 }