Final waypoint limit fixes

Author: YarinQuapi

src/main/java/me/yarinlevi/waypoints/player/PlayerData.java

@@ -30,12 +30,10 @@ public PlayerData(OfflinePlayer player, List<Waypoint> waypoints) {
         this.player = player;
         this.waypointList.addAll(waypoints);
 
-        if (player.isOnline()) {
-            try {
-                this.loadLimit();
-            } catch (PlayerNotLoadedException ignored) {
-                // no need to load limit as the player can't create waypoints if he is not online.
-            }
+        try {
+            this.loadLimit();
+        } catch (PlayerNotLoadedException ignored) {
+            // no need to load limit as the player can't create waypoints if he is not online.
         }
 
         Waypoints.getInstance().getPlayerSettingsManager().loadPlayerSettings(this.player.getUniqueId(), this);
@@ -54,8 +52,8 @@ public void loadLimit() throws PlayerNotLoadedException {
 
         FileConfiguration config = Waypoints.getInstance().getConfig();
 
-        for (String perm : config.getStringList("total_limits")) {
-            if (_player.hasPermission(perm)) {
+        for (String perm : config.getConfigurationSection("total_limits").getKeys(false)) {
+            if (_player.hasPermission(perm.replaceAll("-", "."))) {
                 if (limit <= config.getInt("total_limits." + perm)) {
                     limit = config.getInt("total_limits." + perm);
                 }

src/main/resources/config.yml

@@ -7,10 +7,10 @@ DeathPoints: true
 # Should public waypoints be available?
 PublicWaypoints: true
 
-# Waypoint limits
+# Waypoint limits, replace dots with '-' instead
 total_limits:
-  waypoints.limit.default: 10
-  waypoints.limit.vip: 15
+  "waypoints-limit-default": 10
+  "waypoints-limit-vip": 15
 
 # Configurations for all the trackers available
 trackers:

src/main/resources/messages.yml

@@ -21,7 +21,7 @@ setting_change_failed_not_found: "&cSetting change failed! &7Setting &e{1} &7not
 setting_toggled: "&7Setting '&e{1}&7' was toggled {2}&7!"
 tracker_changed: "&7Tracker updated! now using &b{1}&7!"
 create_failed_args: "&cCreate failed! &7Not enough arguments!"
-create_failed_exists: "&cCreate failed! &7You already have a waypoint named &b{0}&7!"
+create_failed_exists: "&cCreate failed! &7You already have a waypoint named &b{1}&7!"
 create_failed_limit: "&cCreate failed! &7You have reached your {1} &7waypoint limit!"
 waypoint_created: "&7Created new waypoint &b{1}"
 waypoint_deleted: "&7Deleted waypoint &b{1}"

src/main/resources/plugin.yml

@@ -15,5 +15,5 @@ commands:
 permissions:
   qwaypoints.command.spawn:
     default: not op
-  qwaypoints-default:
+  waypoints.limit.default:
     default: not op