From f5b8fc80713ea18b2df2eca0f504c3277bfc333a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 10 May 2023 15:43:58 +0800
Subject: [PATCH] 1

---
 server/gameserver/commands.cc     |  3 +++
 server/gameserver/roomobstacle.cc | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/gameserver/commands.cc b/server/gameserver/commands.cc
index 334fbe5c..75ef0507 100644
--- a/server/gameserver/commands.cc
+++ b/server/gameserver/commands.cc
@@ -293,4 +293,7 @@ void Player::_CMExecCommand(f8::MsgHdr& hdr, const cs::CMExecCommand& msg)
             skill->Accelerate(-10000000);
         }
     }
+#ifdef DEBUG
+    a8::XPrintf("exec_cmd:%s\n", {cmd});
+#endif
 }
diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc
index 43665f53..313ebbd4 100644
--- a/server/gameserver/roomobstacle.cc
+++ b/server/gameserver/roomobstacle.cc
@@ -392,16 +392,16 @@ void RoomObstacle::DetachFromMaster()
 {
     if (!detached_) {
         detached_ = true;
+        xtimer_attacher.ClearTimerList();
         if (master.Get()) {
-            xtimer_attacher.ClearTimerList();
             master.Get()->SlaveOnRemove(this);
-            room->grid_service->DelRoomEntity(room, this);
-            if (!IsDead(room)) {
-                Die(room);
-                BroadcastFullState(room);
-            }
-            room->RemoveObjectLater(this);
         }
+        room->grid_service->DelRoomEntity(room, this);
+        if (!IsDead(room)) {
+            Die(room);
+            BroadcastFullState(room);
+        }
+        room->RemoveObjectLater(this);
     }
     if (!list_empty(&entry)) {
         list_del_init(&entry);