[6.2.0] 优化 "nmsProxy" 函数

TabooLib · Oct 16, 2024 · f99bcfa · f99bcfa
1 parent 5ba69b7
commit f99bcfa
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=taboolib
-version=6.2.0-beta18
+version=6.2.0-beta19
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true

diff --git a/module/bukkit-nms/src/main/kotlin/taboolib/module/nms/MinecraftServerUtil.kt b/module/bukkit-nms/src/main/kotlin/taboolib/module/nms/MinecraftServerUtil.kt
@@ -87,8 +87,29 @@ fun <T> nmsProxy(clazz: Class<T>, bind: String = "{name}Impl", parent: List<Stri
     if (nmsProxyInstanceMap.containsKey(key)) {
         return nmsProxyInstanceMap[key] as T
     }
+    // 获取合适的构造函数并创建实例
+    fun <T> createInstance(clazz: Class<T>, parameters: Array<out Any>): T {
+        // 遍历所有构造函数
+        val constructors = clazz.declaredConstructors
+        for (constructor in constructors) {
+            val parameterTypes = constructor.parameterTypes
+            if (parameterTypes.size != parameters.size) continue
+            var isMatch = true
+            for (i in parameterTypes.indices) {
+                if (!parameterTypes[i].isAssignableFrom(parameters[i].javaClass)) {
+                    isMatch = false
+                    break
+                }
+            }
+            if (isMatch) {
+                constructor.isAccessible = true
+                return constructor.newInstance(*parameters) as T
+            }
+        }
+        throw NoSuchMethodException("没有找到匹配的构造函数: ${clazz.name}")
+    }
     // 获取代理类并实例化
-    val newInstance = nmsProxyClass(clazz, bind, parent).getDeclaredConstructor(*parameter.map { it.javaClass }.toTypedArray()).newInstance(*parameter)
+    val newInstance = createInstance(nmsProxyClass(clazz, bind, parent), parameter)
     // 缓存实例
     nmsProxyInstanceMap[key] = newInstance!!
     return newInstance

diff --git a/module/bukkit-nms/src/main/kotlin/taboolib/module/nms/ProtocolHandler.kt b/module/bukkit-nms/src/main/kotlin/taboolib/module/nms/ProtocolHandler.kt
@@ -138,7 +138,7 @@ object ProtocolHandler : OpenListener {
      * 卸载 LightInjector，需要其他插件立刻顶替
      */
     @Awake(LifeCycle.DISABLE)
-    private fun onDisable() {
+    private fun onDisable(s: String) {
         if (TabooLib.isStopped()) {
             return
         }
@@ -147,8 +147,14 @@ object ProtocolHandler : OpenListener {
             instance?.close()
             // 通知其他插件立刻接管
             val next = containers.firstOrNull { it.name != pluginId }
-            if (next != null && next.call(PACKET_LISTENER_EJECT, arrayOf()).isSuccessful) {
-                debug("LightInjector closed, current packet listener is taken over by ${next.name}.")
+            if (next != null) {
+                try {
+                    if (next.call(PACKET_LISTENER_EJECT, arrayOf()).isSuccessful) {
+                        debug("LightInjector closed, current packet listener is taken over by ${next.name}.")
+                    }
+                } catch (ex: IllegalStateException) {
+                    if (ex.message != "zip file closed") ex.printStackTrace()
+                }
             }
         }
     }