fix(Lua): Several function hook only triggering for the first registrant

UE4SS · UE4SS · commit 08a087447e00 · 2026-01-05T06:51:39.000+01:00
diff --git a/UE4SS/src/Mod/LuaMod.cpp b/UE4SS/src/Mod/LuaMod.cpp
@@ -5704,10 +5704,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                 [](Unreal::UEngine* Engine, Unreal::FWorldContext& WorldContext, Unreal::FURL URL, Unreal::UPendingNetGame* PendingGame, Unreal::FString& Error)
                         -> std::pair<bool, bool> {
                     return TRY([&] {
+                        std::pair<bool, bool> return_value{};
                         for (const auto& callback_data : m_load_map_pre_callbacks)
                         {
-                            std::pair<bool, bool> return_value{};
-
                             for (const auto& [lua_ptr, registry_index] : callback_data.registry_indexes)
                             {
                                 const auto& lua = *lua_ptr;
@@ -5736,21 +5735,18 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                                     return_value.second = callback_data.lua->get_bool();
                                 }
                             }
-
-                            return return_value;
                         }
-                        return std::pair<bool, bool>{false, false};
+                        return return_value;
                     });
                 });
 
         Unreal::Hook::RegisterLoadMapPostCallback(
                 [](Unreal::UEngine* Engine, Unreal::FWorldContext& WorldContext, Unreal::FURL URL, Unreal::UPendingNetGame* PendingGame, Unreal::FString& Error)
                         -> std::pair<bool, bool> {
                     return TRY([&] {
+                        std::pair<bool, bool> return_value{};
                         for (const auto& callback_data : m_load_map_post_callbacks)
                         {
-                            std::pair<bool, bool> return_value{};
-
                             for (const auto& [lua_ptr, registry_index] : callback_data.registry_indexes)
                             {
                                 const auto& lua = *lua_ptr;
@@ -5779,10 +5775,8 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                                     return_value.second = callback_data.lua->get_bool();
                                 }
                             }
-
-                            return return_value;
                         }
-                        return std::pair<bool, bool>{false, false};
+                        return return_value;
                     });
                 });
 
@@ -6040,9 +6034,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                 [](Unreal::UObject* context, const TCHAR* str, Unreal::FOutputDevice& ar, Unreal::UObject* executor, bool b_force_call_with_non_exec)
                         -> std::pair<bool, bool> {
                     return TRY([&] {
+                        std::pair<bool, bool> return_value{};
                         for (const auto& callback_data : m_call_function_by_name_with_arguments_pre_callbacks)
                         {
-                            std::pair<bool, bool> return_value{};
 
                             for (const auto& [lua, registry_index] : callback_data.registry_indexes)
                             {
@@ -6072,21 +6066,19 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                                     return_value.second = callback_data.lua->get_bool();
                                 }
                             }
-
-                            return return_value;
                         }
 
-                        return std::pair{false, false};
+                        return return_value;
                     });
                 });
 
         Unreal::Hook::RegisterCallFunctionByNameWithArgumentsPostCallback(
                 [](Unreal::UObject* context, const TCHAR* str, Unreal::FOutputDevice& ar, Unreal::UObject* executor, bool b_force_call_with_non_exec)
                         -> std::pair<bool, bool> {
                     return TRY([&] {
+                        std::pair<bool, bool> return_value{};
                         for (const auto& callback_data : m_call_function_by_name_with_arguments_post_callbacks)
                         {
-                            std::pair<bool, bool> return_value{};
 
                             for (const auto& [lua, registry_index] : callback_data.registry_indexes)
                             {
@@ -6116,11 +6108,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                                     return_value.second = callback_data.lua->get_bool();
                                 }
                             }
-
-                            return return_value;
                         }
 
-                        return std::pair{false, false};
+                        return return_value;
                     });
                 });
 
@@ -6221,9 +6211,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                         auto command = File::StringType{ToCharTypePtr(cmd)};
                         auto command_parts = explode_by_occurrence_with_quotes(command, STR(' '));
 
+                        std::pair<bool, bool> return_value{};
                         for (const auto& callback_data : m_process_console_exec_pre_callbacks)
                         {
-                            std::pair<bool, bool> return_value{};
 
                             for (const auto& [lua, registry_index] : callback_data.registry_indexes)
                             {
@@ -6258,11 +6248,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                                     throw std::runtime_error{"A callback for 'RegisterProcessConsoleExecHook' must return bool or nil"};
                                 }
                             }
-
-                            return return_value;
                         }
 
-                        return std::pair{false, false};
+                        return return_value;
                     });
                 });
 
@@ -6273,10 +6261,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                         auto command = File::StringType{ToCharTypePtr(cmd)};
                         auto command_parts = explode_by_occurrence_with_quotes(command, STR(' '));
 
+                        std::pair<bool, bool> return_value{};
                         for (const auto& callback_data : m_process_console_exec_post_callbacks)
                         {
-                            std::pair<bool, bool> return_value{};
-
                             for (const auto& [lua, registry_index] : callback_data.registry_indexes)
                             {
                                 callback_data.lua->registry().get_function_ref(registry_index.lua_index);
@@ -6310,11 +6297,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
                                     throw std::runtime_error{"A callback for 'RegisterProcessConsoleExecHook' must return bool or nil"};
                                 }
                             }
-
-                            return return_value;
                         }
 
-                        return std::pair{false, false};
+                        return return_value;
                     });
                 });
 

Original file line number	Diff line number	Diff line change
`@@ -5704,10 +5704,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`5704`	`5704`	`[](Unreal::UEngine* Engine, Unreal::FWorldContext& WorldContext, Unreal::FURL URL, Unreal::UPendingNetGame* PendingGame, Unreal::FString& Error)`
`5705`	`5705`	`-> std::pair<bool, bool> {`
`5706`	`5706`	`return TRY([&] {`
	`5707`	`+ std::pair<bool, bool> return_value{};`
`5707`	`5708`	`for (const auto& callback_data : m_load_map_pre_callbacks)`
`5708`	`5709`	`{`
`5709`		`- std::pair<bool, bool> return_value{};`
`5710`		`-`
`5711`	`5710`	`for (const auto& [lua_ptr, registry_index] : callback_data.registry_indexes)`
`5712`	`5711`	`{`
`5713`	`5712`	`const auto& lua = *lua_ptr;`
`@@ -5736,21 +5735,18 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`5736`	`5735`	`return_value.second = callback_data.lua->get_bool();`
`5737`	`5736`	`}`
`5738`	`5737`	`}`
`5739`		`-`
`5740`		`- return return_value;`
`5741`	`5738`	`}`
`5742`		`- return std::pair<bool, bool>{false, false};`
	`5739`	`+ return return_value;`
`5743`	`5740`	`});`
`5744`	`5741`	`});`
`5745`	`5742`
`5746`	`5743`	`Unreal::Hook::RegisterLoadMapPostCallback(`
`5747`	`5744`	`[](Unreal::UEngine* Engine, Unreal::FWorldContext& WorldContext, Unreal::FURL URL, Unreal::UPendingNetGame* PendingGame, Unreal::FString& Error)`
`5748`	`5745`	`-> std::pair<bool, bool> {`
`5749`	`5746`	`return TRY([&] {`
	`5747`	`+ std::pair<bool, bool> return_value{};`
`5750`	`5748`	`for (const auto& callback_data : m_load_map_post_callbacks)`
`5751`	`5749`	`{`
`5752`		`- std::pair<bool, bool> return_value{};`
`5753`		`-`
`5754`	`5750`	`for (const auto& [lua_ptr, registry_index] : callback_data.registry_indexes)`
`5755`	`5751`	`{`
`5756`	`5752`	`const auto& lua = *lua_ptr;`
`@@ -5779,10 +5775,8 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`5779`	`5775`	`return_value.second = callback_data.lua->get_bool();`
`5780`	`5776`	`}`
`5781`	`5777`	`}`
`5782`		`-`
`5783`		`- return return_value;`
`5784`	`5778`	`}`
`5785`		`- return std::pair<bool, bool>{false, false};`
	`5779`	`+ return return_value;`
`5786`	`5780`	`});`
`5787`	`5781`	`});`
`5788`	`5782`
`@@ -6040,9 +6034,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`6040`	`6034`	`[](Unreal::UObject* context, const TCHAR* str, Unreal::FOutputDevice& ar, Unreal::UObject* executor, bool b_force_call_with_non_exec)`
`6041`	`6035`	`-> std::pair<bool, bool> {`
`6042`	`6036`	`return TRY([&] {`
	`6037`	`+ std::pair<bool, bool> return_value{};`
`6043`	`6038`	`for (const auto& callback_data : m_call_function_by_name_with_arguments_pre_callbacks)`
`6044`	`6039`	`{`
`6045`		`- std::pair<bool, bool> return_value{};`
`6046`	`6040`
`6047`	`6041`	`for (const auto& [lua, registry_index] : callback_data.registry_indexes)`
`6048`	`6042`	`{`
`@@ -6072,21 +6066,19 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`6072`	`6066`	`return_value.second = callback_data.lua->get_bool();`
`6073`	`6067`	`}`
`6074`	`6068`	`}`
`6075`		`-`
`6076`		`- return return_value;`
`6077`	`6069`	`}`
`6078`	`6070`
`6079`		`- return std::pair{false, false};`
	`6071`	`+ return return_value;`
`6080`	`6072`	`});`
`6081`	`6073`	`});`
`6082`	`6074`
`6083`	`6075`	`Unreal::Hook::RegisterCallFunctionByNameWithArgumentsPostCallback(`
`6084`	`6076`	`[](Unreal::UObject* context, const TCHAR* str, Unreal::FOutputDevice& ar, Unreal::UObject* executor, bool b_force_call_with_non_exec)`
`6085`	`6077`	`-> std::pair<bool, bool> {`
`6086`	`6078`	`return TRY([&] {`
	`6079`	`+ std::pair<bool, bool> return_value{};`
`6087`	`6080`	`for (const auto& callback_data : m_call_function_by_name_with_arguments_post_callbacks)`
`6088`	`6081`	`{`
`6089`		`- std::pair<bool, bool> return_value{};`
`6090`	`6082`
`6091`	`6083`	`for (const auto& [lua, registry_index] : callback_data.registry_indexes)`
`6092`	`6084`	`{`
`@@ -6116,11 +6108,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`6116`	`6108`	`return_value.second = callback_data.lua->get_bool();`
`6117`	`6109`	`}`
`6118`	`6110`	`}`
`6119`		`-`
`6120`		`- return return_value;`
`6121`	`6111`	`}`
`6122`	`6112`
`6123`		`- return std::pair{false, false};`
	`6113`	`+ return return_value;`
`6124`	`6114`	`});`
`6125`	`6115`	`});`
`6126`	`6116`
`@@ -6221,9 +6211,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`6221`	`6211`	`auto command = File::StringType{ToCharTypePtr(cmd)};`
`6222`	`6212`	`auto command_parts = explode_by_occurrence_with_quotes(command, STR(' '));`
`6223`	`6213`
	`6214`	`+ std::pair<bool, bool> return_value{};`
`6224`	`6215`	`for (const auto& callback_data : m_process_console_exec_pre_callbacks)`
`6225`	`6216`	`{`
`6226`		`- std::pair<bool, bool> return_value{};`
`6227`	`6217`
`6228`	`6218`	`for (const auto& [lua, registry_index] : callback_data.registry_indexes)`
`6229`	`6219`	`{`
`@@ -6258,11 +6248,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`6258`	`6248`	`throw std::runtime_error{"A callback for 'RegisterProcessConsoleExecHook' must return bool or nil"};`
`6259`	`6249`	`}`
`6260`	`6250`	`}`
`6261`		`-`
`6262`		`- return return_value;`
`6263`	`6251`	`}`
`6264`	`6252`
`6265`		`- return std::pair{false, false};`
	`6253`	`+ return return_value;`
`6266`	`6254`	`});`
`6267`	`6255`	`});`
`6268`	`6256`
`@@ -6273,10 +6261,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`6273`	`6261`	`auto command = File::StringType{ToCharTypePtr(cmd)};`
`6274`	`6262`	`auto command_parts = explode_by_occurrence_with_quotes(command, STR(' '));`
`6275`	`6263`
	`6264`	`+ std::pair<bool, bool> return_value{};`
`6276`	`6265`	`for (const auto& callback_data : m_process_console_exec_post_callbacks)`
`6277`	`6266`	`{`
`6278`		`- std::pair<bool, bool> return_value{};`
`6279`		`-`
`6280`	`6267`	`for (const auto& [lua, registry_index] : callback_data.registry_indexes)`
`6281`	`6268`	`{`
`6282`	`6269`	`callback_data.lua->registry().get_function_ref(registry_index.lua_index);`
`@@ -6310,11 +6297,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.`
`6310`	`6297`	`throw std::runtime_error{"A callback for 'RegisterProcessConsoleExecHook' must return bool or nil"};`
`6311`	`6298`	`}`
`6312`	`6299`	`}`
`6313`		`-`
`6314`		`- return return_value;`
`6315`	`6300`	`}`
`6316`	`6301`
`6317`		`- return std::pair{false, false};`
	`6302`	`+ return return_value;`
`6318`	`6303`	`});`
`6319`	`6304`	`});`
`6320`	`6305`