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/Chat/Chat.cpp | |
| parent | 241e79f434bdd520fb11dbc12b93ab41a7b39dd2 (diff) | |
Core/Misc: Moved CharacterInfo out of world to separate class
Closes #19030
(cherrypicked from 59ce3d6c9bd82d55cbfa505bb945b71cab21a12f)
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 2e2336f63da..c090b1c1225 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -19,6 +19,7 @@ #include "Chat.h" #include "AccountMgr.h" #include "CellImpl.h" +#include "CharacterCache.h" #include "ChatLink.h" #include "ChatPackets.h" #include "Common.h" @@ -107,7 +108,7 @@ bool ChatHandler::HasLowerSecurity(Player* target, ObjectGuid guid, bool strong) if (target) target_session = target->GetSession(); else if (!guid.IsEmpty()) - target_account = ObjectMgr::GetPlayerAccountIdByGUID(guid); + target_account = sCharacterCache->GetCharacterAccountIdByGuid(guid); if (!target_session && !target_account) { @@ -937,7 +938,7 @@ ObjectGuid::LowType ChatHandler::extractLowGuidFromLink(char* text, HighGuid& gu if (Player* player = ObjectAccessor::FindPlayerByName(name)) return player->GetGUID().GetCounter(); - ObjectGuid guid = sWorld->GetCharacterGuidByName(name); + ObjectGuid guid = sCharacterCache->GetCharacterGuidByName(name); if (guid.IsEmpty()) return 0; @@ -994,7 +995,7 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, ObjectGuid* p *player = pl; // if need guid value from DB (in name case for check player existence) - ObjectGuid guid = !pl && (player_guid || player_name) ? sWorld->GetCharacterGuidByName(name) : ObjectGuid::Empty; + ObjectGuid guid = !pl && (player_guid || player_name) ? sCharacterCache->GetCharacterGuidByName(name) : ObjectGuid::Empty; // if allowed player guid (if no then only online players allowed) if (player_guid) @@ -1153,7 +1154,7 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player*& player player = ObjectAccessor::FindPlayerByName(name); if (offline) - guid = sWorld->GetCharacterGuidByName(name); + guid = sCharacterCache->GetCharacterGuidByName(name); } } |