Fixed issue with the reload command resetting config

TimedFly · Sep 29, 2019 · e488ef8 · e488ef8
1 parent f1e6728
commit e488ef8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/me/jackint0sh/timedfly/commands/Main.java b/src/main/java/me/jackint0sh/timedfly/commands/Main.java
@@ -88,7 +88,7 @@ private void permissions(CommandSender sender) {
     private void reload(CommandSender sender) {
         try {
             for (Config config : Config.getConfigs().values()) {
-                config.reload();
+                config.reload(false);
                 if (config.getName().equals("items.yml")) {
                     config.get().getConfigurationSection("Items").getKeys(false).forEach(FlyItem::new);
                 }

diff --git a/src/main/java/me/jackint0sh/timedfly/flygui/inventories/ConfirmationMenu.java b/src/main/java/me/jackint0sh/timedfly/flygui/inventories/ConfirmationMenu.java
@@ -8,6 +8,7 @@
 import me.jackint0sh.timedfly.utilities.Languages;
 import me.jackint0sh.timedfly.utilities.MessageUtil;
 import org.bukkit.Material;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
@@ -88,7 +89,7 @@ private static void handleSave(Player player) {
         FlyItem.setConfigItem(flyItem);
 
         try {
-            config.reload();
+            config.reload(true);
         } catch (IOException e) {
             MessageUtil.sendError(player, e);
         }
@@ -101,7 +102,7 @@ private static void handleDelete(Player player) {
         config.get().set("Items." + flyItem.getKey(), null);
         FlyItem.removeConfigItem(flyItem.getKey());
         try {
-            config.reload();
+            config.reload(true);
         } catch (IOException e) {
             MessageUtil.sendError(player, e);
         }

diff --git a/src/main/java/me/jackint0sh/timedfly/utilities/Config.java b/src/main/java/me/jackint0sh/timedfly/utilities/Config.java
@@ -45,8 +45,8 @@ public void save() throws IOException {
         fileConfiguration.save(file);
     }
 
-    public void reload() throws IOException {
-        save();
+    public void reload(boolean save) throws IOException {
+        if (save) save();
         fileConfiguration = YamlConfiguration.loadConfiguration(file);
         Config.configMap.put(name, this);
     }

diff --git a/src/main/java/me/jackint0sh/timedfly/utilities/MessageUtil.java b/src/main/java/me/jackint0sh/timedfly/utilities/MessageUtil.java
@@ -152,7 +152,7 @@ public static void sendTranslation(Player to, String path, String[][] replace) {
         if (replace != null) {
             for (String[] strings : replace) translation = translation.replace(strings[0], strings[1]);
         }
-        sendMessage(to, translation, true);
+        sendMessage(to, replacePlaceholders(to, translation), true);
     }
 
     public static void sendTranslation(CommandSender to, String path, String[][] replace) {

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -128,9 +128,9 @@ Messages:
 # A list of world in which you want the plugin to be Enable.
 World-List:
   # Available types:
-  # enable: the plugin will work in worlds listed
-  # disable: the plugin will not work in worlds listed
-  # all: the plugin will work in all worlds
+  #   enable: the plugin will work in worlds listed
+  #   disable: the plugin will not work in worlds listed
+  #   all: the plugin will work in all worlds
   Type: 'all'
   Worlds:
     - 'world'