From db04f1377707094f3d1ffc8df4729f703ebf3abb Mon Sep 17 00:00:00 2001 From: azazel Date: Tue, 19 Oct 2010 18:50:50 +0600 Subject: Core/Guilds: fixed small logical error when counting total loaded guilds --HG-- branch : trunk --- src/server/game/Globals/ObjectMgr.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f4396f68777..2fd33549cdd 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -3739,13 +3739,16 @@ void ObjectMgr::LoadGuilds() { barGuilds.step(); Guild* pGuild = *itr; - if (pGuild && !pGuild->Validate()) + if (pGuild) { - RemoveGuild(pGuild->GetId()); - delete pGuild; + if (!pGuild->Validate()) + { + RemoveGuild(pGuild->GetId()); + delete pGuild; + } + else + ++totalGuilds; } - else - ++totalGuilds; } // Cleanup // Delete orphan guild ranks -- cgit v1.2.3