Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
This commit is contained in:
Vincent-Michael committed 2013-07-15 18:04:04 +02:00
2 parents 7104e3c70f 779a59e7e2
commit 56bd42dcf1
29 files changed
+525 -492
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Guilds/Guild.cpp
+1 -1
View File
@@ -2539,7 +2539,7 @@ bool Guild::Validate()
_SetLeaderGUID(pLeader);
// Check config if multiple guildmasters are allowed
if (!ConfigMgr::GetBoolDefault("Guild.AllowMultipleGuildMaster", 0))
if (!sConfigMgr->GetBoolDefault("Guild.AllowMultipleGuildMaster", 0))
for (Members::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
if (itr->second->GetRankId() == GR_GUILDMASTER && !itr->second->IsSamePlayer(m_leaderGuid))
itr->second->ChangeRank(GR_OFFICER);