fix: fix setInterval & setTimeout

Author: ShrBox

src/legacy/api/EventAPI.cpp

@@ -53,8 +53,8 @@
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/item/Item.h"
 #include "mc/world/item/VanillaItemNames.h"
-#include "mc/world/level/BlockSource.h"
 #include "mc/world/level/dimension/Dimension.h"
+#include "ll/api/thread/ServerThreadExecutor.h"
 
 #include <list>
 #include <shared_mutex>
@@ -844,7 +844,7 @@ void InitBasicEventListeners() {
 
             // 处理延迟注册
             ProcessRegCmdQueue();
-        }).launch(ll::thread::ThreadPoolExecutor::getDefault());
+        }).launch(ll::thread::ServerThreadExecutor::getDefault());
     });
 
     // 植入tick
@@ -880,7 +880,7 @@ void InitBasicEventListeners() {
             IF_LISTENED(EVENT_TYPES::onTick) { CallEventUncancelable(EVENT_TYPES::onTick); }
             IF_LISTENED_END(EVENT_TYPES::onTick);
         }
-    }).launch(ll::thread::ThreadPoolExecutor::getDefault());
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 }
 
 bool MoneyBeforeEventCallback(LLMoneyEvent type, std::string from, std::string to, long long value) {

src/legacy/api/PlayerAPI.cpp

@@ -3063,8 +3063,9 @@ Local<Value> PlayerClass::getAbilities(const Arguments&) {
         Player* player = get();
         if (!player) return Local<Value>();
 
-        CompoundTag tag = CompoundTag();
+        CompoundTag tag;
         player->save(tag);
+
         try {
             return Tag2Value(&tag.at("abilities").get<CompoundTag>(), true);
         } catch (...) {

src/legacy/engine/LocalShareData.cpp

@@ -1,6 +1,5 @@
 #include "engine/LocalShareData.h"
 
-#include <ll/api/thread/ThreadPoolExecutor.h>
 #include <mutex>
 
 // DLL本地共享数据

src/legacy/engine/LocalShareData.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "api/APIHelp.h"
+#include "ll/api/thread/ThreadPoolExecutor.h"
 
-#include <ll/api/thread/ThreadPoolExecutor.h>
 #include <map>
 #include <mutex>
 #include <string>

src/legacy/engine/TimeTaskSystem.cpp

@@ -4,7 +4,7 @@
 #include "engine/EngineManager.h"
 #include "engine/EngineOwnData.h"
 #include "ll/api/service/GamingStatus.h"
-#include "ll/api/thread/ThreadPoolExecutor.h"
+#include "ll/api/thread/ServerThreadExecutor.h"
 #include "ll/api/coro/CoroTask.h"
 
 #include <ll/api/service/ServerInfo.h>
@@ -77,7 +77,7 @@ int NewTimeout(Local<Function> func, std::vector<Local<Value>> paras, int timeou
         }
         TIMETASK_CATCH("setTimeout-Function");
         ClearTimeTask(tid);
-    }).launch(ll::thread::ThreadPoolExecutor::getDefault());
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 
     std::lock_guard lock(locker);
     timeTaskMap[tid] = std::move(data);
@@ -115,7 +115,7 @@ int NewTimeout(Local<String> func, int timeout) {
             }
         }
         TIMETASK_CATCH("setTimeout-String");
-    }).launch(ll::thread::ThreadPoolExecutor::getDefault());
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 
     std::lock_guard lock(locker);
     timeTaskMap[tid] = std::move(data);
@@ -152,7 +152,7 @@ int NewInterval(Local<Function> func, std::vector<Local<Value>> paras, int timeo
             }
             TIMETASK_CATCH("setInterval-Function");
         }
-    }).launch(ll::thread::ThreadPoolExecutor::getDefault());
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 
     std::lock_guard lock(locker);
     timeTaskMap[tid] = std::move(data);
@@ -199,7 +199,7 @@ int NewInterval(Local<String> func, int timeout) {
             }
             TIMETASK_CATCH("setInterval-String");
         }
-    }).launch(ll::thread::ThreadPoolExecutor::getDefault());
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 
     std::lock_guard lock(locker);
     timeTaskMap[tid] = std::move(data);

src/legacy/legacyapi/command/DynamicCommand.cpp

@@ -528,9 +528,13 @@ DynamicCommand::preSetup(CommandRegistry& registry, std::unique_ptr<class Dynami
         if (!commandInstance->alias_.empty()) registry.registerAlias(commandInstance->name_, commandInstance->alias_);
         auto builder = commandInstance->builder->get();
         for (auto& overload : commandInstance->overloads) {
-            auto& si                                                    = *registry.findCommand(commandInstance->name_);
-            si.overloads.emplace_back(CommandVersion{}, builder).params = commandInstance->buildOverload(overload);
-            registry.registerOverloadInternal(si, si.overloads.back());
+            auto si = registry.findCommand(commandInstance->name_);
+            if (!si) {
+                OutputError(name);
+                return nullptr;
+            }
+            si->overloads.emplace_back(CommandVersion{}, builder).params = commandInstance->buildOverload(overload);
+            registry.registerOverloadInternal(*si, si->overloads.back());
         }
         // commandInstance->overloads.clear();
         auto res = dynamicCommandInstances.emplace(commandInstance->name_, std::move(commandInstance));

src/legacy/legacyapi/command/DynamicCommand.h

@@ -426,8 +426,8 @@ class DynamicCommand : public Command {
                 &CommandRegistry::parse<T>,
                 name,
                 getCommandParameterDataType<type>(),
-                description == "" ? nullptr : description.data(),
-                identifier == "" ? nullptr : identifier.data(),
+                description.empty() ? nullptr : description.data(),
+                identifier.empty() ? nullptr : identifier.data(),
                 (int)offset,
                 optional,
                 (int)offset + std::max(8, (int)sizeof(T)),
@@ -453,7 +453,7 @@ class DynamicCommand : public Command {
             std::string const&     identifer       = "",
             CommandParameterOption parameterOption = CommandParameterOption::None
         )
-        : ParameterData(name, type, (std::string const&)enumOptions, identifer, parameterOption){};
+        : ParameterData(name, type, (std::string const&)enumOptions, identifer, parameterOption) {};
     };
 
     using callback_fn = std::function<void(
@@ -581,7 +581,7 @@ class DynamicCommandInstance {
     struct ParameterIndex {
         DynamicCommandInstance* instance;
         size_t                  index;
-        ParameterIndex(DynamicCommandInstance* instance, size_t index) : instance(instance), index(index){};
+        ParameterIndex(DynamicCommandInstance* instance, size_t index) : instance(instance), index(index) {};
         operator size_t() const { return index; }
         DynamicCommand::ParameterData& operator->() { return instance->parameterDatas.at(index); }
         bool                           isValid() const {

src/legacy/main/NodeJsHelper.cpp

@@ -13,7 +13,7 @@
 #include "ll/api/coro/CoroTask.h"
 #include "ll/api/io/FileUtils.h"
 #include "ll/api/service/ServerInfo.h"
-#include "ll/api/thread/ThreadPoolExecutor.h"
+#include "ll/api/thread/ServerThreadExecutor.h"
 #include "ll/api/utils/StringUtils.h"
 #include "main/Global.h"
 #include "uv/uv.h"
@@ -180,7 +180,7 @@ bool loadPluginCode(script::ScriptEngine* engine, std::string entryScriptPath, s
                     }
                 }
             }
-        ).launch(ll::thread::ThreadPoolExecutor::getDefault());
+        ).launch(ll::thread::ServerThreadExecutor::getDefault());
 
         return true;
     } catch (...) {