fix: fix #71

Author: ShrBox

src/legacy/api/EventAPI.cpp

@@ -838,7 +838,7 @@ void EnableEventListener(int eventId) {
     }
 }
 
-ll::schedule::GameTickScheduler eventScheduler;
+ll::schedule::ServerTimeScheduler eventScheduler;
 
 void InitBasicEventListeners() {
     using namespace ll::event;

src/legacy/api/SystemAPI.cpp

@@ -27,7 +27,7 @@ ClassDefine<void> SystemClassBuilder = defineClass("system")
                                            .function("newProcess", &SystemClass::newProcess)
                                            .build();
 
-ll::schedule::GameTickScheduler systemScheduler;
+ll::schedule::ServerTimeScheduler systemScheduler;
 // From LiteLoaderBDSv2 llapi/utils/WinHelper.cpp
 bool NewProcess(
     const std::string&                    process,

src/legacy/engine/TimeTaskSystem.cpp

@@ -4,6 +4,7 @@
 #include "engine/EngineManager.h"
 #include "engine/EngineOwnData.h"
 #include "engine/MessageSystem.h"
+#include "ll/api/schedule/Scheduler.h"
 #include "ll/api/schedule/scheduler.h"
 
 #include <chrono>
@@ -15,9 +16,9 @@
 #include <shared_mutex>
 #include <vector>
 
-std::atomic_uint                timeTaskId = 0;
-std::mutex                      locker;
-ll::schedule::GameTickScheduler taskScheduler;
+std::atomic_uint                  timeTaskId = 0;
+std::mutex                        locker;
+ll::schedule::ServerTimeScheduler taskScheduler;
 struct TimeTaskData {
     uint64                        task;
     script::Global<Function>      func;
@@ -69,7 +70,7 @@ std::unordered_map<int, TimeTaskData> timeTaskMap;
 //     taskScheduler.add<ll::schedule::DelayTask>(
 //         std::chrono::milliseconds(timeout),
 //         [engine, func = std::move(func), paras = std::move(tmp)]() {
-//             if ((ll::getServerStatus() != ll::ServerStatus::Running)) return;
+//             if ((ll::getServerStatus() == ll::ServerStatus::Stopping)) return;
 //             if (!EngineManager::isValid(engine)) return;
 //             EngineScope enter(engine);
 //             if (paras.empty()) {
@@ -97,7 +98,7 @@ int NewTimeout(Local<Function> func, vector<Local<Value>> paras, int timeout) {
                         std::chrono::milliseconds(timeout),
                         [engine{EngineScope::currentEngine()}, id{tid}]() {
                             try {
-                                if ((ll::getServerStatus() != ll::ServerStatus::Running)) return;
+                                if ((ll::getServerStatus() == ll::ServerStatus::Stopping)) return;
                                 if (!EngineManager::isValid(engine)) return;
                                 // lock after enter EngineScope to prevent deadlock
                                 EngineScope  scope(engine);
@@ -144,7 +145,7 @@ int NewTimeout(Local<String> func, int timeout) {
                         std::chrono::milliseconds(timeout),
                         [engine{EngineScope::currentEngine()}, id{tid}]() {
                             try {
-                                if ((ll::getServerStatus() != ll::ServerStatus::Running)) return;
+                                if ((ll::getServerStatus() == ll::ServerStatus::Stopping)) return;
                                 if (!EngineManager::isValid(engine)) return;
                                 EngineScope  scope(engine);
                                 TimeTaskData taskData;
@@ -184,7 +185,7 @@ int NewInterval(Local<Function> func, vector<Local<Value>> paras, int timeout) {
                         std::chrono::milliseconds(timeout),
                         [engine{EngineScope::currentEngine()}, id{tid}]() {
                             try {
-                                if ((ll::getServerStatus() != ll::ServerStatus::Running)) return;
+                                if ((ll::getServerStatus() == ll::ServerStatus::Stopping)) return;
                                 if (!EngineManager::isValid(engine)) {
                                     ClearTimeTask(id);
                                     return;
@@ -235,7 +236,7 @@ int NewInterval(Local<String> func, int timeout) {
                         std::chrono::milliseconds(timeout),
                         [engine{EngineScope::currentEngine()}, id{tid}]() {
                             try {
-                                if ((ll::getServerStatus() != ll::ServerStatus::Running)) return;
+                                if ((ll::getServerStatus() == ll::ServerStatus::Stopping)) return;
                                 if (!EngineManager::isValid(engine)) {
                                     ClearTimeTask(id);
                                     return;

src/legacy/main/NodeJsHelper.cpp

@@ -21,7 +21,7 @@
 #include <uv/uv.h>
 #include <v8/v8.h>
 
-ll::schedule::GameTickScheduler nodeScheduler;
+ll::schedule::ServerTimeScheduler nodeScheduler;
 using ll::chrono_literals::operator""_tick;
 
 // pre-declare