From f9364616401377f4e1ea09a2672628b9de375f74 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 5 Apr 2023 14:27:48 +0800
Subject: [PATCH] 1

---
 server/gameserver/android_agent.cc | 8 ++++----
 server/gameserver/hero_agent.cc    | 5 -----
 server/gameserver/hero_agent.h     | 2 --
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/server/gameserver/android_agent.cc b/server/gameserver/android_agent.cc
index a27515fd..4c825368 100644
--- a/server/gameserver/android_agent.cc
+++ b/server/gameserver/android_agent.cc
@@ -75,9 +75,6 @@ behaviac::EBTStatus AndroidAgent::DoRandomWalk()
         [this, context] ()
          {
              if (GetOwner()->GetMovement()->GetPathSize() <= 0) {
-                 if (!context->handler.expired()) {
-                     GetOwner()->GetTrigger()->RemoveEventHandler(context->handler);
-                 }
                  return behaviac::BT_SUCCESS;
              } else {
                  return behaviac::BT_RUNNING;
@@ -123,6 +120,7 @@ behaviac::EBTStatus AndroidAgent::DoRandomShot()
          );
 
     context->owner = GetOwner()->GetWeakPtrRef();
+    context->last_frameno = GetOwenr()->room->GetFrameNo();
     context->handler = GetOwner()->GetTrigger()->AddListener
         (
          kAttacked,
@@ -200,7 +198,7 @@ behaviac::EBTStatus AndroidAgent::DoAttack()
     context->owner = GetOwner()->GetWeakPtrRef();
     context->last_frameno = GetOwner()->room->GetFrameNo();
 
-   auto co = std::make_shared<BtCoroutine>(context, "CoAttack");
+    auto co = std::make_shared<BtCoroutine>(context, "CoAttack");
     co->runing_cb =
         [this, context] ()
          {
@@ -248,6 +246,7 @@ behaviac::EBTStatus AndroidAgent::DoPursuit()
     context->target = enemy->GetWeakPtrRef();
     context->last_frameno = GetOwner()->room->GetFrameNo();
     context->last_pursuit_frameno = GetOwner()->room->GetFrameNo();
+    #if 0
     context->handler = GetOwner()->GetTrigger()->AddListener
         (
          kAttacked,
@@ -268,6 +267,7 @@ behaviac::EBTStatus AndroidAgent::DoPursuit()
                  context->owner.Get()->GetTrigger()->RemoveEventHandler(context->handler);
              }
          });
+    #endif
 
     auto co = std::make_shared<BtCoroutine>(context, "CoPursuit");
     co->runing_cb =
diff --git a/server/gameserver/hero_agent.cc b/server/gameserver/hero_agent.cc
index 4bb4e516..faac24fa 100644
--- a/server/gameserver/hero_agent.cc
+++ b/server/gameserver/hero_agent.cc
@@ -22,11 +22,6 @@ HeroAgent::~HeroAgent()
 {
 }
 
-State_e HeroAgent::GetState()
-{
-    return kPreBattle;
-}
-
 behaviac::EBTStatus HeroAgent::DoRandomWalk()
 {
     if (status_ == behaviac::BT_RUNNING) {
diff --git a/server/gameserver/hero_agent.h b/server/gameserver/hero_agent.h
index 6b46f8af..b868349f 100644
--- a/server/gameserver/hero_agent.h
+++ b/server/gameserver/hero_agent.h
@@ -12,8 +12,6 @@ public:
 
     BEHAVIAC_DECLARE_AGENTTYPE(HeroAgent, BaseAgent)
 
-    State_e GetState();
-
     behaviac::EBTStatus DoRandomWalk();
     behaviac::EBTStatus DoRandomShot();
     behaviac::EBTStatus DoAttack();