From 6c8e1d5c89c7b3eb81b04b8322ac8a8523aa53c7 Mon Sep 17 00:00:00 2001
From: LMBishop <13875753+LMBishop@users.noreply.github.com>
Date: Wed, 11 Aug 2021 16:04:37 +0100
Subject: Rename config key & allow use of previous key

- Previous key used for everybody so config doesn't need changing for users upgrading
---
 .../leonardobishop/quests/bukkit/config/BukkitQuestsConfig.java    | 7 ++++---
 bukkit/src/main/resources/resources/bukkit/config.yml              | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'bukkit/src')

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsConfig.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsConfig.java
index ae116f0d..0684733b 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsConfig.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsConfig.java
@@ -94,9 +94,10 @@ public class BukkitQuestsConfig implements QuestsConfig {
     }
 
     public int getQuestLimit(Player player) {
+        if (config.contains("options.quest-started-limit")) return config.getInt("options.quest-started-limit");
         int limit = getQuestLimit("default");
-        if(player != null) {
-            for (String rank : config.getConfigurationSection("options.quest-limit-multiple").getKeys(false)) {
+        if (player != null) {
+            for (String rank : config.getConfigurationSection("options.quest-limit").getKeys(false)) {
                 int newLimit = getQuestLimit(rank);
                 if (player.hasPermission("quests.limit." + rank) && (limit < newLimit))
                     limit = newLimit;
@@ -106,6 +107,6 @@ public class BukkitQuestsConfig implements QuestsConfig {
     }
 
     public int getQuestLimit(@NotNull String rank) {
-        return config.getInt("options.quest-limit-multiple." + rank, config.getInt("options.quest-limit-multiple.default", 2));
+        return config.getInt("options.quest-limit." + rank, config.getInt("options.quest-limit.default", 2));
     }
 }
diff --git a/bukkit/src/main/resources/resources/bukkit/config.yml b/bukkit/src/main/resources/resources/bukkit/config.yml
index 636b7abc..34205102 100644
--- a/bukkit/src/main/resources/resources/bukkit/config.yml
+++ b/bukkit/src/main/resources/resources/bukkit/config.yml
@@ -150,16 +150,14 @@ options:
   trim-gui-size: true
   # Enable/disable titles
   titles-enabled: true
-
   # Allow players to have multiple active quests.
   # You can set the default number of quests using the 'default' rank below.
   # To grant different quest limits to different people, you can define a 'quest-rank'
   # Create the 'quest-rank' below, and give the matching permission: quests.limit.<quest-rank>
-  quest-limit-multiple:
+  quest-limit:
     default: 2
     #vip: 5
     #staff: 10
-
   # Allow players to cancel a quest (you may want to remove the cancel instructions in the global item lore)
   allow-quest-cancel: true
   # Allow players to track a quest (you may want to remove the tracking instructions in the global item lore)
-- 
cgit v1.2.3-70-g09d2