diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/main/java/com/leonardobishop/quests/events/MenuController.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java | 6 |
3 files changed, 7 insertions, 3 deletions
@@ -87,4 +87,4 @@ If you plan on contributing upstream please note the following: * limit the first line of commit messages to ~50 chars and leave a space below that * **test your changes** on the latest Spigot version before making a pull request -By contributing to Quests you agree to license your code under the [GNU General Public License v3.0](https://github.com/LMBishop/Quests/blob/master/LICENSE). +By contributing to Quests you agree to license your code under the [GNU General Public License v3.0](https://github.com/LMBishop/Quests/blob/master/LICENSE.txt). 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())); } } } |