external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Planar Conquest: allow Chaos matches from custom user worlds.

See merge request core-developers/forge!538
This commit is contained in:
Michael Kamensky
2018-05-07 15:38:56 +00:00
parent 4103afc6cf cbce073227
commit fb23e5a663
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java
View File

@@ -53,7 +53,8 @@ public class ConquestChaosBattle extends ConquestBattle {
//loop until we find a duel //loop until we find a duel
do { do {
world0 = Aggregates.random(FModel.getWorlds()); 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)); QuestEventDuelManager duelManager = new QuestEventDuelManager(new File(path));
QuestEventDifficulty difficulty = prefferedDifficulty; QuestEventDifficulty difficulty = prefferedDifficulty;
duel0 = Aggregates.random(duelManager.getDuels(difficulty)); duel0 = Aggregates.random(duelManager.getDuels(difficulty));