Fixed bugs.

Author: Score2

common/src/main/kotlin/me/scoretwo/fastscript/api/script/Script.kt

@@ -18,14 +18,14 @@ abstract class Script(
     var texts : MutableMap<String, String> = mutableMapOf()
 ) {
 
-    val main = option.getString("main") ?: "main"
-    val version = option.getString("version") ?: "1.0-default"
-    val description = option.getString("description") ?: "Not more..."
-    val authors = option.getStringList("authors") ?: listOf()
+    val main get() = option.getString("main") ?: "main"
+    val version get() = option.getString("version") ?: "1.0-default"
+    val description get() = option.getString("description") ?: "Not more..."
+    val authors get() = option.getStringList("authors") ?: listOf()
 
-    class Init(option: ScriptOption) {
-        val useAsync = option.getBoolean("init.use-async")
-        val protected = option.getBoolean("init.protected")
+    class Init(val option: ScriptOption) {
+        val useAsync get() = option.getBoolean("init.use-async")
+        val protected get() = option.getBoolean("init.protected")
     }
     val init = Init(option)
 

common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptManager.kt

@@ -137,7 +137,7 @@ class ScriptManager {
 
         val optionsFile: File = optionsFiles.let {
             for (fileName in it) {
-                val file = File(fileName)
+                val file = File(folder, fileName)
                 if (file.exists()) return@let file
             }
 
@@ -148,7 +148,7 @@ class ScriptManager {
 
         script.scriptFiles = mutableListOf<File>().also { files ->
             folder.listFiles()?.forEach { file ->
-                script.bindExpansions().forEach {
+                FastScript.instance.expansionManager.expansions.forEach {
                     if (file.name.endsWith(it.fileSuffix))
                         files.add(file)
                 }

common/src/main/kotlin/me/scoretwo/fastscript/api/script/custom/ConfigScriptOption.kt

@@ -10,7 +10,7 @@ import me.scoretwo.utils.bukkit.configuration.yaml.patchs.loadConfiguration
 import java.io.File
 
 open class ConfigScriptOption(val file: File? = null, val config: YamlConfiguration = file?.loadConfiguration() ?: YamlConfiguration().also { it.set("main", "main") }): ScriptOption {
-    override var main: String = config.getString(config.ignoreCase("main"))
+    override var main: String = config.getString(config.ignoreCase("main")) ?: "main"
     override var meta = mutableMapOf<String, Any?>().also { map ->
         config.getStringList(config.ignoreCase("meta"))?.forEach {
             map[it.substringBefore(":")] = it.substringAfter(":")
@@ -22,7 +22,7 @@ open class ConfigScriptOption(val file: File? = null, val config: YamlConfigurat
     }
 
     fun reload() {
-        main = config.getString(config.ignoreCase("main"))
+        main = config.getString(config.ignoreCase("main")) ?: "main"
         meta = mutableMapOf<String, Any?>().also { map ->
             config.getStringList(config.ignoreCase("meta"))?.forEach {
                 map[it.substringBefore(":")] = it.substringAfter(":")

common/src/main/kotlin/me/scoretwo/fastscript/command/commands/ScriptCommand.kt

@@ -164,6 +164,7 @@ class ScriptCommand: SimpleCommand(arrayOf("script")) {
                     script.execute(expansion, plugin.server.console, "unload")
                 }
                 script.unregisterListeners()
+                script.configOption.reload()
                 script.reload()
                 sender.sendMessage(FormatHeader.INFO, languages["COMMAND-NEXUS.COMMANDS.SCRIPT.RELOAD.RELOADED-SCRIPT"].setPlaceholder("script_name" to script.name))
                 return true