From ecf2a326d381a6867b578f2de98a233ce2a20750 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 18 Apr 2019 15:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/android.ai.cc  | 9 +++++++++
 server/gameserver/deadbody.cc    | 0
 server/gameserver/deadbody.h     | 0
 server/gameserver/decal.cc       | 0
 server/gameserver/decal.h        | 0
 server/gameserver/lootspawner.cc | 0
 server/gameserver/lootspawner.h  | 0
 server/gameserver/projectile.cc  | 0
 server/gameserver/projectile.h   | 0
 9 files changed, 9 insertions(+)
 delete mode 100644 server/gameserver/deadbody.cc
 delete mode 100644 server/gameserver/deadbody.h
 delete mode 100644 server/gameserver/decal.cc
 delete mode 100644 server/gameserver/decal.h
 delete mode 100644 server/gameserver/lootspawner.cc
 delete mode 100644 server/gameserver/lootspawner.h
 delete mode 100644 server/gameserver/projectile.cc
 delete mode 100644 server/gameserver/projectile.h

diff --git a/server/gameserver/android.ai.cc b/server/gameserver/android.ai.cc
index c0e59ad..21b905b 100644
--- a/server/gameserver/android.ai.cc
+++ b/server/gameserver/android.ai.cc
@@ -83,6 +83,10 @@ void AndroidAI::ChangeToState(AndroidState_e to_state)
 
 void AndroidAI::DoMove()
 {
+    Human* hum = (Human*)owner;
+    if (a8::HasBitFlag(hum->status, HS_Fly)) {
+        return;
+    }
     if (owner->updated_times % 2 == 0) {
         Human* hum = (Human*)owner;
         int speed = std::max(1, (int)hum->GetSpeed());
@@ -102,6 +106,11 @@ void AndroidAI::DoMove()
 
 void AndroidAI::DoAttack()
 {
+    Human* hum = (Human*)owner;
+    if (a8::HasBitFlag(hum->status, HS_Fly) ||
+        a8::HasBitFlag(hum->status, HS_Jump)) {
+        return;
+    }
     if (owner->updated_times % 10 == 0) {
         Human* enemy = owner->room->FindEnemy((Human*)owner);
         if (enemy) {
diff --git a/server/gameserver/deadbody.cc b/server/gameserver/deadbody.cc
deleted file mode 100644
index e69de29..0000000
diff --git a/server/gameserver/deadbody.h b/server/gameserver/deadbody.h
deleted file mode 100644
index e69de29..0000000
diff --git a/server/gameserver/decal.cc b/server/gameserver/decal.cc
deleted file mode 100644
index e69de29..0000000
diff --git a/server/gameserver/decal.h b/server/gameserver/decal.h
deleted file mode 100644
index e69de29..0000000
diff --git a/server/gameserver/lootspawner.cc b/server/gameserver/lootspawner.cc
deleted file mode 100644
index e69de29..0000000
diff --git a/server/gameserver/lootspawner.h b/server/gameserver/lootspawner.h
deleted file mode 100644
index e69de29..0000000
diff --git a/server/gameserver/projectile.cc b/server/gameserver/projectile.cc
deleted file mode 100644
index e69de29..0000000
diff --git a/server/gameserver/projectile.h b/server/gameserver/projectile.h
deleted file mode 100644
index e69de29..0000000