From b67ffadcac3c5c2b019c4bee53f9441fb7913c22 Mon Sep 17 00:00:00 2001
From: Krakenied <Krakenied1@gmail.com>
Date: Sat, 1 Jun 2024 10:52:50 +0200
Subject: Add cancelstring and expirystring options Closes
 https://github.com/LMBishop/Quests/issues/667

---
 .../quests/bukkit/config/BukkitQuestsLoader.java             |  4 ++++
 .../quests/bukkit/questcontroller/NormalQuestController.java | 12 ++++++++++++
 2 files changed, 16 insertions(+)

(limited to 'bukkit/src/main/java')

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java
index 82c2bed8..aa5dc0db 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java
@@ -270,6 +270,8 @@ public class BukkitQuestsLoader implements QuestsLoader {
                         List<String> requirements = config.getStringList("options.requires");
                         List<String> rewardString = config.getStringList("rewardstring");
                         List<String> startString = config.getStringList("startstring");
+                        List<String> cancelString = config.getStringList("cancelstring");
+                        List<String> expiryString = config.getStringList("expirystring");
                         List<String> startCommands = config.getStringList("startcommands");
                         List<String> cancelCommands = config.getStringList("cancelcommands");
                         List<String> expiryCommands = config.getStringList("expirycommands");
@@ -302,6 +304,8 @@ public class BukkitQuestsLoader implements QuestsLoader {
                                 .withRequirements(requirements)
                                 .withRewardString(rewardString)
                                 .withStartString(startString)
+                                .withCancelString(cancelString)
+                                .withExpiryString(expiryString)
                                 .withStartCommands(startCommands)
                                 .withCancelCommands(cancelCommands)
                                 .withExpiryCommands(expiryCommands)
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java
index 47f108b5..3af12c87 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java
@@ -302,6 +302,12 @@ public class NormalQuestController implements QuestController {
                     Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), s);
                 }
             }
+            for (String s : quest.getCancelString()) {
+                if (plugin.getConfig().getBoolean("options.quests-use-placeholderapi")) {
+                    s = plugin.getPlaceholderAPIProcessor().apply(player, s);
+                }
+                player.sendMessage(Chat.legacyColor(s));
+            }
             SoundUtils.playSoundForPlayer(player, plugin.getQuestsConfig().getString("options.sounds.quest-cancel"));
         }
         if (config.getBoolean("options.allow-quest-track")
@@ -337,6 +343,12 @@ public class NormalQuestController implements QuestController {
                     Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), s);
                 }
             }
+            for (String s : quest.getExpiryString()) {
+                if (plugin.getConfig().getBoolean("options.quests-use-placeholderapi")) {
+                    s = plugin.getPlaceholderAPIProcessor().apply(player, s);
+                }
+                player.sendMessage(Chat.legacyColor(s));
+            }
         }
         if (config.getBoolean("options.allow-quest-track")
                 && config.getBoolean("options.quest-autotrack")
-- 
cgit v1.2.3-70-g09d2