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

update proper event type check

Browse source
This commit is contained in:
collett 2021-09-15 16:55:45 +09:00
parent 0fe75c373e
commit 1fa5aadf1c
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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