Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Objects: Fixed a wrong cherry-pick merge conflict resolution - properly update zone id

Browse Source
This commit is contained in:
Shauren
2020-12-07 22:32:45 +01:00
parent dc2eeee75b
commit 35b34c4ac4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Object/Object.cpp
View File

@@ -936,8 +936,8 @@ void WorldObject::ProcessPositionDataChanged(PositionFullTerrainStatus const& da
{
m_zoneId = m_areaId = data.areaId;
if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(m_areaId))
if (area->ID)
m_zoneId = area->ID;
if (area->ParentAreaID)
m_zoneId = area->ParentAreaID;
m_staticFloorZ = data.floorZ;
}