From 7f15d2d2e8e904f895b7cc76826a05bda77650f8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 23 Jun 2021 07:41:00 +0000
Subject: [PATCH] =?UTF-8?q?3.=E5=96=B7=E7=81=AB=E6=9E=AA=E5=AD=90=E5=BC=B9?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E5=AE=8C=E5=90=8E=E4=BB=8D=E4=BC=9A=E6=9C=89?=
 =?UTF-8?q?=E5=96=B7=E7=81=AB=E7=89=B9=E6=95=88=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/player.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 9a019c3..839d930 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -1699,6 +1699,13 @@ void Player::UpdateAiming()
 void Player::CheckShotHoldState(Weapon* weapon)
 {
     if (weapon->meta->buff_meta && weapon->meta->buff_meta->i->trigger_type() == kBTT_SeriesShot) {
+        if (GetCurrWeapon()->weapon_idx != 0 &&
+            GetCurrWeapon()->ammo <= 0) {
+            if (shot_hold_timer) {
+                room->xtimer.DeleteTimer(shot_hold_timer);
+            }
+            return;
+        }
         if (shot_hold_timer) {
             if (weapon->meta->buff_meta->i->buff_id() !=
                 room->xtimer.MutableParams(shot_hold_timer)->param1.GetInt()) {