From 170650a4ac01335f5d7d4400ca7f028e9bf0c16e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 7 Apr 2023 21:08:13 +0800
Subject: [PATCH] 1

---
 server/gameserver/room.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 3f74e9e8..a98ffdd5 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -798,10 +798,13 @@ void Room::InternalRemoveObjectLater(Entity* entity, a8::Attacher& xtimer_attach
 #endif
             delete entity;
         };
-    xtimer.SetTimeoutEx
-        (NEXT_FRAME_TIMER,
-         remove_func,
-         &xtimer_attacher);
+    if (!entity->removing) {
+        entity->removing = true;
+        xtimer.SetTimeoutEx
+            (NEXT_FRAME_TIMER,
+             remove_func,
+             &xtimer_attacher);
+    }
 }
 
 void Room::OnHumanDie(Human* hum)