From 67bdd62e05e278e2954c00d36dea20d35eeebed5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 21 Apr 2023 20:18:58 +0800
Subject: [PATCH] 1

---
 server/gameserver/guide.cc   | 2 --
 server/gameserver/roommgr.cc | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/gameserver/guide.cc b/server/gameserver/guide.cc
index 3e5d242f..1ee30861 100644
--- a/server/gameserver/guide.cc
+++ b/server/gameserver/guide.cc
@@ -25,7 +25,6 @@ void Guide::Init(Human* owner)
     }
     curr_step_idx_ = 0;
     UpdateStep();
-    #if 0
     owner_->room->xtimer.SetTimeoutEx
         (
          #ifdef DEBUG
@@ -41,7 +40,6 @@ void Guide::Init(Human* owner)
              }
          },
          &owner_->xtimer_attacher);
-    #endif
 }
 
 void Guide::UpdateStep()
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 5e5b4abf..8205052f 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -866,7 +866,7 @@ void RoomMgr::SetMatchMode(int mode)
 
 void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
 {
-#if 0
+#if 1
 #ifdef DEBUG
 #ifdef NEWBIE_ROOM
     msg->set_force_enter_newbie_room(true);