circlecloud/ms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: task disable error

Browse Source 
Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
MiaoWoo
2020-11-13 09:40:34 +08:00
parent 6dcc56b0e5
commit a76f9e8b50
11 changed files with 122 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/nukkit/src/task.ts
View File

@@ -5,17 +5,14 @@ const NukkitRunnable = Java.type('cn.nukkit.scheduler.NukkitRunnable')
@provideSingleton(task.TaskManager)
export class NukkitTaskManager extends task.TaskManager {
@inject(plugin.PluginInstance)
private pluginInstance: any
create0(func: Function): task.Task {
return new NukkitTask(this.pluginInstance, func)
create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
return new NukkitTask(owner, func, id)
}
callSyncMethod(func: Function): any {
return func()
}
disable0() {
base.getInstance().getServer().getScheduler().cancelTask(this.pluginInstance)
base.getInstance().getServer().getScheduler().cancelTask(base.getInstance())
}
}
@@ -24,9 +21,9 @@ export class NukkitTask extends task.Task {
let run = new NukkitRunnable({ run: () => this.run(...args) })
let funcName = `runTask${this.interval ? 'Timer' : 'Later'}${this.isAsync ? 'Asynchronously' : ''}`
if (this.interval) {
return run[funcName](this.plugin, this.laterTime, this.interval)
return run[funcName](base.getInstance(), this.laterTime, this.interval)
} else {
return run[funcName](this.plugin, this.laterTime)
return run[funcName](base.getInstance(), this.laterTime)
}
}
}