👣 Bugfixed commands

Lygaen · Feb 9, 2024 · 01f4e1e · 01f4e1e
1 parent 60049ad
commit 01f4e1e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/cmd/commands.cpp b/src/cmd/commands.cpp
@@ -48,7 +48,10 @@ CommandsManager::CallCommandError CommandsManager::callCommand(const ISender::Se
     if (type != ISender::SenderType::CONSOLE)
         throw std::runtime_error("Player and console logic not yet implemented");
 
+    // Remove trailing spaces
+    commandString = std::regex_replace(commandString, std::regex(" +$"), "");
     commandString += " ";
+
     size_t pos, startPos = 0;
     std::vector<std::string> splittedString;
     while ((pos = commandString.find(" ", startPos)) != std::string::npos)
@@ -64,6 +67,9 @@ CommandsManager::CallCommandError CommandsManager::callCommand(const ISender::Se
     std::string name = splittedString[0];
     std::vector<std::string> args(splittedString.begin() + 1, splittedString.end());
 
+    if (!std::regex_match(name, nameRegex))
+        return CommandsManager::FORMAT;
+
     if (!commands.contains(name))
         return CommandsManager::COMMAND_NOT_FOUND;