From 21b7aaa279b3b12b0e45b2b4c668c3aba85d382b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 13 Oct 2021 11:40:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dc4=E5=90=B8=E9=99=84=E6=9C=BA?= =?UTF-8?q?=E7=94=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 f6731f6..212f101 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -72,7 +72,10 @@ void Bullet::OnHit(std::set& objects) void Bullet::ProcBomb() { - self_collider_->rad = GetExplosionRange(); + float old_collider_rad = self_collider_->rad; + if (meta->i->_inventory_slot() != IS_C4) { + self_collider_->rad = GetExplosionRange(); + } if (IsCurrWeapon()) { } std::set objects; @@ -258,6 +261,7 @@ void Bullet::ProcBomb() } room->RemoveObjectLater(this); later_removed_ = true; + self_collider_->rad = old_collider_rad; } void Bullet::ProcSmokeBomb()