Fixed bugs

Author: Score2

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "me.scoretwo"
-version = "1.1.4-SNAPSHOT"
+version = "1.1.5-SNAPSHOT"
 description = "FastScript is a Spigot plugin, which can run JavaScript-based scripts more efficiently."
 
 defaultTasks = mutableListOf("ShadowJar", "publishToMavenLocal")
@@ -23,8 +23,8 @@ allprojects {
         jcenter()
         mavenCentral()
         mavenLocal()
-        maven("http://repo.iroselle.com/repository/maven-snapshots/")
-        maven("http://repo.iroselle.com/repository/maven-public/")
+        maven("http://mc3.roselle.vip:609/repository/maven-snapshots/")
+        maven("http://mc3.roselle.vip:609/repository/maven-public/")
         maven("https://maven.aliyun.com/nexus/content/groups/public/")
         maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/")
         maven("https://repo.spongepowered.org/maven")

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

@@ -176,7 +176,11 @@ class ScriptManager {
 
         // unload fileListener
         folders.forEach {
-            it.value.monitor?.stop()
+            try {
+                it.value.monitor?.stop()
+            } catch (t: Throwable) {
+
+            }
         }
 
         val protects = mutableMapOf<String, CustomScript>()

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

@@ -48,7 +48,7 @@ class ExpansionCommand: SimpleCommand(arrayOf("expansion")) {
                     return true
                 }
 
-                val text = args.sliceArray(0..(if (!noReturn) args.size - 1 else args.size - 2)).joinToString("")
+                val text = args.sliceArray(0..(if (!noReturn) args.size - 1 else args.size - 2)).joinToString(" ")
 
                 val result = expansion.eval(text, sender)
 

common/src/main/kotlin/me/scoretwo/fastscript/expansion/javascript/JavaScriptExpansion.kt

@@ -8,6 +8,6 @@ class JavaScriptExpansion: TypeEngineExpansion() {
     override val name = "JavaScript"
     override val sign = "nashorn"
     override val fileSuffix = "js"
-    override val engine: ScriptEngine = NashornScriptEngineFactory().scriptEngine
+    override val engine: ScriptEngine = scriptEngineManager.getEngineByName("nashorn") ?: NashornScriptEngineFactory().scriptEngine
 
 }