1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00

Merge pull request #725 from Taezen/develop-map

fix for previous quest and quest lock check
This commit is contained in:
Adam 2021-09-11 23:54:10 +10:00 committed by GitHub
commit 7ccab5b7c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -437,31 +437,31 @@ bool Sapphire::World::Manager::MapMgr::isQuestVisible( Entity::Player& player, u
} }
else if( questPtr->previousQuestJoin == 2 ) else if( questPtr->previousQuestJoin == 2 )
{ {
for( int32_t i = 0; i < 3; i++ ) for( int32_t i = 0; i <= 3; i++ )
{ {
if( i == 3 )
return false;
if( questPtr->previousQuest[ i ] == 0 ) if( questPtr->previousQuest[ i ] == 0 )
continue; continue;
if( player.isQuestCompleted( questPtr->previousQuest[ i ] ) ) if( player.isQuestCompleted( questPtr->previousQuest[ i ] ) )
break; break;
if( i == 2 )
return false;
} }
} }
if( questPtr->questLockJoin == 1 ) if( questPtr->questLockJoin == 1 )
{ {
for( int32_t i = 0; i < 2; i++ ) for( int32_t i = 0; i <= 2; i++ )
{ {
if( i == 2 )
return false;
if( questPtr->questLock[ i ] == 0 ) if( questPtr->questLock[ i ] == 0 )
continue; continue;
if( !player.isQuestCompleted( questPtr->questLock[ i ] ) && !player.hasQuest( questPtr->questLock[ i ] ) ) if( !player.isQuestCompleted( questPtr->questLock[ i ] ) && !player.hasQuest( questPtr->questLock[ i ] ) )
break; break;
if( i == 1 )
return false;
} }
} }
else if( questPtr->questLockJoin == 2 ) else if( questPtr->questLockJoin == 2 )