From 329937a74e2df5ca28c69684854e08f07bd172ed Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 5 Mar 2024 15:17:10 +0800
Subject: [PATCH] 1

---
 server/gameserver/room.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 06cd6de4..c958d0ea 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -847,12 +847,17 @@ void Room::RemoveObjectLater(RoomObstacle* entity)
 
 void Room::InternalRemoveObjectLater(Entity* entity, a8::Attacher& xtimer_attacher)
 {
+    int entity_uniid = entity->GetUniId();
     auto remove_func =
-        [this, entity] (int event, const a8::Args* args)
+        [this, entity_uniid] (int event, const a8::Args* args)
         {
             if (a8::TIMER_EXEC_EVENT != event) {
                 return;
             }
+            Entity* entity = GetEntityByUniId(entity_uniid);
+            if (!entity) {
+                return;
+            }
             switch (entity->GetEntityType()) {
             case ET_Bullet:
                 {