Upstream/Challenges
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Challenges.git synced 2025-01-02 22:38:05 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue when AbandonedListener targeted correct input values.

Browse Source 
I did not understand correctly how that listener worked.
This commit is contained in:
BONNe 2020-04-29 23:15:24 +03:00
parent 4ab706b207
commit 8d5514325c
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/world/bentobox/challenges/panel/CommonGUI.java
View File

@ -1085,7 +1085,13 @@ public abstract class CommonGUI
// On cancel conversation will be closed. // On cancel conversation will be closed.
withEscapeSequence("cancel"). withEscapeSequence("cancel").
// Use null value in consumer to detect if user has abandoned conversation. // 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")). withPrefix(context -> user.getTranslation("challenges.gui.questions.prefix")).
buildConversation(user.getPlayer()); buildConversation(user.getPlayer());

8
src/main/java/world/bentobox/challenges/panel/admin/AdminGUI.java
View File

@ -720,7 +720,13 @@ public class AdminGUI extends CommonGUI
// On cancel conversation will be closed. // On cancel conversation will be closed.
withEscapeSequence("cancel"). withEscapeSequence("cancel").
// Use null value in consumer to detect if user has abandoned conversation. // 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). withLocalEcho(false).
withPrefix(context -> user.getTranslation("challenges.gui.questions.prefix")). withPrefix(context -> user.getTranslation("challenges.gui.questions.prefix")).
buildConversation(user.getPlayer()); buildConversation(user.getPlayer());

8
src/main/java/world/bentobox/challenges/panel/util/NumberGUI.java
View File

@ -480,7 +480,13 @@ public class NumberGUI
// On cancel conversation will be closed. // On cancel conversation will be closed.
withEscapeSequence("cancel"). withEscapeSequence("cancel").
// Use null value in consumer to detect if user has abandoned conversation. // 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 -> withPrefix(context ->
NumberGUI.this.user.getTranslation("challenges.gui.questions.prefix")). NumberGUI.this.user.getTranslation("challenges.gui.questions.prefix")).
buildConversation(user.getPlayer()); buildConversation(user.getPlayer());

8
src/main/java/world/bentobox/challenges/panel/util/StringListGUI.java
View File

@ -305,7 +305,13 @@ public class StringListGUI
// On cancel conversation will be closed. // On cancel conversation will be closed.
withEscapeSequence("cancel"). withEscapeSequence("cancel").
// Use null value in consumer to detect if user has abandoned conversation. // 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). withLocalEcho(false).
withPrefix(context -> user.getTranslation("challenges.gui.questions.prefix")). withPrefix(context -> user.getTranslation("challenges.gui.questions.prefix")).
buildConversation(user.getPlayer()); buildConversation(user.getPlayer());