api(config): default で NPE が出るバグを修正

sya-ri · Feb 19, 2021 · 48042b2 · 48042b2
1 parent 2aa27a3
commit 48042b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -177,7 +177,7 @@ repositories {
 }
 
 dependencies {
-    api('com.github.sya-ri:EasySpigotAPI:1.3.1') {
+    api('com.github.sya-ri:EasySpigotAPI:1.3.2') {
         exclude group: 'org.spigotmc', module: 'spigot-api'
     }
 }
@@ -191,7 +191,7 @@ repositories {
 }
 
 dependencies {
-    api("com.github.sya-ri:EasySpigotAPI:1.3.1") {
+    api("com.github.sya-ri:EasySpigotAPI:1.3.2") {
         exclude(group = "org.spigotmc", module = "spigot-api")
     }
 }
@@ -217,7 +217,7 @@ configurations {
 }
 
 dependencies {
-    shadowApi('com.github.sya-ri:EasySpigotAPI:1.3.1') {
+    shadowApi('com.github.sya-ri:EasySpigotAPI:1.3.2') {
         exclude group: 'org.spigotmc', module: 'spigot-api'
     }
 }
@@ -242,7 +242,7 @@ repositories {
 }
 
 dependencies {
-    shadowApi("com.github.sya-ri:EasySpigotAPI:1.3.1") {
+    shadowApi("com.github.sya-ri:EasySpigotAPI:1.3.2") {
         exclude(group = "org.spigotmc", module = "spigot-api")
     }
 }

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 group = "com.github.sya-ri.spigot.api"
-version = "1.3.1"
+version = "1.3.2"
 
 bukkit {
     name = "EasySpigotAPI"

diff --git a/api/src/main/kotlin/com/github/syari/spigot/api/config/CustomConfig.kt b/api/src/main/kotlin/com/github/syari/spigot/api/config/CustomConfig.kt
@@ -33,19 +33,21 @@ class CustomConfig internal constructor(
     val config: YamlConfiguration
 
     init {
-        try {
-            file.parentFile.mkdirs()
-            file.createNewFile()
-            if (default.isNotEmpty()) {
-                default.forEach { (key, value) ->
-                    setUnsafe(key, value)
-                }
-                save()
+        if (file.exists().not()) {
+            try {
+                file.parentFile.mkdirs()
+                file.createNewFile()
+            } catch (ex: IOException) {
+                throw IOException("$filePath の作成に失敗しました")
             }
-        } catch (ex: IOException) {
-            plugin.logger.severe("$filePath の作成に失敗しました")
         }
         config = YamlConfiguration.loadConfiguration(file)
+        if (default.isNotEmpty()) {
+            default.forEach { (key, value) ->
+                setUnsafe(key, value)
+            }
+            save()
+        }
     }
 
     /**