Core/Maps: Fixed outdoors check
Port From (https://github.com/TrinityCore/TrinityCore/commit/43b944bf92e9851bbebb6c2bb0169b9b2018cfcd)
This commit is contained in:
@@ -2085,7 +2085,6 @@ namespace Game.Maps
|
|||||||
{
|
{
|
||||||
data.AreaId = areaEntry.Id;
|
data.AreaId = areaEntry.Id;
|
||||||
data.FloorZ = vmapData.floorZ;
|
data.FloorZ = vmapData.floorZ;
|
||||||
data.outdoors = IsOutdoorWMO(vmapData.areaInfo.Value.MogpFlags, wmoEntry, areaEntry);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2101,9 +2100,13 @@ namespace Game.Maps
|
|||||||
areaEntry = CliDB.AreaTableStorage.LookupByKey(data.AreaId);
|
areaEntry = CliDB.AreaTableStorage.LookupByKey(data.AreaId);
|
||||||
|
|
||||||
data.FloorZ = mapHeight;
|
data.FloorZ = mapHeight;
|
||||||
data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (vmapData.areaInfo.HasValue)
|
||||||
|
data.outdoors = IsOutdoorWMO(vmapData.areaInfo.Value.MogpFlags, wmoEntry, areaEntry);
|
||||||
|
else
|
||||||
|
data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review
|
||||||
|
|
||||||
// liquid processing
|
// liquid processing
|
||||||
data.LiquidStatus = ZLiquidStatus.NoWater;
|
data.LiquidStatus = ZLiquidStatus.NoWater;
|
||||||
if (vmapData.liquidInfo.HasValue && vmapData.liquidInfo.Value.Level > vmapData.floorZ && z > vmapData.floorZ)
|
if (vmapData.liquidInfo.HasValue && vmapData.liquidInfo.Value.Level > vmapData.floorZ && z > vmapData.floorZ)
|
||||||
|
|||||||
Reference in New Issue
Block a user