From 673580d178aafca623377d0d134e2b30786c9c4d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 2 Apr 2023 17:12:35 +0800
Subject: [PATCH] 1

---
 server/gameserver/collision.cc | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/server/gameserver/collision.cc b/server/gameserver/collision.cc
index f70be1a3..89154058 100644
--- a/server/gameserver/collision.cc
+++ b/server/gameserver/collision.cc
@@ -9,6 +9,9 @@
 #include "obstacle.h"
 #include "roomobstacle.h"
 
+#include "mt/Map.h"
+#include "mt/MapThing.h"
+
 bool Collision::CheckBullet(IBullet* bullet, Creature* c)
 {
     return a8::IntersectCylinderCylinder
@@ -26,6 +29,20 @@ bool Collision::CheckBullet(IBullet* bullet, Entity* e)
         if (distance > 300) {
             return false;
         }
+        if (ob->init_args) {
+            auto wobj = ob->init_args->Get<std::shared_ptr<mt::WorldObject>>(0);
+            return a8::IntersectCylinderCylinder
+                (
+                 bullet->GetPos().ToGlmVec3(), bullet->GetHitRadius() * 0.6, 10,
+                 e->GetPos().ToGlmVec3(), std::max(wobj->size.x/2.0f, wobj->size.z/2.0f), 10
+                 );
+        } else {
+            return a8::IntersectCylinderCylinder
+                (
+                 bullet->GetPos().ToGlmVec3(), bullet->GetHitRadius() * 0.6, 10,
+                 e->GetPos().ToGlmVec3(), ob->meta->width(), 10
+                 );
+        }
     }
     return false;
 }