Fix issue when AbandonedListener targeted correct input values.

I did not understand correctly how that listener worked.
BentoBoxWorld · Apr 29, 2020 · 8d55143 · 8d55143
1 parent 4ab706b
commit 8d55143
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/src/main/java/world/bentobox/challenges/panel/CommonGUI.java b/src/main/java/world/bentobox/challenges/panel/CommonGUI.java
@@ -1085,7 +1085,13 @@ public Prompt acceptInput(ConversationContext conversationContext, String answer
                 // On cancel conversation will be closed.
                 withEscapeSequence("cancel").
                 // Use null value in consumer to detect if user has abandoned conversation.
-                addConversationAbandonedListener(abandonedEvent -> consumer.accept(null)).
+                addConversationAbandonedListener(abandonedEvent ->
+                {
+                    if (!abandonedEvent.gracefulExit())
+                    {
+                        consumer.accept(null);
+                    }
+                }).
                 withPrefix(context -> user.getTranslation("challenges.gui.questions.prefix")).
                 buildConversation(user.getPlayer());
 

diff --git a/src/main/java/world/bentobox/challenges/panel/admin/AdminGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/AdminGUI.java
@@ -720,7 +720,13 @@ protected Prompt acceptValidatedInput(ConversationContext context, String input)
                 // On cancel conversation will be closed.
                 withEscapeSequence("cancel").
                 // Use null value in consumer to detect if user has abandoned conversation.
-                addConversationAbandonedListener(abandonedEvent -> consumer.accept(null)).
+                addConversationAbandonedListener(abandonedEvent ->
+                {
+                    if (!abandonedEvent.gracefulExit())
+                    {
+                        consumer.accept(null);
+                    }
+                }).
                 withLocalEcho(false).
                 withPrefix(context -> user.getTranslation("challenges.gui.questions.prefix")).
                 buildConversation(user.getPlayer());

diff --git a/src/main/java/world/bentobox/challenges/panel/util/NumberGUI.java b/src/main/java/world/bentobox/challenges/panel/util/NumberGUI.java
@@ -480,7 +480,13 @@ public String getPromptText(ConversationContext conversationContext)
                 // On cancel conversation will be closed.
                 withEscapeSequence("cancel").
                 // Use null value in consumer to detect if user has abandoned conversation.
-                addConversationAbandonedListener(abandonedEvent -> consumer.accept(null)).
+                addConversationAbandonedListener(abandonedEvent ->
+                {
+                    if (!abandonedEvent.gracefulExit())
+                    {
+                        consumer.accept(null);
+                    }
+                }).
                 withPrefix(context ->
                     NumberGUI.this.user.getTranslation("challenges.gui.questions.prefix")).
                 buildConversation(user.getPlayer());

diff --git a/src/main/java/world/bentobox/challenges/panel/util/StringListGUI.java b/src/main/java/world/bentobox/challenges/panel/util/StringListGUI.java
@@ -305,7 +305,13 @@ public Prompt acceptInput(ConversationContext conversationContext, String answer
 				// On cancel conversation will be closed.
 				withEscapeSequence("cancel").
 				// Use null value in consumer to detect if user has abandoned conversation.
-				addConversationAbandonedListener(abandonedEvent -> consumer.accept(null)).
+				addConversationAbandonedListener(abandonedEvent ->
+				{
+					if (!abandonedEvent.gracefulExit())
+					{
+						consumer.accept(null);
+					}
+				}).
 				withLocalEcho(false).
 				withPrefix(context -> user.getTranslation("challenges.gui.questions.prefix")).
 				buildConversation(user.getPlayer());