From 49392e5d1c93775205dab8a8c7cdae29f9d6a220 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Sat, 18 Mar 2023 15:10:27 -0400
Subject: [PATCH] Correct default return of item prompt

---
 .../java/me/blackvein/quests/Quester.java     |  2 --
 .../quests/convo/generic/ItemStackPrompt.java | 21 ++++++++-----------
 .../quests/listeners/PlayerListener.java      |  2 --
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/me/blackvein/quests/Quester.java b/core/src/main/java/me/blackvein/quests/Quester.java
index dc0e81648..fc9a163e2 100644
--- a/core/src/main/java/me/blackvein/quests/Quester.java
+++ b/core/src/main/java/me/blackvein/quests/Quester.java
@@ -5127,8 +5127,6 @@ public class Quester implements IQuester {
                 if (q == null) {
                     continue;
                 }
-                // Share only same quest is not necessary here
-                // The function must be applied to the same quest
                 if ((q.getCurrentQuestsTemp().containsKey(quest) && currentStage.equals(q.getCurrentStage(quest)))) {
                     fun.apply(q);
                 }
diff --git a/core/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java b/core/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java
index cf8c12910..1f4feb7a0 100644
--- a/core/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java
+++ b/core/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java
@@ -413,8 +413,8 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt {
                         }
                         stack.setItemMeta(meta);
                     }
-
                     context.setSessionData("tempStack", stack);
+                    return oldPrompt;
                 }
             } else {
                 context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateNoNameAmount"));
@@ -422,7 +422,7 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt {
             }
         default:
             try {
-                return oldPrompt;
+                return new ItemStackPrompt(context, oldPrompt);
             } catch (final Exception e) {
                 context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateCriticalError"));
                 return Prompt.END_OF_CONVERSATION;
@@ -759,7 +759,7 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt {
         }
     }
 
-    private String getItemData(final ConversationContext context) {
+    public String getItemData(final ConversationContext context) {
         if (context.getSessionData("tempName") != null) {
             final StringBuilder item;
             if (context.getSessionData("tempDisplay") == null) {
@@ -784,35 +784,32 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt {
             } else {
                 item.append(ChatColor.GRAY).append(" x ").append(ChatColor.DARK_AQUA).append("1");
             }
-            item.append("\n");
             if (context.getSessionData("tempEnchantments") != null) {
                 @SuppressWarnings("unchecked")
-                final
-                Map<Enchantment, Integer> enchantments 
+                final Map<Enchantment, Integer> enchantments
                         = (Map<Enchantment, Integer>) context.getSessionData("tempEnchantments");
                 if (enchantments != null) {
                     for (final Entry<Enchantment, Integer> e : enchantments.entrySet()) {
-                        item.append(ChatColor.GRAY).append("  - ").append(ChatColor.RED)
+                        item.append("\n").append(ChatColor.GRAY).append("  - ").append(ChatColor.RED)
                                 .append(ItemUtil.getPrettyEnchantmentName(e.getKey())).append(" ")
-                                .append(RomanNumeral.getNumeral(e.getValue())).append("\n");
+                                .append(RomanNumeral.getNumeral(e.getValue()));
                     }
                 }
             }
             if (context.getSessionData("tempLore") != null) {
                 @SuppressWarnings("unchecked")
                 final List<String> lore = (List<String>) context.getSessionData("tempLore");
-                item.append(ChatColor.DARK_GREEN).append("(Lore)\n\"");
+                item.append("\n").append(ChatColor.DARK_GREEN).append("(Lore)\"");
                 if (lore != null) {
                     for (final String s : lore) {
                         if (lore.indexOf(s) != (lore.size() - 1)) {
-                            item.append(ChatColor.DARK_GREEN).append(ChatColor.ITALIC).append(s).append("\n");
+                            item.append("\n").append(ChatColor.DARK_GREEN).append(ChatColor.ITALIC).append(s);
                         } else {
-                            item.append(ChatColor.DARK_GREEN).append(ChatColor.ITALIC).append(s).append("\"\n");
+                            item.append("\n").append(ChatColor.DARK_GREEN).append(ChatColor.ITALIC).append(s).append("\"");
                         }
                     }
                 }
             }
-            item.append("\n");
             return item.toString();
         } else {
             return null;
diff --git a/core/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/core/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
index 758574990..5d16d3262 100644
--- a/core/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/core/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -695,7 +695,6 @@ public class PlayerListener implements Listener {
             }
             final IQuester quester = plugin.getQuester(damager.getUniqueId());
             final ObjectiveType type = ObjectiveType.KILL_MOB;
-            final Set<String> dispatchedQuestIDs = new HashSet<>();
             for (final IQuest quest : plugin.getLoadedQuests()) {
                 if (!quester.meetsCondition(quest, true)) {
                     continue;
@@ -792,7 +791,6 @@ public class PlayerListener implements Listener {
             }
             final IQuester quester = plugin.getQuester(damager.getUniqueId());
             final ObjectiveType type = ObjectiveType.KILL_PLAYER;
-            final Set<String> dispatchedQuestIDs = new HashSet<>();
             for (final IQuest quest : plugin.getLoadedQuests()) {
                 if (!quester.meetsCondition(quest, true)) {
                     continue;