Fixed bug where salvage and repair configs would re-add any deleted entry that existed in the default config Fixes #5223

Changelog.txt

@@ -1,6 +1,8 @@
 Version 2.2.045
-    Fixed an error that could happen when replanting crops with Green Thumb
     Green Thumb now replants harvested plants faster
+    Fixed an error that could happen when replanting crops with Green Thumb
+    Fixed a bug where salvage.vanilla.yml was readding deleted entries on server restart
+    Fixed a bug where repair.vanilla.yml was readding deleted entries on server restart
 
     NOTES:
     The delay from a plant being replanted from Green Thumb is intentional, and while looking into bugs it seemd maybe a tad slow, so I sped it up a bit.

src/main/java/com/gmail/nossr50/config/BukkitConfig.java

@@ -8,12 +8,13 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.logging.Level;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class BukkitConfig {
-    boolean copyDefaults = true;
+    boolean copyDefaults;
     protected final String fileName;
     protected final File configFile;
     protected YamlConfiguration defaultYamlConfig;
@@ -58,7 +59,7 @@ public abstract class BukkitConfig {
                 savedDefaults = true;
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            mcMMO.p.getLogger().log(Level.SEVERE, "Unable to save config file: " + fileName, e);
         }
     }
 

src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java

@@ -15,7 +15,7 @@ public class RepairConfigManager {
         Pattern pattern = Pattern.compile("repair\\.(?:.+)\\.yml");
         File dataFolder = plugin.getDataFolder();
 
-        RepairConfig mainRepairConfig = new RepairConfig(REPAIR_VANILLA_YML, true);
+        RepairConfig mainRepairConfig = new RepairConfig(REPAIR_VANILLA_YML, false);
         repairables.addAll(mainRepairConfig.getLoadedRepairables());
 
         for (String fileName : dataFolder.list()) {

src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java

@@ -43,8 +43,8 @@ public class SalvageConfig extends BukkitConfig {
     private final HashSet<String> notSupported;
     private Set<Salvageable> salvageables;
 
-    public SalvageConfig(String fileName, boolean copyDefaults) {
-        super(fileName, copyDefaults);
+    public SalvageConfig(String fileName) {
+        super(fileName, false);
         notSupported = new HashSet<>();
         loadKeys();
     }

src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java

@@ -16,7 +16,7 @@ public class SalvageConfigManager {
         Pattern pattern = Pattern.compile("salvage\\.(?:.+)\\.yml");
         File dataFolder = plugin.getDataFolder();
 
-        SalvageConfig mainSalvageConfig = new SalvageConfig(SALVAGE_VANILLA_YML, true);
+        SalvageConfig mainSalvageConfig = new SalvageConfig(SALVAGE_VANILLA_YML);
         salvageables.addAll(mainSalvageConfig.getLoadedSalvageables());
 
         for (String fileName : dataFolder.list()) {
@@ -34,7 +34,7 @@ public class SalvageConfigManager {
                 continue;
             }
 
-            SalvageConfig salvageConfig = new SalvageConfig(fileName, false);
+            SalvageConfig salvageConfig = new SalvageConfig(fileName);
             salvageables.addAll(salvageConfig.getLoadedSalvageables());
         }
     }