1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/com/leonardobishop/quests/player/QPlayer.java b/src/main/java/com/leonardobishop/quests/player/QPlayer.java
index 4e04566b..44472217 100644
--- a/src/main/java/com/leonardobishop/quests/player/QPlayer.java
+++ b/src/main/java/com/leonardobishop/quests/player/QPlayer.java
@@ -99,6 +99,14 @@ public class QPlayer {
                 player.sendMessage(ChatColor.translateAlternateColorCodes('&', s));
             }
         }
+        if ((Options.ALLOW_QUEST_TRACK.getBooleanValue() && Options.QUEST_AUTOTRACK.getBooleanValue() && !(quest.isRepeatable() && !quest.isCooldownEnabled()))
+            || (!Options.ALLOW_QUEST_TRACK.getBooleanValue() && Options.QUEST_AUTOTRACK.getBooleanValue())) {
+            Quest nextQuest;
+            if (questProgressFile.getStartedQuests().size() > 0) {
+                nextQuest = questProgressFile.getStartedQuests().get(0);
+                trackQuest(nextQuest);
+            }
+        }
         return true;
     }