Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Maps: Fixed outdoors check (#21551)

Browse Source 
(cherry picked from commit 367db4e1d6)
This commit is contained in:
Jeremy
2018-03-03 22:00:41 +01:00
committed by Shauren
parent 82ee232729
commit 43b944bf92
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Maps/Map.cpp
View File

@@ -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)