Merge branch 'master' into dev

# Conflicts:
#	src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.knarcraft</groupId>
     <artifactId>blacksmith</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.5</version>
     <name>Blacksmith</name>
     <description>Blacksmith NPC for the Citizens API</description>
 

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

src/main/java/net/knarcraft/blacksmith/util/ConfigHelper.java

@@ -19,6 +19,9 @@ public final class ConfigHelper {
      * @return <p>The value as a string list, or null if not compatible</p>
      */
     public static List<String> asStringList(Object value) {
+        if (value == null) {
+            return new ArrayList<>();
+        }
         if (value instanceof String) {
             return List.of(((String) value).split(","));
         } else if (value instanceof List<?> list) {