From 88ffeb5a3bd0f2896caaa486902670f985e2901a Mon Sep 17 00:00:00 2001 From: liujiahua123123 Date: Sat, 10 Aug 2019 12:01:52 +0800 Subject: [PATCH] fix event --- .../main/java/net/mamoe/mirai/event/MiraiEventHook.java | 1 - .../mirai/event/events/server/ServerDisableEvent.java | 1 + .../mirai/event/events/server/ServerEnableEvent.java | 1 + .../net/mamoe/mirai/task/MiraiTaskExceptionHandler.java | 8 ++++++++ .../main/java/net/mamoe/mirai/task/MiraiTaskManager.java | 2 +- .../main/java/net/mamoe/mirai/task/MiraiThreadPool.java | 1 - 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventHook.java b/mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventHook.java index f94a48db3..6d39e2c12 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventHook.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventHook.java @@ -74,5 +74,4 @@ public class MiraiEventHook { return this.valid.test((T)event); } - } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/server/ServerDisableEvent.java b/mirai-core/src/main/java/net/mamoe/mirai/event/events/server/ServerDisableEvent.java index 74a8795bc..5f6c37642 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/event/events/server/ServerDisableEvent.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/event/events/server/ServerDisableEvent.java @@ -3,4 +3,5 @@ package net.mamoe.mirai.event.events.server; import net.mamoe.mirai.event.events.MiraiEvent; public class ServerDisableEvent extends MiraiEvent { + } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/server/ServerEnableEvent.java b/mirai-core/src/main/java/net/mamoe/mirai/event/events/server/ServerEnableEvent.java index b019202ab..3c9f61da9 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/event/events/server/ServerEnableEvent.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/event/events/server/ServerEnableEvent.java @@ -4,4 +4,5 @@ import net.mamoe.mirai.event.events.MiraiEvent; public class ServerEnableEvent extends MiraiEvent { + } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java index d9f513010..5941da70a 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java @@ -7,4 +7,12 @@ public interface MiraiTaskExceptionHandler { static MiraiTaskExceptionHandler byDefault(){ return Throwable::printStackTrace; } + + static MiraiTaskExceptionHandler byIgnore(){ + return a -> {}; + } + + static MiraiTaskExceptionHandler byPrint(){ + return Throwable::printStackTrace; + } } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java index bdcce07e1..653d89f13 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java @@ -126,7 +126,7 @@ public class MiraiTaskManager { }).start(); } - public void deleteTask(Runnable runnable, long interval){ + public void deletingTask(Runnable runnable, long interval){ new Thread(() -> { try{ Thread.sleep(interval); diff --git a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiThreadPool.java b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiThreadPool.java index d5fb75213..1e086d1d5 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiThreadPool.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiThreadPool.java @@ -25,5 +25,4 @@ public class MiraiThreadPool extends ThreadPoolExecutor implements Closeable { } } - }