c4

2021-08-26 15:50:26 +08:00 · 2021-08-26 15:50:26 +08:00 · 42c663c157
commit 42c663c157
parent 4c286dbda0
1 changed files with 11 additions and 6 deletions
--- 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,14 +101,17 @@ void Bullet::ProcBomb()
                     if (!c->IsCar()) {
                         return;
                     }
+                     if (TestCollision(room, &aabb_box)) {
                         c4_target = c->AsCar();
+                         stop = true;
+                         return;
                     }
-                 AabbCollider aabb_box;
-                 c->GetHitAabbBox(aabb_box);
+                 } else {
                     if (TestCollision(room, &aabb_box)) {
                         objects.insert(c);
                     }
                 }
+             }
         });
    TraverseAllLayerEntityList
        (