From 1f04049994770d16b85e6974b8a3c3b8f103abfa Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 10 Jul 2019 11:47:37 +0800
Subject: [PATCH] 1

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

diff --git a/server/gameserver/android.ai.cc b/server/gameserver/android.ai.cc
index 5030906..2d6e465 100644
--- a/server/gameserver/android.ai.cc
+++ b/server/gameserver/android.ai.cc
@@ -86,6 +86,9 @@ void AndroidAI::ChangeToState(AndroidState_e to_state)
 void AndroidAI::DoMove()
 {
     Human* hum = (Human*)owner;
+    if (hum->HasBuffEffect(BET_Vertigo) || hum->HasBuffEffect(BET_Dcgr)) {
+        return;
+    }
     if (owner->updated_times % 2 == 0) {
         Human* hum = (Human*)owner;
         int speed = std::max(1, (int)hum->GetSpeed());
@@ -110,6 +113,9 @@ void AndroidAI::DoAttack()
     if (hum->room->gas_data.gas_mode == GasInactive) {
         return;
     }
+    if (hum->HasBuffEffect(BET_Vertigo) || hum->HasBuffEffect(BET_Dcgr)) {
+        return;
+    }
     if (owner->updated_times % 10 == 0) {
         Human* enemy = owner->room->FindEnemy((Human*)owner);
         if (enemy && !enemy->HasBuffEffect(BET_Invincible) && !enemy->HasBuffEffect(BET_Hide)) {
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 45a63d9..f936a1c 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -99,7 +99,7 @@ void Player::UpdateMove()
     if (action_type == AT_Relive) {
         CancelAction();
     }
-    if (dead) {
+    if (dead || HasBuffEffect(BET_Vertigo) || HasBuffEffect(BET_Dcgr)) {
         moving = false;
         moved_frames = 0;
         last_collision_door = nullptr;
@@ -119,7 +119,7 @@ void Player::UpdateMove()
 
 void Player::UpdateShot()
 {
-    if (dead) {
+    if (dead || HasBuffEffect(BET_Vertigo) || HasBuffEffect(BET_Dcgr)) {
         shot_start = false;
         shot_hold = false;
         series_shot_frames = 0;