From 3f947392fe5f789a6545b38f8b7def30ba83267b Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Mon, 4 Oct 2021 10:44:32 -0300 Subject: [PATCH] fix(Core/Chat): properly log zone name when logging GM commands, as some areas don't have parent zone set (#8066) --- src/server/game/Chat/Chat.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index d5bb7685b..250c43826 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -321,12 +321,16 @@ bool ChatHandler::ExecuteCommandInTable(std::vector const& table, c uint32 zoneId = player->GetZoneId(); std::string areaName = "Unknown"; std::string zoneName = "Unknown"; + int locale = GetSessionDbcLocale(); + if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId)) { - int locale = GetSessionDbcLocale(); areaName = area->area_name[locale]; - if (AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->zone)) - zoneName = zone->area_name[locale]; + } + + if (AreaTableEntry const* zone = sAreaTableStore.LookupEntry(zoneId)) + { + zoneName = zone->area_name[locale]; } LOG_GM(m_session->GetAccountId(), "Command: %s [Player: %s (%s) (Account: %u) X: %f Y: %f Z: %f Map: %u (%s) Area: %u (%s) Zone: %u (%s) Selected: %s (%s)]",