From 42c663c157a77b631cc7d5ee295ddc98e81ee743 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 26 Aug 2021 15:50:26 +0800
Subject: [PATCH] c4

---
 server/gameserver/bullet.cc | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index 024c104..a90cc86 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -91,6 +91,8 @@ void Bullet::ProcBomb()
                      sender.Get()->team_id == c->team_id) {
                      return;
                  }
+                 AabbCollider aabb_box;
+                 c->GetHitAabbBox(aabb_box);
                  if (meta->i->_inventory_slot() == IS_C4) {
                      if (!objects.empty()) {
                          stop = true;
@@ -99,12 +101,15 @@ void Bullet::ProcBomb()
                      if (!c->IsCar()) {
                          return;
                      }
-                     c4_target = c->AsCar();
-                 }
-                 AabbCollider aabb_box;
-                 c->GetHitAabbBox(aabb_box);
-                 if (TestCollision(room, &aabb_box)) {
-                     objects.insert(c);
+                     if (TestCollision(room, &aabb_box)) {
+                         c4_target = c->AsCar();
+                         stop = true;
+                         return;
+                     }
+                 } else {
+                     if (TestCollision(room, &aabb_box)) {
+                         objects.insert(c);
+                     }
                  }
              }
          });