From 116fc0e53ddb85cac2debab8fbcfffcaa18b762d Mon Sep 17 00:00:00 2001 From: RumbleBBU Date: Fri, 21 Dec 2012 07:20:16 +0000 Subject: [PATCH] Do not display the current world in the Travel destination dialog. CheckStyle. --- .../java/forge/gui/home/quest/SSubmenuQuestUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java index 44e8b18008b..9631bbf605a 100644 --- a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java +++ b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java @@ -269,13 +269,15 @@ public class SSubmenuQuestUtil { List worlds = new ArrayList(); final QuestController qCtrl = Singletons.getModel().getQuest(); - + for (QuestWorld qw : Singletons.getModel().getWorlds()) { - worlds.add(qw); + if (qCtrl.getWorld() != qw) { + worlds.add(qw); + } } if (worlds.size() < 1) { - JOptionPane.showMessageDialog(null, "There are currently no worlds\nin this version of Forge.", "No worlds", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, "There are currently no worlds you can travel to\nin this version of Forge.", "No worlds", JOptionPane.ERROR_MESSAGE); } final String setPrompt = "Where do you wish to travel?"; @@ -336,7 +338,7 @@ public class SSubmenuQuestUtil { return; } String errorMessage = deck.getGameTypeConformanceMessage(GameType.Quest); - if ( null != errorMessage ) { + if (null != errorMessage) { JOptionPane.showMessageDialog(null, "Your deck " + errorMessage + " Please edit or choose a different deck.", "Invalid deck", JOptionPane.ERROR_MESSAGE); return; }