From 4e2aa4258d3cc53b073161e57c1652b6f3070511 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Fri, 10 Mar 2023 21:26:22 +0100
Subject: [PATCH] Fixed being able to get reward without doing the quest

---
 .../commands/subcommands/CommandGetReward.java              | 6 ++++++
 .../com/alttd/altitudequests/config/MessagesConfig.java     | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/alttd/altitudequests/commands/subcommands/CommandGetReward.java b/src/main/java/com/alttd/altitudequests/commands/subcommands/CommandGetReward.java
index 7ba2b58..f9a0ba9 100644
--- a/src/main/java/com/alttd/altitudequests/commands/subcommands/CommandGetReward.java
+++ b/src/main/java/com/alttd/altitudequests/commands/subcommands/CommandGetReward.java
@@ -35,10 +35,16 @@ public class CommandGetReward extends SubCommand {
             return true;
         }
 
+        if (!dailyQuest.isDone()) {
+            player.sendMiniMessage(MessagesConfig.NOT_FINISHED_QUEST, null);
+            return true;
+        }
+
         if (dailyQuest.isRewardReceived()) {
             player.sendMiniMessage(MessagesConfig.REWARD_ALREADY_RECEIVED, null);
             return true;
         }
+
         for (String command : dailyQuest.getRewardCommand())
             Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), command.replaceAll("<player>", commandSender.getName()));
         dailyQuest.setRewardReceived(true);
diff --git a/src/main/java/com/alttd/altitudequests/config/MessagesConfig.java b/src/main/java/com/alttd/altitudequests/config/MessagesConfig.java
index a644bf2..195e736 100644
--- a/src/main/java/com/alttd/altitudequests/config/MessagesConfig.java
+++ b/src/main/java/com/alttd/altitudequests/config/MessagesConfig.java
@@ -37,6 +37,7 @@ public class MessagesConfig extends AbstractConfig{
     public static String REWARD_ALREADY_RECEIVED = "<red>You already collected this reward</red>";
     public static String REWARD_SENT = "<white>[<gold>Mascot</gold>] <light_purple>Scruff</light_purple><gray>:</gray> <green>Thank you for completing the quest! Your reward has been sent!</green></white>";
     public static String FINISHED_QUEST = "<white>[<gold>Mascot</gold>] <light_purple>Scruff</light_purple><gray>:</gray> <green>You finished your quest! Don't forget to collect your reward at the end of the quest book!</green></white>";
+    public static String NOT_FINISHED_QUEST = "<red>You have not finished this quest yet.</red>";
     private static void loadMessages() {
         TOO_FAR_FROM_NPC = config.getString("messages.too-far-from-npc", TOO_FAR_FROM_NPC);
         DAILY_ALREADY_DONE = config.getString("messages.daily-already-done", DAILY_ALREADY_DONE);
@@ -44,6 +45,7 @@ public class MessagesConfig extends AbstractConfig{
         REWARD_ALREADY_RECEIVED = config.getString("messages.reward-already-received", REWARD_ALREADY_RECEIVED);
         FINISHED_QUEST = config.getString("messages.finished-quest", FINISHED_QUEST);
         REWARD_SENT = config.getString("messages.reward-send", REWARD_SENT);
+        NOT_FINISHED_QUEST = config.getString("messages.not-finished-quest", NOT_FINISHED_QUEST);
     }
 
     public static String NO_PERMISSION = "<red>You do not have permission to do that.</red>";