From 0c5868cc4e0cc2fab385a02c24b1ff281f53e676 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 17 May 2023 13:41:51 +0800
Subject: [PATCH] 1

---
 server/gameserver/pbutils.cc |  4 +---
 server/gameserver/room.cc    | 12 ++++++++++++
 server/gameserver/room.h     |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index fc06e7a8..d2e731fd 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -2068,9 +2068,7 @@ void SandTable::FillMFSandTable(cs::SMUpdate* msg, Human* hum, FrameData* framed
     if (hum->send_msg_times <= 0) {
         return;
     }
-    if (room_->IsPveRoom() ||
-        room_->IsNewBieRoom() ||
-        !room_->SupportSandTable()) {
+    if (!room_->IsSandTableRoom()) {
         return;
     }
 
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index acf2ab39..0d5d4226 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3789,3 +3789,15 @@ bool Room::SupportSandTable()
 {
     return PBUtils::SupportSandTable(creator_proto_version_);
 }
+
+void Room::OnAddHuman(Human* hum)
+{
+
+}
+
+bool Room::IsSandTableRoom()
+{
+    return !IsPveRoom() &&
+        !IsNewBieRoom() &&
+        SupportSandTable();
+}
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index ed9ac1d0..f5283d91 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -241,6 +241,7 @@ public:
     void ForceOver();
     bool SupportSandTable();
     std::shared_ptr<SandTable> GetSandTable() { return sand_table_; }
+    bool IsSandTableRoom();
 
 private:
     void ShuaAndroid();
@@ -317,6 +318,7 @@ private:
     void InternalRemoveObjectLater(Entity* entity, a8::Attacher& entity_xtimer_attacher);
     void OnBattleStart();
     void ClearPostBattleAutoFreeList();
+    void OnAddHuman(Human* hum);
 
     #ifdef DEBUG
     void InitDebugInfo();