diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp index 5083d6b8..6ec35837 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp +++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp @@ -132,7 +132,7 @@ bool Core::TerritoryMgr::createDefaultTerritories() InstanceIdToZonePtrMap instanceMap; instanceMap[guid] = pZone; m_instanceIdToZonePtrMap[guid] = pZone; - m_territoryInstanceMap[territoryId] = instanceMap; + m_territoryIdToInstanceGuidMap[territoryId] = instanceMap; m_zoneSet.insert( { pZone } ); } @@ -162,7 +162,7 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp pZone->init(); m_instanceIdToZonePtrMap[pZone->getGuId()] = pZone; - m_territoryInstanceMap[pZone->getTerritoryId()][pZone->getGuId()] = pZone; + m_territoryIdToInstanceGuidMap[pZone->getTerritoryId()][pZone->getGuId()] = pZone; m_zoneSet.insert( { pZone } ); return pZone; @@ -215,7 +215,7 @@ bool Core::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId ) m_instanceContentToInstanceMap[instance->getInstanceContentId()].erase( pZone->getGuId() ); } else - m_territoryInstanceMap[pZone->getTerritoryId()].erase( pZone->getGuId() ); + m_territoryIdToInstanceGuidMap[pZone->getTerritoryId()].erase( pZone->getGuId() ); return true; @@ -276,8 +276,8 @@ Core::ZonePositionPtr Core::TerritoryMgr::getTerritoryPosition( uint32_t territo Core::ZonePtr Core::TerritoryMgr::getZoneByTerriId( uint32_t territoryId ) const { - auto zoneMap = m_territoryInstanceMap.find( territoryId ); - if( zoneMap == m_territoryInstanceMap.end() ) + auto zoneMap = m_territoryIdToInstanceGuidMap.find( territoryId ); + if( zoneMap == m_territoryIdToInstanceGuidMap.end() ) return nullptr; // TODO: actually select the proper one diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h index c4602e5e..32d5532d 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h +++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h @@ -135,7 +135,7 @@ namespace Core TerritoryTypeDetailCache m_territoryTypeDetailCacheMap; /*! map holding actual instances of default territories */ - TerritoryIdToInstanceMap m_territoryInstanceMap; + TerritoryIdToInstanceMap m_territoryIdToInstanceGuidMap; /*! map holding actual instances of InstanceContent */ InstanceContentIdToInstanceMap m_instanceContentToInstanceMap;