evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only print Lua command result if it's not null

Browse Source
This commit is contained in:
Kae 2024-07-27 13:58:14 +10:00
parent f95fbc3a37
commit 9e7a2e9bb9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/opensb/scripts/opensb/player/commands.lua
View File

@ -21,6 +21,8 @@ command("run", function(src)
local success, result = pcall(result) local success, result = pcall(result)
if not success then if not success then
return "^#f00;error: " .. result return "^#f00;error: " .. result
elseif result == nil then
return nil
else else
local success, printed = pcall(sb.printJson, result) local success, printed = pcall(sb.printJson, result)
if not success then if not success then

9
source/frontend/StarClientCommandProcessor.cpp
View File

@ -91,9 +91,12 @@ StringList ClientCommandProcessor::handleCommand(String const& commandLine) {
} }
} else { } else {
auto player = m_universeClient->mainPlayer(); auto player = m_universeClient->mainPlayer();
if (auto messageResult = player->receiveMessage(connectionForEntity(player->entityId()), "/" + command, { allArguments })) if (auto messageResult = player->receiveMessage(connectionForEntity(player->entityId()), "/" + command, {allArguments})) {
result.append(messageResult->isType(Json::Type::String) ? *messageResult->stringPtr() : messageResult->repr(1, true)); if (messageResult->isType(Json::Type::String))
else result.append(*messageResult->stringPtr());
else if (!messageResult->isNull())
result.append(messageResult->repr(1, true));
} else
m_universeClient->sendChat(commandLine, ChatSendMode::Broadcast); m_universeClient->sendChat(commandLine, ChatSendMode::Broadcast);
} }
return result; return result;