diff options
| author | Lopfest <lopfest@gmail.com> | 2016-02-20 23:59:56 +0100 |
|---|---|---|
| committer | Lopfest <lopfest@gmail.com> | 2016-02-20 23:59:56 +0100 |
| commit | facdc62b433787326673a4db05aab76d75e1283f (patch) | |
| tree | f76f4e3467e3fe909da8b4e5bc5962712642e493 /src/server/game/Chat/Chat.cpp | |
| parent | d11eb335c996b398f4f8bdb10558dfba9af637f4 (diff) | |
| parent | 716c952cb9f7bc0f75308bb4a716cdfe7de17281 (diff) | |
Merge remote-tracking branch 'upstream/6.x' into HEAD
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 89d871137f2..07e77a4e6a3 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -297,10 +297,10 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c uint32 areaId = player->GetAreaId(); std::string areaName = "Unknown"; std::string zoneName = "Unknown"; - if (AreaTableEntry const* area = GetAreaEntryByAreaID(areaId)) + if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId)) { areaName = area->AreaName_lang; - if (AreaTableEntry const* zone = GetAreaEntryByAreaID(area->ParentAreaID)) + if (AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID)) zoneName = zone->AreaName_lang; } |