Fix: issue that would trigger multiple quests

littlecubiclegames · Apr 24, 2019 · dc5895b · dc5895b
1 parent f6a9e36
commit dc5895b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Guard/TriggerValidator.php b/src/Guard/TriggerValidator.php
@@ -39,7 +39,7 @@ public function canTrigger(Quest $questData, Slot $slot, int $user): bool
                 throw new \InvalidArgumentException('Invalid trigger handler provided. Can only use instances of: ' . InitProgressHandlerFunctionInterface::class);
             }
 
-            $this->questProgressHandler->initProgress($quest, $taskId, $handlerFunction);
+            $this->questProgressHandler->fetchInitialProgress($quest, $taskId, $handlerFunction);
         }
 
         return $questData->getTrigger()->isFinished($quest->getProgressMap());

diff --git a/src/Progress/ProgressHandler.php b/src/Progress/ProgressHandler.php
@@ -35,11 +35,16 @@ public function handle(QuestInterface $quest, int $taskId, callable $handler, Ev
         $this->questStorage->save($quest);
     }
 
-    public function initProgress(QuestInterface $quest, int $taskId, InitProgressHandlerFunctionInterface $handler): void
+    public function fetchInitialProgress(QuestInterface $quest, int $taskId, InitProgressHandlerFunctionInterface $handler): void
     {
         $task = $quest->getTask($taskId);
         $progress = $handler->initProgress($quest, $task);
         $task->updateProgress($progress);
+    }
+
+    public function initProgress(QuestInterface $quest, int $taskId, InitProgressHandlerFunctionInterface $handler): void
+    {
+        $this->fetchInitialProgress($quest, $taskId, $handler);
 
         if ($this->worfkflow->can($quest, QuestDefinitionInterface::TRANSITION_COMPLETE)) {
             $this->worfkflow->apply($quest, QuestDefinitionInterface::TRANSITION_COMPLETE);