Skip to content

Commit afc7c93

Browse files
authored
Merge pull request #614 from TheFloodDragon/dev/6.2.3
修复隔离模式下无法访问 OpenAPI 的问题
2 parents f5d62cb + 29cf2b8 commit afc7c93

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

common/src/main/java/taboolib/common/classloader/IsolatedClassLoader.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ public IsolatedClassLoader(URL[] urls, ClassLoader parent) {
5353
excludedClasses.add("taboolib.common.ClassAppender$Callback");
5454

5555
// 其他插件访问
56-
excludedClasses.add("taboolib.common.OpenAPI");
5756
excludedClasses.add("taboolib.common.platform.Plugin");
57+
excludedClasses.add("taboolib.common.OpenAPI");
58+
excludedClasses.add("taboolib.common.OpenListener");
59+
excludedClasses.add("taboolib.common.OpenResult");
5860

5961
// 交叉访问
6062
excludedClasses.add("taboolib.common.LifeCycle");

platform/platform-bukkit-impl/src/main/kotlin/taboolib/platform/type/BukkitContainer.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package taboolib.platform.type
22

33
import org.bukkit.plugin.Plugin
4-
import org.tabooproject.reflex.Reflex.Companion.invokeLocalMethod
54
import org.tabooproject.reflex.Reflex.Companion.invokeMethod
65
import taboolib.common.OpenContainer
76
import taboolib.common.OpenResult
87
import taboolib.common.io.groupId
9-
import taboolib.common.io.isDebugMode
108
import taboolib.common.io.taboolibId
119

1210
/**
@@ -22,8 +20,8 @@ class BukkitContainer(val plugin: Plugin) : OpenContainer {
2220
private val api = try {
2321
Class.forName("${plugin::class.java.groupId}.${taboolibId}.common.OpenAPI")
2422
} catch (ex: ClassNotFoundException) {
25-
// 在调试模式下输出错误信息
26-
if (isDebugMode) ex.printStackTrace()
23+
// 总是输出错误信息
24+
ex.printStackTrace()
2725
null
2826
}
2927

@@ -39,7 +37,8 @@ class BukkitContainer(val plugin: Plugin) : OpenContainer {
3937
return try {
4038
OpenResult.cast(api?.invokeMethod<Any>("call", name, args, isStatic = true, remap = false) ?: error("OpenAPI not found in ${getName()}"))
4139
} catch (ex: NoSuchMethodException) {
42-
if (isDebugMode) ex.printStackTrace()
40+
// 总是输出错误信息
41+
ex.printStackTrace()
4342
OpenResult.failed()
4443
}
4544
}

0 commit comments

Comments
 (0)