From 35b34c4ac40ba67f615fddbb782f9b24dc5e6778 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 7 Dec 2020 22:32:45 +0100 Subject: Core/Objects: Fixed a wrong cherry-pick merge conflict resolution - properly update zone id --- src/server/game/Entities/Object/Object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') 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; } -- cgit v1.2.3