From 1733c94aec12eb7a52cb4c24c0c3828babb03c9d Mon Sep 17 00:00:00 2001
From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com>
Date: Thu, 5 Jun 2025 14:51:19 -0400
Subject: [PATCH] refactor(Core): Make use of standard config usage for guild
 member limit option. (#22259)

---
 src/server/game/Guilds/Guild.cpp | 2 +-
 src/server/game/World/IWorld.h   | 1 +
 src/server/game/World/World.cpp  | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index f4440c5b5..a39c14b6b 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -1444,7 +1444,7 @@ void Guild::HandleInviteMember(WorldSession* session, std::string const& name)
     if (pInvitee->GetSocial()->HasIgnore(player->GetGUID()))
         return;
 
-    uint32 memberLimit = sConfigMgr->GetOption<uint32>("Guild.MemberLimit", 0);
+    uint32 memberLimit = sWorld->getIntConfig(CONFIG_GUILD_MEMBER_LIMIT);
     if (memberLimit > 0 && player->GetGuild()->GetMemberCount() >= memberLimit)
     {
         ChatHandler(player->GetSession()).PSendSysMessage("Your guild has reached the maximum amount of members ({}). You cannot send another invite until the guild member count is lower.", memberLimit);
diff --git a/src/server/game/World/IWorld.h b/src/server/game/World/IWorld.h
index 018626bfa..08f892eab 100644
--- a/src/server/game/World/IWorld.h
+++ b/src/server/game/World/IWorld.h
@@ -411,6 +411,7 @@ enum WorldIntConfigs
     CONFIG_GUILD_BANK_TAB_COST_3,
     CONFIG_GUILD_BANK_TAB_COST_4,
     CONFIG_GUILD_BANK_TAB_COST_5,
+    CONFIG_GUILD_MEMBER_LIMIT,
     CONFIG_GM_LEVEL_CHANNEL_MODERATION,
     CONFIG_TOGGLE_XP_COST,
     CONFIG_NPC_EVADE_IF_NOT_REACHABLE,
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 2069ca9a6..00ffbf428 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -844,6 +844,8 @@ void World::LoadConfigSettings(bool reload)
     _int_configs[CONFIG_GUILD_BANK_TAB_COST_4] = sConfigMgr->GetOption<int32>("Guild.BankTabCost4", 25000000);
     _int_configs[CONFIG_GUILD_BANK_TAB_COST_5] = sConfigMgr->GetOption<int32>("Guild.BankTabCost5", 50000000);
 
+    _int_configs[CONFIG_GUILD_MEMBER_LIMIT] = sConfigMgr->GetOption<uint32>("Guild.MemberLimit", 0);
+
     _bool_configs[CONFIG_DETECT_POS_COLLISION] = sConfigMgr->GetOption<bool>("DetectPosCollision", true);
 
     _bool_configs[CONFIG_RESTRICTED_LFG_CHANNEL]      = sConfigMgr->GetOption<bool>("Channel.RestrictedLfg", true);