From 8c98601a31f1811f1ade03e4a3f7de0b7c4ea532 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 29 Apr 2021 15:34:14 +0800
Subject: [PATCH] 1

---
 server/gameserver/android.ai.cc | 11 ++++++-----
 server/gameserver/player.cc     |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/android.ai.cc b/server/gameserver/android.ai.cc
index 679103f..0333312 100644
--- a/server/gameserver/android.ai.cc
+++ b/server/gameserver/android.ai.cc
@@ -494,11 +494,6 @@ void AndroidNewAI::UpdateThinking()
         }
     } else {
         Creature* target = GetTarget();
-        #ifdef DEBUG
-        if (App::Instance()->HasFlag(20)) {
-            target = nullptr;
-        }
-        #endif
         if (target) {
             node_.target.Attach(target);
             ChangeToStateNewAI(ASE_Attack);
@@ -528,6 +523,12 @@ void AndroidNewAI::UpdateAttack()
         ChangeToStateNewAI(ASE_Thinking);
         return;
     }
+#ifdef DEBUG
+    if (App::Instance()->HasFlag(20)) {
+        ChangeToStateNewAI(ASE_Thinking);
+        return;
+    }
+#endif
     float distance = myself->GetPos().Distance(node_.target.Get()->GetPos());
     if (distance > GetAttackRange()) {
         if (ai_meta->i->pursuit_radius() <= 0) {
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 478bda5..3faf1fc 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -1115,7 +1115,7 @@ void Player::_CMExecCommand(f8::MsgHdr& hdr, const cs::CMExecCommand& msg)
         if (cmds.empty()) {
             App::Instance()->UnSetFlag(20);
         } else {
-            if (cmds[0] == "peace") {
+            if (cmds[1] == "peace") {
                 App::Instance()->SetFlag(20);
             }
         }