diff --git a/dist/pom.xml b/dist/pom.xml index a0bf0d347..ff8e7429f 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -5,7 +5,7 @@ me.blackvein.quests quests-parent - 3.7.6 + 3.7.7 quests-dist pom diff --git a/main/pom.xml b/main/pom.xml index f260bdd70..48aee8a76 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -4,7 +4,7 @@ me.blackvein.quests quests-parent - 3.7.6 + 3.7.7 quests-main diff --git a/main/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java b/main/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java index fb83d3a14..6d731d584 100644 --- a/main/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java +++ b/main/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java @@ -134,7 +134,7 @@ public class CreateStagePrompt extends FixedSetPrompt { text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.AQUA + " - " + Lang.get("stageEditorEvents") + "\n"; } if (!hasObjective) { - text += ChatColor.GRAY + "" + ChatColor.BOLD + "10" + ChatColor.RESET + ChatColor.GRAY + " - " + Lang.get("delay") + ChatColor.GRAY + " (" + Lang.get("stageEditorOptional") + ")\n"; + text += ChatColor.GRAY + "" + ChatColor.BOLD + "10" + ChatColor.RESET + ChatColor.GRAY + " - " + Lang.get("delay") + ChatColor.GRAY + " (" + Lang.get("stageEditorOptional") + ")\n"; } else { if (context.getSessionData(pref + CK.S_DELAY) == null) { text += ChatColor.BLUE + "" + ChatColor.BOLD + "10" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("delay") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; @@ -153,11 +153,15 @@ public class CreateStagePrompt extends FixedSetPrompt { if (plugin.getDependencies().getDenizenAPI() == null) { text += ChatColor.GRAY + "" + ChatColor.BOLD + "12" + ChatColor.RESET + ChatColor.GRAY + " - " + Lang.get("stageEditorDenizenScript") + ChatColor.GRAY + " (" + Lang.get("questDenNotInstalled") + ")\n"; } else { - if (context.getSessionData(pref + CK.S_DENIZEN) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "12" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("stageEditorDenizenScript") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + if (!hasObjective) { + text += ChatColor.GRAY + "" + ChatColor.BOLD + "12" + ChatColor.RESET + ChatColor.GRAY + " - " + Lang.get("stageEditorDenizenScript") + ChatColor.GRAY + " (" + Lang.get("stageEditorOptional") + ")\n"; } else { - hasObjective = true; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "12" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("stageEditorDenizenScript") + ChatColor.GRAY + " (" + ChatColor.AQUA + context.getSessionData(pref + CK.S_DENIZEN) + ChatColor.GRAY + ")\n"; + if (context.getSessionData(pref + CK.S_DENIZEN) == null) { + text += ChatColor.BLUE + "" + ChatColor.BOLD + "12" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("stageEditorDenizenScript") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + } else { + hasObjective = true; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "12" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("stageEditorDenizenScript") + ChatColor.GRAY + " (" + ChatColor.AQUA + context.getSessionData(pref + CK.S_DENIZEN) + ChatColor.GRAY + ")\n"; + } } } if (context.getSessionData(pref + CK.S_START_MESSAGE) == null) { @@ -240,7 +244,12 @@ public class CreateStagePrompt extends FixedSetPrompt { context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorNoDenizen")); return new CreateStagePrompt(plugin, stageNum, questFactory); } else { - return new DenizenPrompt(); + if (hasObjective) { + return new DenizenPrompt(); + } else { + context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("invalidOption")); + return new CreateStagePrompt(plugin, stageNum, questFactory); + } } } else if (input.equalsIgnoreCase("13")) { if (hasObjective) { diff --git a/pom.xml b/pom.xml index e03818fef..a295b49d1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ me.blackvein.quests quests-parent - 3.7.6 + 3.7.7 quests https://github.com/PikaMug/Quests/ - 3.7.6 + 3.7.7 UTF-8 1.8 1.8 diff --git a/v1_8_R1/pom.xml b/v1_8_R1/pom.xml index cccc1667c..bd14f5479 100644 --- a/v1_8_R1/pom.xml +++ b/v1_8_R1/pom.xml @@ -5,7 +5,7 @@ me.blackvein.quests quests-parent - 3.7.6 + 3.7.7 diff --git a/v1_8_R2/pom.xml b/v1_8_R2/pom.xml index 3f4a04317..f55d851dd 100644 --- a/v1_8_R2/pom.xml +++ b/v1_8_R2/pom.xml @@ -5,7 +5,7 @@ me.blackvein.quests quests-parent - 3.7.6 + 3.7.7 diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml index 9f2d2ea32..fffae7bf5 100644 --- a/v1_8_R3/pom.xml +++ b/v1_8_R3/pom.xml @@ -5,7 +5,7 @@ me.blackvein.quests quests-parent - 3.7.6 + 3.7.7