Fix track command

2 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/com/leonardobishop/quests/events/MenuController.java b/src/main/java/com/leonardobishop/quests/events/MenuController.java
index 9cc390be..b25bcd89 100644
--- a/src/main/java/com/leonardobishop/quests/events/MenuController.java
+++ b/src/main/java/com/leonardobishop/quests/events/MenuController.java
@@ -73,10 +73,8 @@ public class MenuController implements Listener {
             String tracked = menu.getOwner().getQuestProgressFile().getPlayerPreferences().getTrackedQuestId();
 
             if (quest.getId().equals(tracked)) {
-                player.sendMessage(Messages.QUEST_TRACK_STOP.getMessage().replace("{quest}", quest.getDisplayNameStripped()));
                 menu.getOwner().getQuestProgressFile().trackQuest(null);
             } else {
-                player.sendMessage(Messages.QUEST_TRACK.getMessage().replace("{quest}", quest.getDisplayNameStripped()));
                 menu.getOwner().getQuestProgressFile().trackQuest(quest);
             }
             player.closeInventory();
diff --git a/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java b/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
index 5af227f5..c2bf0c53 100644
--- a/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
+++ b/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java
@@ -102,14 +102,20 @@ public class QuestProgressFile {
     public void trackQuest(Quest quest) {
         Player player = Bukkit.getPlayer(playerUUID);
         if (quest == null) {
+            String currentTrackedQuestId = playerPreferences.getTrackedQuestId();
             playerPreferences.setTrackedQuestId(null);
             if (player != null) {
                 Bukkit.getPluginManager().callEvent(new PlayerStopTrackQuestEvent(player, this));
+                Quest currentTrackedQuest;
+                if (currentTrackedQuestId != null && (currentTrackedQuest = plugin.getQuestManager().getQuestById(currentTrackedQuestId)) != null) {
+                    player.sendMessage(Messages.QUEST_TRACK_STOP.getMessage().replace("{quest}", currentTrackedQuest.getDisplayNameStripped()));
+                }
             }
         } else if (hasStartedQuest(quest)) {
             playerPreferences.setTrackedQuestId(quest.getId());
             if (player != null) {
                 Bukkit.getPluginManager().callEvent(new PlayerStartTrackQuestEvent(player, this));
+                player.sendMessage(Messages.QUEST_TRACK.getMessage().replace("{quest}", quest.getDisplayNameStripped()));
             }
         }
     }