mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-04 01:37:47 +00:00
Code Activity

Use InstanceContent name instead of placeName for InstanceContent

Browse source
This commit is contained in:
Mordred 2018-01-29 19:35:57 +01:00
parent 530c9f996f
commit 88f8eb2cb5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
View file

@ -167,14 +167,15 @@ Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t instanceConten
return nullptr; return nullptr;
auto pTeri = getTerritoryDetail( pInstanceContent->territoryType ); auto pTeri = getTerritoryDetail( pInstanceContent->territoryType );
auto pPlaceName = g_exdDataGen.getPlaceName( pTeri->placeName );
if( !pTeri || !pPlaceName ) if( !pTeri || pInstanceContent->name.empty() )
return nullptr; 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(); pZone->init();
m_instanceContentToInstanceMap[instanceContentId][pZone->getGuId()] = pZone; m_instanceContentToInstanceMap[instanceContentId][pZone->getGuId()] = pZone;