diff options
| author | xinef1 <w.szyszko2@gmail.com> | 2017-02-05 23:14:19 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-02-05 23:14:19 +0100 |
| commit | 59ce3d6c9bd82d55cbfa505bb945b71cab21a12f (patch) | |
| tree | 11e0f0f2ae3f3baffff0586f785ebbc7b7efd8aa /src/server/game/Guilds/Guild.cpp | |
| parent | 3c605ba614c45c4b8f99c12fb49f342c068054a5 (diff) | |
Core/Misc: Moved CharacterInfo out of world to separate class
Closes #19030
Diffstat (limited to 'src/server/game/Guilds/Guild.cpp')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 9a27c800a2b..488601d9536 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -18,6 +18,7 @@ #include "AccountMgr.h" #include "CalendarMgr.h" +#include "CharacterCache.h" #include "Chat.h" #include "Config.h" #include "DatabaseEnv.h" @@ -1568,7 +1569,7 @@ void Guild::HandleAcceptMember(WorldSession* session) { Player* player = session->GetPlayer(); if (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && - player->GetTeam() != sObjectMgr->GetPlayerTeamByGUID(GetLeaderGUID())) + player->GetTeam() != sCharacterCache->GetCharacterTeamByGuid(GetLeaderGUID())) return; SQLTransaction trans(nullptr); @@ -1988,7 +1989,7 @@ bool Guild::LoadMemberFromDB(Field* fields) return false; } - sWorld->UpdateCharacterGuildId(playerGuid, GetId()); + sCharacterCache->UpdateCharacterGuildId(playerGuid, GetId()); m_members[lowguid] = member; return true; } @@ -2200,7 +2201,7 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max } Member* member = itr->second; - uint32 level = Player::GetLevelFromCharacterInfo(member->GetGUID()); + uint32 level = sCharacterCache->GetCharacterLevelByGuid(member->GetGUID()); if (member->GetGUID() != session->GetPlayer()->GetGUID() && level >= minLevel && level <= maxLevel && member->IsRankNotLower(minRank)) { @@ -2225,7 +2226,7 @@ bool Guild::AddMember(SQLTransaction& trans, ObjectGuid guid, uint8 rankId) if (player->GetGuildId() != 0) return false; } - else if (Player::GetGuildIdFromCharacterInfo(guid) != 0) + else if (sCharacterCache->GetCharacterGuildIdByGuid(guid) != 0) return false; // Remove all player signs from another petitions @@ -2277,7 +2278,7 @@ bool Guild::AddMember(SQLTransaction& trans, ObjectGuid guid, uint8 rankId) return false; } m_members[lowguid] = member; - sWorld->UpdateCharacterGuildId(guid, GetId()); + sCharacterCache->UpdateCharacterGuildId(guid, GetId()); } member->SaveToDB(trans); @@ -2346,7 +2347,7 @@ void Guild::DeleteMember(SQLTransaction& trans, ObjectGuid guid, bool isDisbandi player->SetRank(0); } else - sWorld->UpdateCharacterGuildId(guid, 0); + sCharacterCache->UpdateCharacterGuildId(guid, 0); _DeleteMemberFromDB(trans, lowguid); if (!isDisbanding) |