From d8fc8093733ce617bec38cf62f5b734516609a57 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 28 Oct 2021 15:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=BA=E7=94=B2=E5=AD=90?=
 =?UTF-8?q?=E5=BC=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/buff.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc
index b163714..2dcf2b8 100644
--- a/server/gameserver/buff.cc
+++ b/server/gameserver/buff.cc
@@ -731,6 +731,10 @@ void Buff::CalcPassengerShotOffset()
     if (meta->i->buff_effect() == kBET_Passenger && caster_.Get()->IsHuman()) {
         Human* hum = (Human*)caster_.Get();
         if (hum->GetCar() && hum->GetCar()->GetCurrWeapon()) {
+            {
+                //换座位时清除之前的状态
+                RecoverHoldWeapons();
+            }
             hold_weapons_.push_back(hum->weapons[hum->GetCar()->GetCurrWeapon()->weapon_idx]);
             hum->weapons[hum->GetCar()->GetCurrWeapon()->weapon_idx] = *hum->GetCar()->GetCurrWeapon();
             hum->SetCurrWeapon(&hum->weapons[hum->GetCar()->GetCurrWeapon()->weapon_idx]);