diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-12-07 22:32:45 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-12-08 18:16:48 +0100 |
| commit | 35b34c4ac40ba67f615fddbb782f9b24dc5e6778 (patch) | |
| tree | a4a9f439d0f77aeab1fcf41c4348e1933fb4b586 /src | |
| parent | dc2eeee75bd595f6f15c10d5fd2d1e2a5fb1d23d (diff) | |
Core/Objects: Fixed a wrong cherry-pick merge conflict resolution - properly update zone id
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 0661811d60d..477a0fa984b 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -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; } |