From cbce073227e586930ad188207db63efefef4d8d2 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Mon, 7 May 2018 18:37:34 +0300
Subject: [PATCH] - Planar Conquest: allow Chaos matches from custom user
 worlds.

---
 .../main/java/forge/planarconquest/ConquestChaosBattle.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java b/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java
index 3f998557637..8cac9046f74 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java
@@ -53,7 +53,8 @@ public class ConquestChaosBattle extends ConquestBattle {
         //loop until we find a duel
         do {
             world0 = Aggregates.random(FModel.getWorlds());
-            String path = world0 == null || world0.getDuelsDir() == null ? ForgeConstants.DEFAULT_DUELS_DIR : ForgeConstants.QUEST_WORLD_DIR + world0.getDuelsDir();
+            String worldDir = world0 != null && world0.isCustom() ? ForgeConstants.USER_QUEST_WORLD_DIR : ForgeConstants.QUEST_WORLD_DIR;
+            String path = world0 == null || world0.getDuelsDir() == null ? ForgeConstants.DEFAULT_DUELS_DIR : worldDir + world0.getDuelsDir();
             QuestEventDuelManager duelManager = new QuestEventDuelManager(new File(path));
             QuestEventDifficulty difficulty = prefferedDifficulty;
             duel0 = Aggregates.random(duelManager.getDuels(difficulty));