Merge pull request #505 from EmptyIrony/dev/6.2.0

Bkm016 · web-flow · commit 3aaf187af3f8 · 2024-11-20T23:04:22.000+08:00
在服务器关闭的时候不通知其他插件接管LightInjector
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
@@ -140,7 +140,7 @@ object ProtocolHandler : OpenListener {
      */
     @Awake(LifeCycle.DISABLE)
     private fun onDisable() {
-        if (TabooLib.isStopped()) {
+        if (TabooLib.isStopped() || !isBukkitServerRunning) {
             return
         }
         if (instance != null) {

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ object ProtocolHandler : OpenListener {`
`140`	`140`	`*/`
`141`	`141`	`@Awake(LifeCycle.DISABLE)`
`142`	`142`	`private fun onDisable() {`
`143`		`- if (TabooLib.isStopped()) {`
	`143`	`+ if (TabooLib.isStopped() \|\| !isBukkitServerRunning) {`
`144`	`144`	`return`
`145`	`145`	`}`
`146`	`146`	`if (instance != null) {`