Merge pull request #16 from astorks/dev

Dev -> Master v1.1.8

Author: astorks

.gitignore

@@ -42,4 +42,5 @@ node_modules/
 .rpt2_cache/
 libraries/tools/kotlin-test-nodejs-runner/lib/
 local.properties
-lib
+lib
+libraries

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.pixlfox.scriptablemc"
-version = "1.1.7"
+version = "1.1.8"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8

src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginContext.kt

@@ -128,17 +128,17 @@ class ScriptablePluginContext(private val engine: ScriptablePluginEngine, val pl
         commandMapField.isAccessible = true
         val commandMap = commandMapField.get(Bukkit.getServer()) as CommandMap
 
-        val knownCommandsField = commandMap.javaClass.superclass.getDeclaredField("knownCommands")
-        knownCommandsField.isAccessible = true
-        val knownCommands = knownCommandsField.get(commandMap) as HashMap<*, *>
+        val knownCommandsField = commandMap.javaClass.superclass.declaredFields.firstOrNull { it.name.equals("knownCommands", false) }
+        knownCommandsField?.isAccessible = true
+        val knownCommands = knownCommandsField?.get(commandMap) as HashMap<*, *>?
 
         command.unregister(commandMap)
 
-        knownCommands.remove(command.name)
+        knownCommands?.remove(command.name)
         commands.remove(command)
 
         commandMapField.isAccessible = false
-        knownCommandsField.isAccessible = false
+        knownCommandsField?.isAccessible = false
     }
 
     fun getFile(pathName: String): FileWrapper {

src/main/resources/plugin.yml

@@ -1,6 +1,7 @@
 name: ScriptableMC
 description: 'Run JavaScript/TypeScript plugins for Bukkit/Spigot/Paper Minecraft 1.15'
-version: '1.1.7'
+version: '1.1.8'
+api-version: '1.13'
 author: AStorks
 main: com.pixlfox.scriptablemc.ScriptablePluginMain
 depend: []