Merge branch 'master' into dev

# Conflicts: # src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java
2023-11-12 19:40:51 +01:00
parent 72ea5600fe f0b9a82d7e
commit e39e70b690
3 changed files with 5 additions and 2 deletions
--- a/src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java
+++ b/src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java
@ -109,9 +109,9 @@ public class BlacksmithPlugin extends JavaPlugin {

        //Copy default config to disk
        FileConfiguration fileConfiguration = this.getConfig();
+        fileConfiguration.options().copyDefaults(true);
        this.saveDefaultConfig();
        this.reloadConfig();
-        fileConfiguration.options().copyDefaults(true);
        this.saveConfig();

        //Load settings