From ec77e89516e127d41a2ce907c31c5d0897143ea9 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Thu, 13 Dec 2018 13:25:10 +0300
Subject: [PATCH] - Fixed an issue with loading quest challenges from the wrong
 folder.

---
 forge-gui/src/main/java/forge/quest/QuestController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/src/main/java/forge/quest/QuestController.java b/forge-gui/src/main/java/forge/quest/QuestController.java
index 5366f7200bc..6ed03c1fb62 100644
--- a/forge-gui/src/main/java/forge/quest/QuestController.java
+++ b/forge-gui/src/main/java/forge/quest/QuestController.java
@@ -477,9 +477,9 @@ public class QuestController {
                 allChallenges = QuestChallengeGenerator.generateChallenges();
                 return;
             } else if (world.isCustom()) {
-                path = world.getChallengesDir() == null ? ForgeConstants.DEFAULT_CHALLENGES_DIR : ForgeConstants.QUEST_WORLD_DIR + world.getChallengesDir();
-            } else {
                 path = world.getChallengesDir() == null ? ForgeConstants.DEFAULT_CHALLENGES_DIR : ForgeConstants.USER_QUEST_WORLD_DIR + world.getChallengesDir();
+            } else {
+                path = world.getChallengesDir() == null ? ForgeConstants.DEFAULT_CHALLENGES_DIR : ForgeConstants.QUEST_WORLD_DIR + world.getChallengesDir();
             }
 
         }