1

2023-04-07 21:08:13 +08:00 · 2023-04-07 21:08:13 +08:00 · 170650a4ac
commit 170650a4ac
parent 47b863f60d
1 changed files with 7 additions and 4 deletions
--- 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)