From 7a7298e91cf53af8697a699bb4d015102d38e3ae Mon Sep 17 00:00:00 2001
From: LMBishop <13875753+LMBishop@users.noreply.github.com>
Date: Fri, 7 Jul 2023 02:14:24 +0100
Subject: Revert "Optimize TaskUtils#getApplicableTasks method"

This reverts commit b110eae48d68be6cc1957a201f776a8d535a8ff0.

This caused a regression where the plugin would not load on older versions
of Minecraft.
---
 .../java/com/leonardobishop/quests/bukkit/util/TaskUtils.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'bukkit/src/main/java')

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java
index 1f46e4f1..44f104e9 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java
@@ -13,7 +13,6 @@ import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
 import com.leonardobishop.quests.common.quest.Quest;
 import com.leonardobishop.quests.common.quest.Task;
 import com.leonardobishop.quests.common.tasktype.TaskType;
-import org.apache.commons.lang3.ArrayUtils;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -28,6 +27,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -142,18 +142,21 @@ public class TaskUtils {
 
     public static List<PendingTask> getApplicableTasks(Player player, QPlayer qPlayer, TaskType type, TaskConstraint... constraints) {
         List<PendingTask> tasks = new ArrayList<>();
-        boolean containsWorldConstraint = ArrayUtils.contains(constraints, TaskConstraint.WORLD);
+        List<TaskConstraint> taskConstraints = Arrays.asList(constraints);
 
         for (Quest quest : type.getRegisteredQuests()) {
             if (qPlayer.hasStartedQuest(quest)) {
                 QuestProgress questProgress = qPlayer.getQuestProgressFile().getQuestProgress(quest);
 
                 for (Task task : quest.getTasksOfType(type.getType())) {
-                    if (containsWorldConstraint && !TaskUtils.validateWorld(player, task)) {
-                        continue;
+                    if (taskConstraints.contains(TaskConstraint.WORLD)) {
+                        if (!TaskUtils.validateWorld(player, task)) {
+                            continue;
+                        }
                     }
 
                     TaskProgress taskProgress = questProgress.getTaskProgress(task.getId());
+
                     if (taskProgress.isCompleted()) {
                         continue;
                     }
-- 
cgit v1.2.3-70-g09d2