fix: fix onConsoleCmd

LiteLDev · Jan 23, 2024 · 323a2a1 · 323a2a1
1 parent 4918313
commit 323a2a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/api/CommandCompatibleAPI.cpp b/src/api/CommandCompatibleAPI.cpp
@@ -43,10 +43,8 @@ void LLSERegisterNewCmd(bool isPlayerCmd, string cmd, const string& describe, in
         localShareData->playerCmdCallbacks[cmd] = {EngineScope::currentEngine(), level, script::Global<Function>(func)};
         globalShareData->playerRegisteredCmd[cmd] = LLSE_BACKEND_TYPE;
     } else {
-        localShareData->consoleCmdCallbacks[cmd] = {
-            EngineScope::currentEngine(),
-            level,
-            script::Global<Function>(func)};
+        localShareData
+            ->consoleCmdCallbacks[cmd] = {EngineScope::currentEngine(), level, script::Global<Function>(func)};
         globalShareData->consoleRegisteredCmd[cmd] = LLSE_BACKEND_TYPE;
     }
 
@@ -125,7 +123,7 @@ void ProcessRegCmdQueue() {
     toRegCmdQueue.clear();
 }
 
-string LLSEFindCmdReg(bool isPlayerCmd, const string& cmd, vector<string>& receiveParas, bool* fromOtherEngine) {
+std::string LLSEFindCmdReg(bool isPlayerCmd, const string& cmd, vector<string>& receiveParas, bool* fromOtherEngine) {
     std::unordered_map<std::string, std::string>& registeredMap =
         isPlayerCmd ? globalShareData->playerRegisteredCmd : globalShareData->consoleRegisteredCmd;
     for (auto& [prefix, fromEngine] : registeredMap) {

diff --git a/src/api/EventAPI.cpp b/src/api/EventAPI.cpp
@@ -20,6 +20,7 @@
 #include "ll/api/schedule/Scheduler.h"
 #include "ll/api/schedule/Task.h"
 #include "ll/api/service/Bedrock.h"
+#include "ll/api/utils/StringUtils.h"
 #include "main/Global.h"
 #include "mc/server/commands/CommandOriginType.h"
 #include "mc/world/actor/player/Player.h"
@@ -29,8 +30,6 @@
 #include <list>
 #include <shared_mutex>
 
-
-
 //////////////////// Listeners ////////////////////
 
 enum class EVENT_TYPES : int {
@@ -1363,9 +1362,9 @@ void InitBasicEventListeners() {
     //     }
     //     return true;
     //   });
-    bus.emplaceListener<ExecuteCommandEvent>([](ExecuteCommandEvent& ev) {
+    bus.emplaceListener<ExecutingCommandEvent>([](ExecutingCommandEvent& ev) {
         if (ev.commandContext().getCommandOrigin().getOriginType() == CommandOriginType::DedicatedServer) {
-            string cmd = ev.commandContext().mCommand;
+            std::string cmd = ev.commandContext().mCommand.erase(0, 1);
 
             if (!ProcessDebugEngine(cmd)) return false;
 #ifdef LLSE_BACKEND_NODEJS
@@ -1374,9 +1373,9 @@ void InitBasicEventListeners() {
             if (!PythonHelper::processConsolePipCmd(ev.mCommand)) return false;
 #endif
             // CallEvents
-            vector<string> paras;
-            bool           isFromOtherEngine = false;
-            string         prefix            = LLSEFindCmdReg(false, cmd, paras, &isFromOtherEngine);
+            std::vector<std::string> paras;
+            bool                     isFromOtherEngine = false;
+            std::string              prefix            = LLSEFindCmdReg(false, cmd, paras, &isFromOtherEngine);
 
             if (!prefix.empty()) {
                 // LLSE Registered Cmd

diff --git a/src/main/BuiltinCommands.cpp b/src/main/BuiltinCommands.cpp
@@ -25,7 +25,7 @@ extern ScriptEngine* debugEngine;
 bool ProcessDebugEngine(const std::string& cmd) {
 #ifdef LLSE_BACKEND_PYTHON
     // process python debug seperately
-    return PythonHelper::processPythonDebugEngine(cmd);
+    return PythonHelper::processPythonDebugEngine(cmd;
 #endif
     if (isInConsoleDebugMode) {
         EngineScope enter(debugEngine);