From eeec292238c67a84c250a87ac8494a3f8740061c Mon Sep 17 00:00:00 2001
From: Marvin D <41352111+IcePixelx@users.noreply.github.com>
Date: Fri, 19 Aug 2022 22:25:26 +0200
Subject: [PATCH] Don't need to run CBuf_Execute. Game does it itself.

* How did I forget to remember that for almost a year..
* Connect and disconnect commands also fixed now.
---
 r5dev/common/opcodes.cpp            | 2 +-
 r5dev/gameui/IBrowser.cpp           | 2 +-
 r5dev/gameui/IConsole.cpp           | 2 +-
 r5dev/networksystem/listmanager.cpp | 2 +-
 r5dev/windows/console.cpp           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/r5dev/common/opcodes.cpp b/r5dev/common/opcodes.cpp
index a3429d8c..43ef9a60 100644
--- a/r5dev/common/opcodes.cpp
+++ b/r5dev/common/opcodes.cpp
@@ -361,7 +361,7 @@ void RuntimePtc_Init() /* .TEXT */
 #ifndef CLIENT_DLL
 	FairFight_Init.Offset(0x0).FindPatternSelf("0F 87", CMemory::Direction::DOWN, 200).Patch({ 0x0F, 0x85 });                      // JA  --> JNZ | Prevent 'FairFight' anti-cheat from initializing on the server by comparing RAX against 0x0 instead. Init will crash since the plugins aren't shipped.
 #endif // !CLIENT_DLL
-	SCR_BeginLoadingPlaque.Offset(0x1AD).FindPatternSelf("75 27", CMemory::Direction::DOWN).Patch({ 0xEB, 0x27 });                 // JNE --> JMP | Prevent connect command from crashing by invalid call to UI function.
+	//SCR_BeginLoadingPlaque.Offset(0x1AD).FindPatternSelf("75 27", CMemory::Direction::DOWN).Patch({ 0xEB, 0x27 });                 // JNE --> JMP | Prevent connect command from crashing by invalid call to UI function.
 	p_SQVM_CompileError.Offset(0x0).FindPatternSelf("41 B0 01", CMemory::Direction::DOWN, 400).Patch({ 0x41, 0xB0, 0x00 });        // MOV --> MOV | Set script error level to 0 (not severe): 'mov r8b, 0'.
 	p_SQVM_CompileError.Offset(0xE0).FindPatternSelf("E8", CMemory::Direction::DOWN, 200).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | TODO: causes errors on client script error. Research required (same function as soft error but that one doesn't crash).
 #else
diff --git a/r5dev/gameui/IBrowser.cpp b/r5dev/gameui/IBrowser.cpp
index 7547f65b..ed115f79 100644
--- a/r5dev/gameui/IBrowser.cpp
+++ b/r5dev/gameui/IBrowser.cpp
@@ -625,7 +625,7 @@ void CBrowser::SendHostingPostRequest(void)
 void CBrowser::ProcessCommand(const char* pszCommand) const
 {
     Cbuf_AddText(Cbuf_GetCurrentPlayer(), pszCommand, cmd_source_t::kCommandSrcCode);
-    g_DelayedCallTask->AddFunc(Cbuf_Execute, 0); // Run in main thread.
+    //g_DelayedCallTask->AddFunc(Cbuf_Execute, 0); // Run in main thread.
 }
 
 //-----------------------------------------------------------------------------
diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp
index 9d3ea116..e759a593 100644
--- a/r5dev/gameui/IConsole.cpp
+++ b/r5dev/gameui/IConsole.cpp
@@ -535,7 +535,7 @@ void CConsole::ProcessCommand(const char* pszCommand)
     DevMsg(eDLL_T::COMMON, "] %s\n", pszCommand);
 
     Cbuf_AddText(Cbuf_GetCurrentPlayer(), pszCommand, cmd_source_t::kCommandSrcCode);
-    g_DelayedCallTask->AddFunc(Cbuf_Execute, 0); // Run in main thread.
+    //g_DelayedCallTask->AddFunc(Cbuf_Execute, 0); // Run in main thread.
 
     m_nHistoryPos = -1;
     for (size_t i = m_vHistory.size(); i-- > 0; )
diff --git a/r5dev/networksystem/listmanager.cpp b/r5dev/networksystem/listmanager.cpp
index 1bf68d49..f0ccd572 100644
--- a/r5dev/networksystem/listmanager.cpp
+++ b/r5dev/networksystem/listmanager.cpp
@@ -90,7 +90,7 @@ void CServerListManager::ConnectToServer(const string& svServer, const string& s
 void CServerListManager::ProcessCommand(const char* pszCommand) const
 {
     Cbuf_AddText(Cbuf_GetCurrentPlayer(), pszCommand, cmd_source_t::kCommandSrcCode);
-    g_DelayedCallTask->AddFunc(Cbuf_Execute, 0); // Run in main thread.
+    //g_DelayedCallTask->AddFunc(Cbuf_Execute, 0); // Run in main thread.
 }
 
 CServerListManager* g_pServerListManager = new CServerListManager();
\ No newline at end of file
diff --git a/r5dev/windows/console.cpp b/r5dev/windows/console.cpp
index 766585f1..602b0037 100644
--- a/r5dev/windows/console.cpp
+++ b/r5dev/windows/console.cpp
@@ -136,7 +136,7 @@ DWORD __stdcall ProcessConsoleWorker(LPVOID)
 
 		// Execute the command.
 		Cbuf_AddText(Cbuf_GetCurrentPlayer(), sCommand.c_str(), cmd_source_t::kCommandSrcCode);
-		g_DelayedCallTask->AddFunc(Cbuf_Execute, 0);
+		//g_DelayedCallTask->AddFunc(Cbuf_Execute, 0);
 
 		sCommand.clear();