From f14040c7fe4bc4195edacb79283b1643c7157b30 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Sun, 25 Dec 2022 15:47:38 -0500 Subject: [PATCH] Finalize matching item display workaround --- .../convo/quests/main/QuestMainPrompt.java | 16 ---------------- core/src/main/resources/strings.yml | 1 - 2 files changed, 17 deletions(-) diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java index c44a5cd65..0917b72da 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java @@ -735,22 +735,6 @@ public class QuestMainPrompt extends QuestsEditorNumericPrompt { // Check/add newly made item if (context.getSessionData("tempStack") != null) { final ItemStack stack = (ItemStack) context.getSessionData("tempStack"); - // TODO - Delete this and questGUIError string - /*boolean failed = false; - for (final IQuest quest : plugin.getLoadedQuests()) { - if (quest.getGUIDisplay() != null) { - if (ItemUtil.compareItems(stack, quest.getGUIDisplay(), false) == 0) { - String error = Lang.get("questGUIError"); - error = error.replace("", ChatColor.DARK_PURPLE + quest.getName() + ChatColor.RED); - context.getForWhom().sendRawMessage(ChatColor.RED + error); - failed = true; - break; - } - } - } - if (!failed) { - context.setSessionData(CK.Q_GUIDISPLAY, context.getSessionData("tempStack")); - }*/ if (stack != null) { context.setSessionData(CK.Q_GUIDISPLAY, stack.clone()); } diff --git a/core/src/main/resources/strings.yml b/core/src/main/resources/strings.yml index 58daa93b4..45e64ac89 100644 --- a/core/src/main/resources/strings.yml +++ b/core/src/main/resources/strings.yml @@ -87,7 +87,6 @@ questWGSetRegion: "Set region start" questWGPrompt: "Enter WorldGuard region, , " questWGInvalidRegion: " is not a valid WorldGuard region!" questWGRegionCleared: "Quest region cleared." -questGUIError: "Error: That item is already being used as the GUI display for the quest ." questCurrentItem: "Current item:" questGUICleared: "Quest GUI item display cleared." questDeleted: "Quest deleted! Quest and action data has been reloaded."