diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 6d56a615..0593842f 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1498,11 +1498,23 @@ void Room::UpdateGasInactiveMoba()
             gas_data_.rad_new = gas_data_.new_area_meta->rad();
             gas_data_.gas_progress = 0;
         }
+        TraverseHumanList
+            (
+             [] (Human* hum) -> bool
+             {
+                 hum->RemoveBuffByEffectId(kBET_ThroughWall);
+                 hum->OnLand();
+                 if (hum->GetEntitySubType() == EST_Player) {
+                     GameLog::Instance()->GameStart((Player*)hum);
+                 }
+                 return true;
+             });
         NotifyUiUpdate();
         ClearPostBattleAutoFreeList();
         OnBattleStart();
         NotifyGameStart();
         InitAndroidAI();
+        sand_table_->OnGameStart();
     }
 }
 
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 0e2f0b0e..be2b7355 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -829,7 +829,9 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
     msg->set_pve_instance_id(0);
 #ifdef DEBUG
     if (!f8::IsTestEnv()) {
-        msg->set_room_mode(kMobaMode);
+        if (App::Instance()->instance_id == 6) {
+            msg->set_room_mode(kMobaMode);
+        }
         return;
     }
 #endif