From fd5910e4b62e0660811105b4904af543e9fe73c8 Mon Sep 17 00:00:00 2001
From: Keleborn <22352763+Celandriel@users.noreply.github.com>
Date: Thu, 9 Apr 2026 14:56:44 -0700
Subject: [PATCH] Guild fixes

---
 src/Bot/Factory/PlayerbotFactory.h  |  2 +-
 src/Bot/RandomPlayerbotMgr.cpp      |  7 +++++++
 src/Mgr/Guild/PlayerbotGuildMgr.cpp | 11 ++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Bot/Factory/PlayerbotFactory.h b/src/Bot/Factory/PlayerbotFactory.h
index d943463ea..d8531b73b 100644
--- a/src/Bot/Factory/PlayerbotFactory.h
+++ b/src/Bot/Factory/PlayerbotFactory.h
@@ -85,6 +85,7 @@ public:
     void InitKeyring();
     void InitReputation();
     void InitAttunementQuests();
+    void InitGuild();
 
 private:
     void Prepare();
@@ -117,7 +118,6 @@ private:
     void InitInventoryEquip();
     void InitInventorySkill();
     Item* StoreItem(uint32 itemId, uint32 count);
-    void InitGuild();
     void InitArenaTeam();
     void InitImmersive();
     static void AddPrevQuests(uint32 questId, std::list<uint32>& questIds);
diff --git a/src/Bot/RandomPlayerbotMgr.cpp b/src/Bot/RandomPlayerbotMgr.cpp
index a772136e7..b3a2fa6f5 100644
--- a/src/Bot/RandomPlayerbotMgr.cpp
+++ b/src/Bot/RandomPlayerbotMgr.cpp
@@ -2532,6 +2532,13 @@ void RandomPlayerbotMgr::OnBotLoginInternal(Player* const bot)
         }
     }
 
+    // Run guild recovery/assignment at login to handle empty guild tables after restart.
+    if (sPlayerbotAIConfig.randomBotGuildCount > 0)
+    {
+        PlayerbotFactory factory(bot, bot->GetLevel());
+        factory.InitGuild();
+    }
+
     if (sPlayerbotAIConfig.randomBotFixedLevel)
     {
         bot->SetPlayerFlag(PLAYER_FLAGS_NO_XP_GAIN);
diff --git a/src/Mgr/Guild/PlayerbotGuildMgr.cpp b/src/Mgr/Guild/PlayerbotGuildMgr.cpp
index 001a438cb..5dc1095de 100644
--- a/src/Mgr/Guild/PlayerbotGuildMgr.cpp
+++ b/src/Mgr/Guild/PlayerbotGuildMgr.cpp
@@ -150,13 +150,10 @@ void PlayerbotGuildMgr::OnGuildUpdate(Guild* guild)
 
 void PlayerbotGuildMgr::ResetGuildCache()
 {
-    for (auto it = _guildCache.begin(); it != _guildCache.end();)
-    {
-        GuildCache& cached = it->second;
-        cached.memberCount = 0;
-        cached.faction = 2;
-        cached.status = 0;
-    }
+    _guildCache.clear();
+
+    for (auto& nameEntry : _guildNames)
+        nameEntry.second = true;
 }
 
 void PlayerbotGuildMgr::LoadGuildNames()