fix: fix onServerStarted & old command registration

LiteLDev · Jan 23, 2024 · 83796f9 · 83796f9
1 parent d781399
commit 83796f9
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 59 deletions.
diff --git a/src/api/EventAPI.cpp b/src/api/EventAPI.cpp
@@ -1,6 +1,7 @@
 #include "api/EventAPI.h"
 
 #include "../engine/LocalShareData.h"
+#include "../engine/TimeTaskSystem.h"
 #include "../main/BuiltinCommands.h"
 #include "CommandCompatibleAPI.h"
 #include "EntityAPI.h"
@@ -1441,24 +1442,6 @@ void InitBasicEventListeners() {
     //         return true;
     //       });
 
-    //   // For RegisterCmd...
-    //   Event::RegCmdEvent::subscribe([](const RegCmdEvent &ev) {
-    //     isCmdRegisterEnabled = true;
-
-    //     // 处理延迟注册
-    //     ProcessRegCmdQueue();
-    //     return true;
-    //   });
-
-    //   // ===== onServerStarted =====
-    //   Event::ServerStartedEvent::subscribe([](Event::ServerStartedEvent ev) {
-    //     IF_LISTENED(EVENT_TYPES::onServerStarted) {
-    //       CallEventDelayed(EVENT_TYPES::onServerStarted);
-    //     }
-    //     IF_LISTENED_END(EVENT_TYPES::onServerStarted);
-    //     return true;
-    //   });
-
     // 植入tick
     ll::schedule::ServerTimeScheduler scheduler;
     scheduler.add<ll::schedule::RepeatTask>(ll::chrono::ticks(1), []() {
@@ -1516,6 +1499,16 @@ page, totalPages, Boolean::newBoolean(shouldDropBook));
 }
 */
 
+bool LLSECallServerStartedEvent() {
+    IF_LISTENED(EVENT_TYPES::onServerStarted) { CallEventDelayed(EVENT_TYPES::onServerStarted); }
+    IF_LISTENED_END(EVENT_TYPES::onServerStarted);
+    isCmdRegisterEnabled = true;
+
+    // 处理延迟注册
+    ProcessRegCmdQueue();
+    return true;
+}
+
 bool MoneyBeforeEventCallback(LLMoneyEvent type, xuid_t from, xuid_t to, money_t value) {
     switch (type) {
     case LLMoneyEvent::Add: {

diff --git a/src/api/EventAPI.h b/src/api/EventAPI.h
@@ -15,4 +15,6 @@ bool LLSECallEventsOnHotUnload(ScriptEngine* engine);
 //////////////////// Callback ////////////////////
 
 bool MoneyBeforeEventCallback(LLMoneyEvent type, xuid_t from, xuid_t to, money_t value);
-bool MoneyEventCallback(LLMoneyEvent type, xuid_t from, xuid_t to, money_t value);
+bool MoneyEventCallback(LLMoneyEvent type, xuid_t from, xuid_t to, money_t value);
+
+bool LLSECallServerStartedEvent();
diff --git a/src/engine/TimeTaskSystem.cpp b/src/engine/TimeTaskSystem.cpp
@@ -25,11 +25,11 @@ struct TimeTaskData {
     script::Global<String>                                       code;
     ScriptEngine*                                                engine;
     inline void                                                  swap(TimeTaskData& rhs) {
-                                                         std::swap(rhs.task, task);
-                                                         std::swap(rhs.engine, engine);
-                                                         rhs.code.swap(code);
-                                                         rhs.paras.swap(paras);
-                                                         rhs.func.swap(func);
+        std::swap(rhs.task, task);
+        std::swap(rhs.engine, engine);
+        rhs.code.swap(code);
+        rhs.paras.swap(paras);
+        rhs.func.swap(func);
     }
 };
 std::unordered_map<int, TimeTaskData> timeTaskMap;
@@ -55,38 +55,36 @@ std::unordered_map<int, TimeTaskData> timeTaskMap;
 
 //////////////////// API ////////////////////
 
-// void NewTimeout_s(script::Global<Function> func, vector<script::Local<Value>>
-// paras, int timeout, ScriptEngine* engine)
-//{
-//     std::vector<script::Global<Value>> tmp;
-//     if (paras.size() > 0) {
-//         EngineScope enter(engine);
-//         for (auto& para : paras)
-//             tmp.emplace_back(std::move(para));
-//     }
-//     Schedule::delay(
-//         [engine, func = std::move(func), paras = std::move(tmp)]() {
-//             if ((ll::getServerStatus() != ll::ServerStatus::Running))
-//                 return;
-//             if (!EngineManager::isValid(engine))
-//                 return;
-//             EngineScope enter(engine);
-//             if (paras.empty()) {
-//                 func.get().call();
-//             }
-//             else
-//             {
-//                 vector<Local<Value>> args;
-//                 for (auto& para : paras)
-//                     if (para.isEmpty())
-//                         return;
-//                     else
-//                         args.emplace_back(para.get());
-//                 func.get().call({}, args);
-//             }
-//         },
-//         timeout / 50);
-// }
+void NewTimeout_s(
+    script::Global<Function>     func,
+    vector<script::Local<Value>> paras,
+    int                          timeout,
+    ScriptEngine*                engine
+) {
+    std::vector<script::Global<Value>> tmp;
+    if (paras.size() > 0) {
+        EngineScope enter(engine);
+        for (auto& para : paras) tmp.emplace_back(std::move(para));
+    }
+    ll::schedule::ServerTimeScheduler scheduler;
+    scheduler.add<ll::schedule::DelayTask>(
+        ll::chrono::ticks(timeout / 50),
+        [engine, func = std::move(func), paras = std::move(tmp)]() {
+            if ((ll::getServerStatus() != ll::ServerStatus::Running)) return;
+            if (!EngineManager::isValid(engine)) return;
+            EngineScope enter(engine);
+            if (paras.empty()) {
+                func.get().call();
+            } else {
+                vector<Local<Value>> args;
+                for (auto& para : paras)
+                    if (para.isEmpty()) return;
+                    else args.emplace_back(para.get());
+                func.get().call({}, args);
+            }
+        }
+    );
+}
 
 int NewTimeout(Local<Function> func, vector<Local<Value>> paras, int timeout) {
     int          tid = ++timeTaskId;

diff --git a/src/engine/TimeTaskSystem.h b/src/engine/TimeTaskSystem.h
@@ -6,8 +6,12 @@
 
 ///////////////////////// API /////////////////////////
 
-// void NewTimeout_s(script::Global<Function> func, vector<script::Local<Value>> paras, int timeout, ScriptEngine*
-// engine = EngineScope::currentEngine());
+void NewTimeout_s(
+    script::Global<Function>     func,
+    vector<script::Local<Value>> paras,
+    int                          timeout,
+    ScriptEngine*                engine = EngineScope::currentEngine()
+);
 
 int  NewTimeout(Local<Function> func, std::vector<Local<Value>> paras, int timeout);
 int  NewTimeout(Local<String> func, int timeout);
@@ -18,4 +22,4 @@ bool ClearTimeTask(int id);
 
 ///////////////////////// Func /////////////////////////
 
-void LLSERemoveTimeTaskData(ScriptEngine* engine);
+void LLSERemoveTimeTaskData(ScriptEngine* engine);