From ed2fb628e29141bff36fc330f53a8bc073de4ee8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 1 Oct 2022 10:09:22 +0800
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index 6c506129..3ba2af83 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -316,9 +316,8 @@ void Bullet::ProcBomb()
         }
         break;
     }
-    room->RemoveObjectLater(this);
-    later_removed_ = true;
     self_collider_->rad = old_collider_rad;
+    ForceRemove();
 }
 
 void Bullet::ProcSmokeBomb()
@@ -401,8 +400,7 @@ void Bullet::MapServiceUpdate()
                 } else {
                     Check(distance);
                     if (!later_removed_) {
-                        room->RemoveObjectLater(this);
-                        later_removed_ = true;
+                        ForceRemove();
                     }
                 }
             } else {
@@ -432,8 +430,7 @@ void Bullet::MapServiceUpdate()
         }
 #endif
     } else {
-        room->RemoveObjectLater(this);
-        later_removed_ = true;
+        ForceRemove();
     }
 }
 
@@ -626,9 +623,7 @@ void Bullet::Check(float distance)
                              );
                     }
                 }
-                ClearBuffList();
-                room->RemoveObjectLater(this);
-                later_removed_ = true;
+                ForceRemove();
             }
         }
     }