From 1868efd82faea7c3760d6912456204273b3d9f0b Mon Sep 17 00:00:00 2001
From: LMBishop <13875753+LMBishop@users.noreply.github.com>
Date: Mon, 8 Feb 2021 22:43:43 +0000
Subject: Closes #145

---
 .../quests/player/questprogressfile/QuestProgressFile.java              | 2 +-
 .../quests/quests/tasktypes/types/DistancefromTaskType.java             | 2 +-
 .../quests/quests/tasktypes/types/MobkillingCertainTaskType.java        | 2 +-
 .../leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java b/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
index 97819c56..83dcb80a 100644
--- a/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
+++ b/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
@@ -80,7 +80,7 @@ public class QuestProgressFile {
      */
     public QuestStartResult canStartQuest(Quest quest) {
         Player p = Bukkit.getPlayer(playerUUID);
-        if (getStartedQuests().size() >= Options.QUESTS_START_LIMIT.getIntValue()) {
+        if (getStartedQuests().size() >= Options.QUESTS_START_LIMIT.getIntValue() && !Options.QUEST_AUTOSTART.getBooleanValue()) {
             return QuestStartResult.QUEST_LIMIT_REACHED;
         }
         QuestProgress questProgress = getQuestProgress(quest);
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java
index 690d9650..e40df767 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java
@@ -101,7 +101,7 @@ public final class DistancefromTaskType extends TaskType {
 
                     World world = Bukkit.getWorld(worldString);
                     if (world == null) {
-                        return;
+                        continue;
                     }
 
                     Location location = new Location(world, x, y, z);
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
index c713c510..b703f216 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
@@ -98,7 +98,7 @@ public final class MobkillingCertainTaskType extends TaskType {
                     if (configName != null) {
                         configName = ChatColor.translateAlternateColorCodes('&', configName);
                         if (mob.getCustomName() == null || !mob.getCustomName().equals(configName)) {
-                            return;
+                            continue;
                         }
                     }
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java
index fba8a0c4..03af06ff 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java
@@ -88,7 +88,7 @@ public final class PositionTaskType extends TaskType {
                     int paddingSquared = padding * padding;
                     World world = Bukkit.getWorld(worldString);
                     if (world == null) {
-                        return;
+                        continue;
                     }
 
                     Location location = new Location(world, x, y, z);
-- 
cgit v1.2.3-70-g09d2