coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

correcty check permissions for a Quest if one of the previous Quests has as following Quest the Quest itself (Issue #229)

Browse source
This commit is contained in:
coderkun 2014-05-12 16:17:26 +02:00
commit ee6f25dbdb
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
controllers/QuestsController.inc
View file

@ -165,12 +165,13 @@
{ {
// Previous Quests // Previous Quests
// One previous Quest has to be solved and no other // One previous Quest has to be solved and no other
// following Quests of ones has to be tried // following Quest of ones has to be tried
// except it is also an previous Quest of the current Quest
$solved = false; $solved = false;
$tried = false; $tried = false;
foreach($previousQuests as &$previousQuest) foreach($previousQuests as &$previousQuest)
{ {
// // Check previous Quest // Check previous Quest
if($this->Quests->hasCharacterSolvedQuest($previousQuest['id'], $character['id'])) if($this->Quests->hasCharacterSolvedQuest($previousQuest['id'], $character['id']))
{ {
$solved = true; $solved = true;
@ -182,8 +183,12 @@
// Check following Quest // Check following Quest
if($followingQuest['id'] != $quest['id'] && $this->Quests->hasCharacterTriedQuest($followingQuest['id'], $character['id'])) if($followingQuest['id'] != $quest['id'] && $this->Quests->hasCharacterTriedQuest($followingQuest['id'], $character['id']))
{ {
$tried = true; $followingFollowingQuests = $this->Quests->getNextQuests($followingQuest['id']);
break; if(!in_array($quest['id'], array_map(function($q) { return $q['id']; }, $followingFollowingQuests)))
{
$tried = true;
break;
}
} }
} }