diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 82dd929..6b755b0 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -40,7 +40,7 @@ GuildMember* Guild::GetMember(const std::string& account_id) bool Guild::IsFull() { - return member_hash_.size() < GUILD_MAX_MEMBER_NUM; + return member_hash_.size() >= GUILD_MAX_MEMBER_NUM; } void Guild::AddMember(GuildMember* member) diff --git a/server/imserver/guild.h b/server/imserver/guild.h index deacb48..602b839 100644 --- a/server/imserver/guild.h +++ b/server/imserver/guild.h @@ -15,7 +15,6 @@ public: void Init(); void UnInit(); - void Deserialize(const std::string& guild_data, const std::string& guild_log); void _CMGuildInfo(f8::MsgHdr& hdr, const cs::CMGuildInfo& msg); void _CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg); @@ -48,6 +47,7 @@ private: void FillApplyList(const std::string& account_id, cs::MFPaging& paging, cs::SMGuildApplyList& respmsg); void ClearApplyBySenderId(const std::string& sender_id); void ClearApplyByIdx(long long idx); + void Deserialize(const std::string& guild_data, const std::string& guild_log); private: bool dirty_ = false;