yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

v2

Browse Source 
Neatened some things up, removed obsolete code, added a break out of the loop if an empty guild name (none available) is returned from the playerbots_guild_names table.
This commit is contained in:
Iain Donnelly
2025-10-01 23:20:48 +01:00
parent 8a68de4476
commit 444be2994e
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/RandomPlayerbotFactory.cpp
View File

@@ -902,25 +902,14 @@ void RandomPlayerbotFactory::CreateRandomGuilds()
} while (guildTableResults->NextRow()); } while (guildTableResults->NextRow());
} }
// Get a list of bots that are logged in and available to lead new guilds
GuidVector availableLeaders; GuidVector availableLeaders;
for (std::vector<uint32>::iterator i = randomBots.begin(); i != randomBots.end(); ++i) for (std::vector<uint32>::iterator i = randomBots.begin(); i != randomBots.end(); ++i)
{ {
ObjectGuid leader = ObjectGuid::Create<HighGuid::Player>(*i); ObjectGuid leader = ObjectGuid::Create<HighGuid::Player>(*i);
if (Guild* guild = sGuildMgr->GetGuildByLeader(leader)) if (Guild* guild = sGuildMgr->GetGuildByLeader(leader))
{ {
uint32 guildID = guild->GetId(); // Bot is already a GM
if(std::find(sPlayerbotAIConfig->randomBotGuilds.begin(), sPlayerbotAIConfig->randomBotGuilds.end(), guildID) !=sPlayerbotAIConfig->randomBotGuilds.end())
{
// this randombot guild has already been counted, the leader is not availble
}
else
{
// somehow we missed this guild when checking the guild table
// THIS SHOULDN'T RUN.
// THIS ENTIRE FIND() IS A WASTE OF RESOURCES (in theory)
++guildNumber;
sPlayerbotAIConfig->randomBotGuilds.push_back(guildID);
}
} }
else else
{ {
@@ -929,6 +918,7 @@ void RandomPlayerbotFactory::CreateRandomGuilds()
availableLeaders.push_back(leader); availableLeaders.push_back(leader);
} }
} }
LOG_INFO("playerbots", "randomBotGuilds - {} available leaders for new guilds found", availableLeaders.size());
// Create up to randomBotGuildCount by counting only EFFECTIVE creations // Create up to randomBotGuildCount by counting only EFFECTIVE creations
uint32 createdThisRun = 0; uint32 createdThisRun = 0;
@@ -936,10 +926,10 @@ void RandomPlayerbotFactory::CreateRandomGuilds()
{ {
std::string const guildName = CreateRandomGuildName(); std::string const guildName = CreateRandomGuildName();
if (guildName.empty()) if (guildName.empty())
continue; break; // no more names available in playerbots_guild_names
if (sGuildMgr->GetGuildByName(guildName)) if (sGuildMgr->GetGuildByName(guildName))
continue; continue; // name already taken, skip
if (availableLeaders.empty()) if (availableLeaders.empty())
{ {