From 1e2b85b7374f7ec36a481f29701ee4265eac156d Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Wed, 15 Apr 2020 00:02:44 +0800
Subject: [PATCH] PluginManager: remove hot reload
---
.../mamoe/mirai/console/plugins/PluginBase.kt | 17 -----------------
.../mirai/console/plugins/PluginManager.kt | 4 +---
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt
index 36a535135..55f1bfd35 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt
@@ -66,13 +66,6 @@ abstract class PluginBase
}
- /**
- * 当Console reload时被调用
- */
- open fun onReload(): Boolean {
- return true
- }
-
/**
* 当任意指令被使用时调用.
*
@@ -150,18 +143,8 @@ abstract class PluginBase
}
}
- internal fun reload(): Boolean {
- try {
- return onReload()
- } catch (e: Exception) {
- logger.error(e)
- }
- return true
- }
-
internal var pluginName: String = ""
-
/**
* Java API Scheduler
*/
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt
index 520cf8413..d06aae337 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt
@@ -339,9 +339,7 @@ object PluginManager {
fun reloadPlugins() {
pluginsSequence.forEach {
- if (it.reload()) {
- disablePlugin(it)
- }
+ it.disable()
}
loadPlugins(false)
}