Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-10 03:59:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Guild: Fix Guild validation crash on start up

Browse Source 
Partially revert 58ec4e5319 and increment GuildStore iterator before validating Guilds. This is required because Guild::Validate() removes the Guild from GuildStore if invalid.
Closes #8363
This commit is contained in:
jackpoz
2013-09-05 21:10:10 +02:00
parent d5d0802262
commit b056bc976c
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/Guilds/GuildMgr.cpp
View File

@@ -378,20 +378,13 @@ void GuildMgr::LoadGuilds()
TC_LOG_INFO(LOG_FILTER_GUILD, "Validating data of loaded guilds...");
{
uint32 oldMSTime = getMSTime();
std::set<Guild*> rm; // temporary storage to avoid modifying GuildStore with RemoveGuild() while iterating
for (GuildContainer::iterator itr = GuildStore.begin(); itr != GuildStore.end(); ++itr)
for (GuildContainer::iterator itr = GuildStore.begin(); itr != GuildStore.end();)
{
Guild* guild = itr->second;
++itr;
if (guild && !guild->Validate())
rm.insert(guild);
}
for (std::set<Guild*>::iterator itr = rm.begin(); itr != rm.end(); ++itr)
{
Guild* guild = *itr;
RemoveGuild(guild->GetId());
delete guild;
delete guild;
}
TC_LOG_INFO(LOG_FILTER_SERVER_LOADING, ">> Validated data of loaded guilds in %u ms", GetMSTimeDiffToNow(oldMSTime));