github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-22 05:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[console] [internal] No longer fast resolve netty to core

Browse Source
This commit is contained in:
Karlatemp 2022-10-29 22:57:56 +08:00
parent d648e56867
commit a47a8e1c2a
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginClassLoader.kt
View File

@ -84,7 +84,7 @@ internal class DynLibClassLoader : URLClassLoader {
if (name.startsWith("java.")) return Class.forName(name, false, JavaSystemPlatformClassLoader) if (name.startsWith("java.")) return Class.forName(name, false, JavaSystemPlatformClassLoader)
// All mirai-core hard-linked should use same version to avoid errors (ClassCastException). // All mirai-core hard-linked should use same version to avoid errors (ClassCastException).
if (name.startsWith("io.netty") || name in AllDependenciesClassesHolder.allclasses) { if (name in AllDependenciesClassesHolder.allclasses) {
return AllDependenciesClassesHolder.appClassLoader.loadClass(name) return AllDependenciesClassesHolder.appClassLoader.loadClass(name)
} }
if (name.startsWith("net.mamoe.mirai.")) { // Avoid plugin classing cheating if (name.startsWith("net.mamoe.mirai.")) { // Avoid plugin classing cheating

3
mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginDependencyDownload.kt
View File

@ -61,8 +61,6 @@ internal class JvmPluginDependencyDownloader(
val artGroup = node.artifact.groupId val artGroup = node.artifact.groupId
val artId = node.artifact.artifactId val artId = node.artifact.artifactId
// mirai used netty-all
if (artGroup == "io.netty") return@DependencyFilter false
if (artGroup == "net.mamoe") { if (artGroup == "net.mamoe") {
if (artId in listOf( if (artId in listOf(
@ -77,6 +75,7 @@ internal class JvmPluginDependencyDownloader(
"mirai-core-utils-android", "mirai-core-utils-android",
"mirai-console", "mirai-console",
"mirai-console-terminal", "mirai-console-terminal",
"mirai-console-frontend-base",
) )
) return@DependencyFilter false ) return@DependencyFilter false
} }