diff options
| author | xinef1 <w.szyszko2@gmail.com> | 2017-02-05 23:14:19 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-07-21 21:06:54 +0200 |
| commit | ad4e63bae145ae49b584ab2fc621660430cec0d3 (patch) | |
| tree | 403c1e9348047f49b80fa719567259c388629318 /src/server/game/Groups | |
| parent | 241e79f434bdd520fb11dbc12b93ab41a7b39dd2 (diff) | |
Core/Misc: Moved CharacterInfo out of world to separate class
Closes #19030
(cherrypicked from 59ce3d6c9bd82d55cbfa505bb945b71cab21a12f)
Diffstat (limited to 'src/server/game/Groups')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 8fa7be7dda9..dfd6af051ec 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -19,6 +19,7 @@ #include "Group.h" #include "Battleground.h" #include "BattlegroundMgr.h" +#include "CharacterCache.h" #include "Common.h" #include "DatabaseEnv.h" #include "DB2Stores.h" @@ -186,7 +187,7 @@ void Group::LoadGroupFromDB(Field* fields) m_leaderGuid = ObjectGuid::Create<HighGuid::Player>(fields[0].GetUInt64()); // group leader not exist - if (!ObjectMgr::GetPlayerNameByGUID(m_leaderGuid, m_leaderName)) + if (!sCharacterCache->GetCharacterNameByGuid(m_leaderGuid, m_leaderName)) return; m_lootMethod = LootMethod(fields[1].GetUInt8()); @@ -216,7 +217,7 @@ void Group::LoadMemberFromDB(ObjectGuid::LowType guidLow, uint8 memberFlags, uin member.guid = ObjectGuid::Create<HighGuid::Player>(guidLow); // skip non-existed member - if (!ObjectMgr::GetPlayerNameAndClassByGUID(member.guid, member.name, member._class)) + if (!sCharacterCache->GetCharacterNameAndClassByGUID(member.guid, member.name, member._class)) { PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GROUP_MEMBER); stmt->setUInt64(0, guidLow); |