aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy <Golrag@users.noreply.github.com>2018-03-03 22:00:41 +0100
committerShauren <shauren.trinity@gmail.com>2018-03-03 22:00:41 +0100
commit367db4e1d641b56d8d7df83320c14b283bd007ce (patch)
treeb37a8463a7e81c3d6ab788cd95227b0cc03a9464 /src
parentbca2a3661625bd1f993aade8947ff4f920052737 (diff)
Core/Maps: Fixed outdoors check (#21551)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Maps/Map.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 794d374e67b..589dce1ed32 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2696,7 +2696,6 @@ void Map::GetFullTerrainStatusForPosition(float x, float y, float z, PositionFul
{
data.areaId = areaEntry->ID;
data.floorZ = vmapData.floorZ;
- data.outdoors = IsOutdoorWMO(vmapData.areaInfo->mogpFlags, wmoEntry, areaEntry);
}
else
{
@@ -2710,9 +2709,13 @@ void Map::GetFullTerrainStatusForPosition(float x, float y, float z, PositionFul
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)