From 43b944bf92e9851bbebb6c2bb0169b9b2018cfcd Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 3 Mar 2018 22:00:41 +0100 Subject: Core/Maps: Fixed outdoors check (#21551) (cherry picked from commit 367db4e1d641b56d8d7df83320c14b283bd007ce) --- src/server/game/Maps/Map.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 161e2314e00..10a1eb2e6ce 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2816,7 +2816,6 @@ void Map::GetFullTerrainStatusForPosition(PhaseShift const& phaseShift, float x, { data.areaId = areaEntry->ID; data.floorZ = vmapData.floorZ; - data.outdoors = IsOutdoorWMO(vmapData.areaInfo->mogpFlags, wmoEntry, areaEntry); } else { @@ -2832,9 +2831,13 @@ void Map::GetFullTerrainStatusForPosition(PhaseShift const& phaseShift, float x, areaEntry = sAreaTableStore.LookupEntry(data.areaId); data.floorZ = mapHeight; - data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review } + if (vmapData.areaInfo) + data.outdoors = IsOutdoorWMO(vmapData.areaInfo->mogpFlags, wmoEntry, areaEntry); + else + data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review + // liquid processing data.liquidStatus = LIQUID_MAP_NO_WATER; if (vmapData.liquidInfo && vmapData.liquidInfo->level > vmapData.floorZ && z > vmapData.floorZ) -- cgit v1.2.3