From 0ce96adb7a8ae29a577cce268c8bd3742253cf69 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 6 Oct 2023 20:22:14 +0200 Subject: Core/Objects: Treat areas that have ParentAreaID filled but dont have IsSubzone flag as zones instead of areas --- src/server/game/Maps/TerrainMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Maps') diff --git a/src/server/game/Maps/TerrainMgr.cpp b/src/server/game/Maps/TerrainMgr.cpp index 10151fa4127..4e9a0c65e92 100644 --- a/src/server/game/Maps/TerrainMgr.cpp +++ b/src/server/game/Maps/TerrainMgr.cpp @@ -646,7 +646,7 @@ uint32 TerrainInfo::GetZoneId(PhaseShift const& phaseShift, uint32 mapId, float { uint32 areaId = GetAreaId(phaseShift, mapId, x, y, z, dynamicMapTree); if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId)) - if (area->ParentAreaID) + if (area->ParentAreaID && area->GetFlags().HasFlag(AreaFlags::IsSubzone)) return area->ParentAreaID; return areaId; @@ -656,7 +656,7 @@ void TerrainInfo::GetZoneAndAreaId(PhaseShift const& phaseShift, uint32 mapId, u { areaid = zoneid = GetAreaId(phaseShift, mapId, x, y, z, dynamicMapTree); if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaid)) - if (area->ParentAreaID) + if (area->ParentAreaID && area->GetFlags().HasFlag(AreaFlags::IsSubzone)) zoneid = area->ParentAreaID; } -- cgit v1.2.3