mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 11:07:45 +00:00
Code Activity

Merge branch 'develop' of https://github.com/SapphireServer/Sapphire into develop

Browse source
This commit is contained in:
Skyliegirl33 2021-09-15 22:27:34 +02:00
commit 1ef0585bba
2 changed files with 126 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/world/Manager/TerritoryMgr.cpp
View file

@ -302,7 +302,28 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createQuestBattle
if( !pQuestBattleInfo ) if( !pQuestBattleInfo )
return nullptr; return nullptr;
auto pQuestInfo = exdData.get< Sapphire::Data::Quest >( pQuestBattleInfo->quest ); auto eventId = pQuestBattleInfo->quest;
auto eventType = static_cast< Event::EventHandler::EventHandlerType >( eventId >> 16 );
switch( eventType )
{
case Event::EventHandler::EventHandlerType::Array:
{
auto eventArray = exdData.get< Sapphire::Data::ArrayEventHandler >( eventId );
if( eventArray )
{
for( int i = 0; i < eventArray->data.size(); i++ )
{
auto nextId = eventArray->data[ i ];
if( nextId == 0 )
break;
eventId = nextId;
}
}
break;
}
}
auto pQuestInfo = exdData.get< Sapphire::Data::Quest >( eventId );
if( !pQuestInfo ) if( !pQuestInfo )
return nullptr; return nullptr;