From cdd5389b309d233760d269da243c090583cac4c7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 2 Apr 2023 16:52:07 +0800
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc | 7 ++++++-
 server/gameserver/room.cc   | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index f29ac8ac..d99e4de4 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -805,9 +805,14 @@ void Bullet::GetHitThings(BulletCheckResult& result)
     room->grid_service->TraverseObstacles
         (room->GetRoomIdx(),
          GetGridList(),
-         [this] (Obstacle* ob, bool& stop)
+         [this, result] (Obstacle* ob, bool& stop) mutable
          {
              #if 1
+             if (!ob->CanThroughable(this) && !ob->IsDead(room)) {
+                 if (Collision::CheckBullet(this, ob)) {
+                     result.objects.insert(ob);
+                 }
+             }
              #else
              if (ob->meta->thing_type() == kObstacleStrengthenWall) {
                  if (!strengthened_ && sender.Get() &&
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 5610640c..95c91403 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3492,7 +3492,6 @@ void Room::CreateWorldObjects()
             break;
         case WorldObjectType_e::kCarType:
             {
-                #if 1
                 const mt::Equip* equip_meta = mt::Equip::GetById(obj->object_id);
                 if (equip_meta) {
                     int car_uniid = AllocUniid();
@@ -3509,7 +3508,6 @@ void Room::CreateWorldObjects()
                         car_hash_[c->GetUniId()] = car;
                     }
                 }
-                #endif
             }
             break;
         case WorldObjectType_e::kBornPointType: