Skip to content

Commit b9c7956

Browse files
committed
Add onTerminate
1 parent d27eecf commit b9c7956

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/EsuPluginBukkit.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ class EsuPluginBukkit(
209209
fun onDisable() {
210210
disabledHot = byPlugMan()
211211
ServerHotLoadSupport(disabledHot).onDisable()
212-
ModuleManager.registeredModules().filter { it.enabled }.reversed().forEach { ModuleManager.forceDisableModule(it) }
212+
ModuleManager.registeredModules().filter { it.enabled }.reversed().forEach { ModuleManager.removeModule(it) }
213213

214214
for (player in Bukkit.getOnlinePlayers()) {
215215
try {

core/src/main/kotlin/io/github/rothes/esu/core/module/Feature.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ interface Feature<C: ConfigurationPart, L: ConfigurationPart> {
7878
toggleByAvailable()
7979
}
8080

81+
fun onTerminate() {
82+
getFeatures().forEach { it.onTerminate() }
83+
}
84+
8185
class AvailableCheck(
8286
val value: Boolean,
8387
val messageBuilder: ((User) -> MessageData)?

core/src/main/kotlin/io/github/rothes/esu/core/module/ModuleManager.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object ModuleManager {
66

77
private val modules = LinkedHashMap<String, Module<*, *>>()
88

9-
fun registeredModules() = modules.values
9+
fun registeredModules(): List<Module<*, *>> = modules.values.toList()
1010

1111
operator fun get(moduleName: String) = modules[moduleName]
1212

@@ -31,6 +31,7 @@ object ModuleManager {
3131
if (module.enabled) {
3232
forceDisableModule(module)
3333
}
34+
module.onTerminate()
3435
}
3536
}
3637

velocity/src/main/kotlin/io/github/rothes/esu/velocity/EsuPluginVelocity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class EsuPluginVelocity(
173173
enabled = false
174174
disabledHot = byServerUtils()
175175
ServerHotLoadSupport(disabledHot).onDisable()
176-
ModuleManager.registeredModules().filter { it.enabled }.reversed().forEach { ModuleManager.forceDisableModule(it) }
176+
ModuleManager.registeredModules().filter { it.enabled }.reversed().forEach { ModuleManager.removeModule(it) }
177177

178178
for (player in server.allPlayers) {
179179
VelocityUserManager.getCache(player.uniqueId)?.let {

0 commit comments

Comments
 (0)