From 0a7427383145ebf416bf27e42f5229302fc4b556 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Mon, 20 May 2019 11:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=BB=E4=BA=A1=E5=90=8E?=
 =?UTF-8?q?=E5=BC=80=E6=9E=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/player.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 65be105..7b7f7a7 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -100,7 +100,7 @@ void Player::UpdateMove()
     if (action_type == AT_Relive) {
         CancelAction();
     }
-    if (a8::HasBitFlag(status, HS_Fly)) {
+    if (dead || a8::HasBitFlag(status, HS_Fly)) {
         moving = false;
         moved_frames = 0;
         last_collision_door = nullptr;
@@ -139,7 +139,8 @@ void Player::UpdateMove()
 
 void Player::UpdateShot()
 {
-    if (a8::HasBitFlag(status, HS_Fly) ||
+    if (dead ||
+        a8::HasBitFlag(status, HS_Fly) ||
         a8::HasBitFlag(status, HS_Jump) ) {
         shot_start = false;
         shot_hold = false;