fixed console commands

source/cConsole.cpp

@@ -992,16 +992,7 @@ auto CConsole::Process(std::int32_t c) -> void
 		{
 			if( toFind->second.isEnabled )
 			{
-				cScript *toExecute = JSMapping->GetScript( toFind->second.scriptId );
-				if( toExecute )
-				{
-					// All commands that execute are of the form: command_commandname (to avoid possible clashes)
-#if defined( UOX_DEBUG_MODE )
-					Print( oldstrutil::format( "Executing JS keystroke %c %s\n", c, toFind->second.cmdName.c_str() ));
-#endif
-					JS::Value eventRetVal;
-					[[maybe_unused]] bool retVal = toExecute->CallParticularEvent( toFind->second.cmdName.c_str(), nullptr, 0, &eventRetVal );
-				}
+				messageLoop.NewMessage( MSG_CONSOLEJS, oldstrutil::number( c ));
 				return;
 			}
 		}
@@ -1393,6 +1384,28 @@ auto CConsole::DisplaySettings() -> void
 	(*this) << "   -MessageBoards:   " << cwmWorldState->ServerData()->Directory( CSDDP_MSGBOARD ) << myendl;
 }
 
+//o------------------------------------------------------------------------------------------------o
+//| Function    -   CConsole::ExecuteJSCommand()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose     -   Executes a registered JavaScript console command on the main server thread
+//o------------------------------------------------------------------------------------------------o
+auto CConsole::ExecuteJSCommand( SI32 key ) -> void
+{
+	auto toFind = JSKeyHandler.find( key );
+	if( toFind == JSKeyHandler.end() || !toFind->second.isEnabled )
+		return;
+
+	cScript *toExecute = JSMapping->GetScript( toFind->second.scriptId );
+	if( toExecute != nullptr )
+	{
+#if defined( UOX_DEBUG_MODE )
+		Print( oldstrutil::format( "Executing JS keystroke %c %s\n", key, toFind->second.cmdName.c_str() ));
+#endif
+		JS::Value eventRetVal;
+		[[maybe_unused]] bool retVal = toExecute->CallParticularEvent( toFind->second.cmdName.c_str(), nullptr, 0, &eventRetVal );
+	}
+}
+
 //o------------------------------------------------------------------------------------------------o
 //|	Function	-	void RegisterKey()
 //o------------------------------------------------------------------------------------------------o

source/cConsole.h

@@ -92,6 +92,7 @@ class CConsole
 	auto SetKeyStatus( std::int32_t key, bool isEnabled ) -> void;
 	auto SetFuncStatus( const std::string &key, bool isEnabled ) -> void;
 	auto Registration() -> void;
+	auto ExecuteJSCommand( std::int32_t key ) -> void;
 
 private:
 	auto Reset() -> void;

source/cThreadQueue.h

@@ -19,6 +19,7 @@ enum MessageType
 	MSG_SECTIONBEGIN,
 	MSG_RELOAD,
 	MSG_RESTART,
+	MSG_CONSOLEJS,
 	MSG_COUNT
 };
 

source/uox3.cpp

@@ -941,6 +941,9 @@ auto DoMessageLoop() -> void
 				g_bPerformRestart = true;
 				cwmWorldState->SetKeepRun( false ); // This triggers the main loop to exit
 				break;
+			case MSG_CONSOLEJS:
+				Console.ExecuteJSCommand( oldstrutil::value<SI32>( tVal.data ));
+				break;
 			case MSG_COUNT: 	break;
 			case MSG_WORLDSAVE: cwmWorldState->SetOldTime( 0 ); break;
 			case MSG_PRINT: 	Console << tVal.data << myendl; break;