feat: improve CommandMap::dispatch

EndstoneMC · Oct 5, 2024 · b4d9f0d · b4d9f0d
1 parent 62d59c1
commit b4d9f0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/endstone_core/command/command_map.cpp b/src/endstone_core/command/command_map.cpp
@@ -58,6 +58,7 @@ bool EndstoneCommandMap::dispatch(CommandSender &sender, std::string command_lin
 
     const auto *target = getCommand(args[0]);
     if (!target) {
+        sender.sendErrorMessage(Translatable("commands.generic.unknown", {args[0]}));
         return false;
     }
 

diff --git a/src/endstone_core/command/command_wrapper.cpp b/src/endstone_core/command/command_wrapper.cpp
@@ -46,6 +46,10 @@ bool CommandWrapper::execute(CommandSender &sender, const std::vector<std::strin
         full_command, *command_origin, CurrentCmdVersion::Latest,
         [&sender](auto const &err) { sender.sendErrorMessage(err); });
 
+    if (!command) {
+        return false;
+    }
+
     // run the command
     // TODO: we should pass down the sender as well
     CommandOutput output{CommandOutputType::AllOutput};