Permit yes/no input from source or client, fixes #2117

PikaMug · Jun 7, 2023 · af1469a · af1469a
1 parent 90bf028
commit af1469a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/api/src/main/java/me/blackvein/quests/util/Lang.java b/api/src/main/java/me/blackvein/quests/util/Lang.java
@@ -316,7 +316,7 @@ public static void init(final QuestsAPI plugin, String iso) throws InvalidConfig
         }
     }
 
-    private static class LangToken {
+    public static class LangToken {
 
         static Map<String, String> tokenMap = new HashMap<>();
 

diff --git a/core/src/main/java/me/blackvein/quests/Quests.java b/core/src/main/java/me/blackvein/quests/Quests.java
@@ -730,6 +730,7 @@ public Prompt acceptInput(final @NotNull ConversationContext context, final Stri
             }
             final Player player = (Player) context.getForWhom();
             if (input.equalsIgnoreCase("1") || input.equalsIgnoreCase("y")
+                    || input.equalsIgnoreCase(Lang.get("yesWord"))
                     || input.equalsIgnoreCase(Lang.get(player, "yesWord"))) {
                 final IQuester quester = getQuester(player.getUniqueId());
                 final String questIdToTake = quester.getQuestIdToTake();
@@ -743,7 +744,8 @@ public Prompt acceptInput(final @NotNull ConversationContext context, final Stri
                 }
                 return Prompt.END_OF_CONVERSATION;
             } else if (input.equalsIgnoreCase("2") || input.equalsIgnoreCase("n")
-                    || input.equalsIgnoreCase(Lang.get("noWord"))) {
+                    || input.equalsIgnoreCase(Lang.get("noWord"))
+                    || input.equalsIgnoreCase(Lang.get(player, "noWord"))) {
                 Lang.send(player, ChatColor.YELLOW + Lang.get("cancelled"));
                 return Prompt.END_OF_CONVERSATION;
             } else {

diff --git a/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java b/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java
@@ -117,7 +117,7 @@ public Prompt acceptInput(final @NotNull ConversationContext context, final Stri
         }
         final Player player = (Player) context.getForWhom();
         if (input.equalsIgnoreCase("1") || input.equalsIgnoreCase("y")
-                || input.equalsIgnoreCase(Lang.get(player, "yesWord"))) {
+                || input.equalsIgnoreCase(Lang.get("yesWord")) || input.equalsIgnoreCase(Lang.get(player, "yesWord"))) {
             final IQuester quester = plugin.getQuester(player.getUniqueId());
             if (quester == null) {
                 plugin.getLogger().info("Ended conversation because quester for " + getName() + "was null");
@@ -141,7 +141,7 @@ public Prompt acceptInput(final @NotNull ConversationContext context, final Stri
             }
             return Prompt.END_OF_CONVERSATION;
         } else if (input.equalsIgnoreCase("2") || input.equalsIgnoreCase("n")
-                || input.equalsIgnoreCase(Lang.get("noWord"))) {
+                || input.equalsIgnoreCase(Lang.get("noWord")) || input.equalsIgnoreCase(Lang.get(player, "noWord"))) {
             Lang.send(player, ChatColor.YELLOW + Lang.get("cancelled"));
             return Prompt.END_OF_CONVERSATION;
         } else {