From 0b7468ead57e2268c8b1867825c8a599955fa1b9 Mon Sep 17 00:00:00 2001 From: Mordred Date: Mon, 29 Jan 2018 19:35:57 +0100 Subject: [PATCH] Use InstanceContent name instead of placeName for InstanceContent --- src/servers/sapphire_zone/Zone/TerritoryMgr.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp index 015c9122..cb5c3209 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp +++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp @@ -167,14 +167,15 @@ Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t instanceConten return nullptr; auto pTeri = getTerritoryDetail( pInstanceContent->territoryType ); - auto pPlaceName = g_exdDataGen.getPlaceName( pTeri->placeName ); - if( !pTeri || !pPlaceName ) + if( !pTeri || pInstanceContent->name.empty() ) return nullptr; - g_log.debug( "Starting instance for InstanceContent id: " + std::to_string( instanceContentId ) + " (" + pPlaceName->name + ")" ); + g_log.debug( "Starting instance for InstanceContent id: " + std::to_string( instanceContentId ) + + " (" + pInstanceContent->name + ")" ); - ZonePtr pZone = ZonePtr( new InstanceContent( pInstanceContent, getNextInstanceId(), pTeri->name, pPlaceName->name, instanceContentId ) ); + ZonePtr pZone = ZonePtr( new InstanceContent( pInstanceContent, getNextInstanceId(), pTeri->name, + pInstanceContent->name, instanceContentId ) ); pZone->init(); m_instanceContentToInstanceMap[instanceContentId][pZone->getGuId()] = pZone;