Fixed event bugs.

Author: Score2

Diff for: build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "me.scoretwo"
-version = "1.1.0-SNAPSHOT"
+version = "1.1.1-SNAPSHOT"
 description = "FastScript is a Spigot plugin, which can run JavaScript-based scripts more efficiently."
 
 defaultTasks = mutableListOf("ShadowJar", "publishToMavenLocal")

Diff for: common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/ScriptPlugin.kt

@@ -22,8 +22,8 @@ abstract class ScriptPlugin(val plugin: GlobalPlugin): GlobalPlugin {
     abstract fun toOriginalPlayer(player: GlobalPlayer): Any?
     abstract fun toOriginalServer(): Any?
 
-    abstract fun registerListener(any: Any): Boolean
-    abstract fun unregisterListener(any: Any): Boolean
+    abstract fun registerListener(any: Any?): Boolean
+    abstract fun unregisterListener(any: Any?): Boolean
 
     open fun load() {}
     open fun reload() {}

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

@@ -29,7 +29,7 @@ abstract class Script(
     }
     val init = Init(option)
 
-    val listeners = mutableListOf<Any>()
+    val listeners = mutableListOf<Any?>()
 
     fun bindExpansions() =
         mutableListOf<FastScriptExpansion>().also { expansions ->
@@ -50,7 +50,7 @@ abstract class Script(
     fun execute(expansion: FastScriptExpansion?, sender: GlobalSender, main: String = option.main, args: Array<Any?> = arrayOf()): Any? =
         expansion?.execute(this, sender, main, args)
 
-    fun registerListener(any: Any) {
+    fun registerListener(any: Any?) {
         if (!plugin.registerListener(any))
             plugin.server.console.sendMessage(
                 FormatHeader.WARN,
@@ -60,17 +60,17 @@ abstract class Script(
             listeners.add(any)
     }
 
-    fun unregisterListener(any: Any) {
+    fun unregisterListener(any: Any?) {
         if (!plugin.unregisterListener(any))
             plugin.server.console.sendMessage(
                 FormatHeader.WARN,
                 languages["SCRIPT.LISTENERS.FAILED-UNREGISTER"].setPlaceholder("script_name" to name)
             )
         else
-            listeners.add(any)
+            listeners.remove(any)
     }
 
     fun unregisterListeners() {
-        listeners.forEach { unregisterListener(it) }
+        listeners.toMutableList().forEach { unregisterListener(it) }
     }
 }

Diff for: common/src/main/kotlin/me/scoretwo/fastscript/command/FSCommandNexus.kt

@@ -2,7 +2,6 @@ package me.scoretwo.fastscript.command
 
 import me.scoretwo.fastscript.*
 import me.scoretwo.fastscript.command.commands.*
-import me.scoretwo.fastscript.utils.assist
 import me.scoretwo.utils.bukkit.configuration.yaml.patchs.ignoreCase
 import me.scoretwo.utils.command.CommandBuilder
 import me.scoretwo.utils.command.CommandNexus

Diff for: common/src/main/kotlin/me/scoretwo/fastscript/expansion/typeengine/TypeEngineExpansion.kt

@@ -33,6 +33,7 @@ abstract class TypeEngineExpansion: FastScriptExpansion() {
 
         newEngine.put("meta", HashMap<String, Any?>())
         newEngine.put("plugin", plugin.toOriginalPlugin())
+        newEngine.put("script", script)
         newEngine.put("server", plugin.toOriginalServer())
         newEngine.put("globalServer", plugin.server)
         newEngine.put("scriptManager", FastScript.instance.scriptManager)
@@ -52,8 +53,6 @@ abstract class TypeEngineExpansion: FastScriptExpansion() {
         newEngine.put("args", args)
         newEngine.put("utils", assist)
         newEngine.put("util", assist)
-        newEngine.put("registerListener", script::registerListener)
-        newEngine.put("unregisterListener", script::unregisterListener)
         otherBindings.forEach { newEngine.put(it.key, it.value) }
 
         engineScripts[script] = newEngine

Diff for: version-control/FastScript-bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt

@@ -103,15 +103,15 @@ class BukkitPlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun toOriginalServer() = Bukkit.getServer()
 
-    override fun registerListener(any: Any): Boolean {
+    override fun registerListener(any: Any?): Boolean {
         if (any !is Listener) {
             return false
         }
         Bukkit.getPluginManager().registerEvents(any, toBukkitPlugin())
         return true
     }
 
-    override fun unregisterListener(any: Any): Boolean {
+    override fun unregisterListener(any: Any?): Boolean {
         if (any !is Listener) {
             return false
         }

Diff for: version-control/FastScript-bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeePlugin.kt

@@ -35,7 +35,7 @@ class BungeePlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun toOriginalServer(): Any? = ProxyServer.getInstance()
 
-    override fun registerListener(any: Any): Boolean {
+    override fun registerListener(any: Any?): Boolean {
         if (any !is Listener) {
             return false
         }
@@ -44,7 +44,7 @@ class BungeePlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
         return true
     }
 
-    override fun unregisterListener(any: Any): Boolean {
+    override fun unregisterListener(any: Any?): Boolean {
         if (any !is Listener) {
             return false
         }

Diff for: version-control/FastScript-nukkit/src/main/kotlin/me/scoretwo/fastscript/nukkit/NukkitPlugin.kt

@@ -39,15 +39,15 @@ class NukkitPlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun toOriginalServer(): Any = Server.getInstance()
 
-    override fun registerListener(any: Any): Boolean {
+    override fun registerListener(any: Any?): Boolean {
         if (any !is Listener) {
             return false
         }
         Server.getInstance().pluginManager.registerEvents(any, toNukkitPlugin())
         return true
     }
 
-    override fun unregisterListener(any: Any): Boolean {
+    override fun unregisterListener(any: Any?): Boolean {
         if (any !is Listener) {
             return false
         }

Diff for: version-control/FastScript-sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt

@@ -41,15 +41,15 @@ class SpongePlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun toOriginalServer(): Any? = Sponge.getServer()
 
-    override fun registerListener(any: Any) = try {
-        Sponge.getEventManager().registerListeners(toSpongePlugin(), any)
+    override fun registerListener(any: Any?): Boolean = try {
+        Sponge.getEventManager().registerListeners(toSpongePlugin(), any ?: false)
         true
     } catch (t: Throwable) {
         false
     }
 
-    override fun unregisterListener(any: Any) = try {
-        Sponge.getEventManager().unregisterListeners(any)
+    override fun unregisterListener(any: Any?): Boolean = try {
+        Sponge.getEventManager().unregisterListeners(any ?: false)
         true
     } catch (t: Throwable) {
         false

Diff for: version-control/FastScript-velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityPlugin.kt

@@ -37,15 +37,15 @@ class VelocityPlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun toOriginalServer() = proxyServer
 
-    override fun registerListener(any: Any) = try {
-        proxyServer.eventManager.register(toVelocityPlugin(), any)
+    override fun registerListener(any: Any?): Boolean = try {
+        proxyServer.eventManager.register(toVelocityPlugin(), any ?: false)
         true
     } catch (t: Throwable) {
         false
     }
 
-    override fun unregisterListener(any: Any) = try {
-        proxyServer.eventManager.unregisterListener(toVelocityPlugin(), any)
+    override fun unregisterListener(any: Any?): Boolean = try {
+        proxyServer.eventManager.unregisterListener(toVelocityPlugin(), any ?: false)
         true
     } catch (t: Throwable) {
         false