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

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

Browse Source
This commit is contained in:
Shauren
2012-07-04 22:20:21 +02:00
parent 138375c045 c3cb82b926
commit ed6f3e2def
360 changed files with 19813 additions and 7203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Guilds/Guild.cpp
View File

@@ -2093,7 +2093,7 @@ bool Guild::AddMember(uint64 guid, uint8 rankId)
if (player->GetGuildId() != 0)
return false;
}
else if (Player::GetGuildIdFromGuid(guid) != 0)
else if (Player::GetGuildIdFromDB(guid) != 0)
return false;
// Remove all player signs from another petitions