From 0e3e53fa0ac96fcf510d87e6cb63e8fd0ecfa300 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 9 Jul 2021 11:38:55 +0000
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index ea6a09b..8a0f284 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -184,7 +184,11 @@ void Bullet::ProcBomb()
         {
             //烟雾弹
             a8::Vec2 bomb_pos = GetPos();
-            room->frame_event.AddSmoke(this, meta->i->id(), bomb_pos, 1000 * 30);
+            float time_addition = 0;
+            if (IsCurrWeapon() && sender.Get()) {
+                time_addition += sender.Get()->GetAbility()->GetAttrAbs(kHAT_WeaponExplosionContinueTime);
+            }
+            room->frame_event.AddSmoke(this, meta->i->id(), bomb_pos, time_addition);
             ProcSmokeBomb();
         }
         break;