Improvements to config validation

Small improvements
A5H73Y · Oct 3, 2018 · 0205b7f · 0205b7f
1 parent 96fc9ab
commit 0205b7f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/src/main/java/me/A5H73Y/Parkour/Commands/ParkourConsoleCommands.java b/src/main/java/me/A5H73Y/Parkour/Commands/ParkourConsoleCommands.java
@@ -24,7 +24,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
         if (args.length == 0) {
             Utils.log("v" + Static.getVersion() + " installed. Plugin created by A5H73Y.");
-            Utils.log("Enter 'pa cmds' to display all console commands.");
+            Utils.log("Enter 'pac cmds' to display all console commands.");
             return true;
         }
 
@@ -114,7 +114,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             Backup.backupNow(true);
 
         } else {
-            Utils.log("Unknown Command. Enter 'pa cmds' to display all console commands.");
+            Utils.log("Unknown Command. Enter 'pac cmds' to display all console commands.");
         }
         return true;
     }

diff --git a/src/main/java/me/A5H73Y/Parkour/Other/Configurations.java b/src/main/java/me/A5H73Y/Parkour/Other/Configurations.java
@@ -7,6 +7,7 @@
 import me.A5H73Y.Parkour.Utilities.Static;
 import me.A5H73Y.Parkour.Utilities.Utils;
 
+import org.bukkit.Particle;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -143,6 +144,8 @@ public void reload() {
         kitData = YamlConfiguration.loadConfiguration(kitFile);
         if (Static.getEconomy())
             econData = YamlConfiguration.loadConfiguration(econFile);
+
+        validateConfigProperties();
     }
 
     public FileConfiguration getCheckData() {
@@ -532,5 +535,24 @@ public void setupConfig() {
         config.addDefault("Lobby.EnforceWorld", false);
         config.options().copyDefaults(true);
         Parkour.getPlugin().saveConfig();
+
+        validateConfigProperties();
+    }
+
+    private void validateConfigProperties() {
+        FileConfiguration config = Parkour.getPlugin().getConfig();
+        // First check if the Trail is valid
+        if (config.getBoolean("OnCourse.Trails.Enabled")) {
+            String trail = config.getString("OnCourse.Trails.Particle").toUpperCase();
+
+            try {
+                Particle particle = Particle.valueOf(trail);
+                Parkour.getPlugin().getServer().getWorlds().get(0).spawnParticle(particle, 0, 0, 0, 1);
+            } catch (IllegalArgumentException | NullPointerException ex) {
+                Utils.log("Particle: " + trail + " is invalid. Disabling Trails.", 2);
+                config.set("OnCourse.Trails.Enabled", false);
+                Parkour.getPlugin().saveConfig();
+            }
+        }
     }
 }
diff --git a/src/main/java/me/A5H73Y/Parkour/Other/StartPlugin.java b/src/main/java/me/A5H73Y/Parkour/Other/StartPlugin.java
@@ -32,12 +32,11 @@ public class StartPlugin {
     public static void run() {
         checkConvertToLatest();
         Parkour.getParkourConfig().setupConfig();
-        validateConfigProperties();
         Static.initiate();
         initiateSQL();
         setupExternalPlugins();
         populatePlayers();
-        Utils.log("Enabled Parkour v" + Static.getVersion() + "!");
+        Utils.log("Enabled Parkour v" + Static.getVersion());
     }
 
     private static void setupExternalPlugins() {
@@ -206,23 +205,6 @@ private static void checkConvertToLatest() {
         Parkour.getPlugin().saveConfig();
     }
 
-    private static void validateConfigProperties() {
-        FileConfiguration config = Parkour.getPlugin().getConfig();
-        // First check if the Trail is valid
-        if (config.getBoolean("OnCourse.Trails.Enabled")) {
-            String trail = config.getString("OnCourse.Trails.Particle").toUpperCase();
-
-            try {
-                Particle particle = Particle.valueOf(trail);
-                Parkour.getPlugin().getServer().getWorlds().get(0).spawnParticle(particle, 0, 0, 0, 1);
-            } catch (IllegalArgumentException | NullPointerException ex) {
-                Utils.log("Particle: " + trail + " is invalid. Disabling Trails.", 2);
-                config.set("OnCourse.Trails.Enabled", false);
-                Parkour.getPlugin().saveConfig();
-            }
-        }
-    }
-
     private static void fixParkourBlocks(HashMap<String, ParkourSession> players) {
         for (String playerName : players.keySet()) {
             ParkourSession session = players.get(playerName);