From 887454e786aec42c3e468bd8d06c006a4ab62ddd Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 21 Nov 2022 15:17:16 +0800
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc       | 2 +-
 server/gameserver/smoke_mitask.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index 970324a1..edcd8ee8 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -258,6 +258,7 @@ void Bullet::ProcBomb()
             }
             #if 1
             AddGunBuff();
+            ProcSmokeBomb();
             #else
             a8::Vec2 bomb_pos = GetPos();
             float time_addition = 0;
@@ -265,7 +266,6 @@ void Bullet::ProcBomb()
                 time_addition += sender.Get()->GetAbility()->GetAttrAbs(kHAT_WeaponExplosionContinueTime);
             }
             room->frame_event.AddSmoke(this, meta->i->id(), bomb_pos, time_addition);
-            ProcSmokeBomb();
             #endif
         }
         break;
diff --git a/server/gameserver/smoke_mitask.cc b/server/gameserver/smoke_mitask.cc
index 69082bf1..c5617f41 100644
--- a/server/gameserver/smoke_mitask.cc
+++ b/server/gameserver/smoke_mitask.cc
@@ -10,7 +10,7 @@ void SmokeMiTask::Check()
     {
         std::list<Player*> deleted_hums;
         for (auto& hum : player_set) {
-            if (bomb_pos.Distance(hum->GetPos()) > gun_meta->i->bullet_rad() + hum->meta->i->radius()) {
+            if (bomb_pos.Distance(hum->GetPos()) > gun_meta->float_param1 + hum->meta->i->radius()) {
                 hum->RemoveBuffByEffectId(kBET_HunLuan);
                 deleted_hums.push_back(hum);
             }
@@ -23,7 +23,7 @@ void SmokeMiTask::Check()
         (a8::XParams(),
          [this] (Player* hum, a8::XParams&) -> bool
          {
-             if (bomb_pos.Distance(hum->GetPos()) < gun_meta->i->bullet_rad() + hum->meta->i->radius()) {
+             if (bomb_pos.Distance(hum->GetPos()) < gun_meta->float_param1 + hum->meta->i->radius()) {
                  if (!hum->HasBuffEffect(kBET_HunLuan)) {
                      hum->AddBuff(nullptr, buff_meta, nullptr);
                      player_set.insert(hum);