fix: task disable error

Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
2020-11-13 09:40:34 +08:00
parent c64d167893
commit d769a9c8ca
11 changed files with 122 additions and 70 deletions

View File

@ -1,21 +1,25 @@
import { MiaoScriptConsole } from '@ccms/api'
let Nukkit = base.getInstance().getServer();
let Nukkit = base.getInstance().getServer()
let LogLevel = Java.type('cn.nukkit.utils.LogLevel')
let CommandSender = Java.type('cn.nukkit.command.CommandSender')
export class NukkitConsole extends MiaoScriptConsole {
sender(sender, ...args) {
if (!(sender instanceof CommandSender)) {
this.error(`First parameter ${sender} not instanceof cn.nukkit.command.CommandSender can't send message!`)
return;
return
}
if (Object.prototype.toString.call(args[0]) === "[object Array]") {
args[0].forEach(line => sender.sendMessage(this.prefix + line))
} else {
sender.sendMessage(this.prefix + args.join(' '));
sender.sendMessage(this.prefix + args.join(' '))
}
}
console(...args: string[]): void {
this.sender(Nukkit.getConsoleSender(), args.join(' '));
this.sender(Nukkit.getConsoleSender(), args.join(' '))
}
error(...args: any[]) {
this.logger.log(LogLevel.ERROR, this.name + args.join(' '))
}
}

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)
}
}
}