From ec52c7136538ed02a2537aae14e1453939b10d5a Mon Sep 17 00:00:00 2001 From: Yimura Date: Tue, 10 May 2022 21:59:03 +0200 Subject: [PATCH] fix(ReceivedEvent): Actually catch stupid crash --- BigBaseV2/src/hooking.hpp | 2 +- BigBaseV2/src/hooks/received_event.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BigBaseV2/src/hooking.hpp b/BigBaseV2/src/hooking.hpp index 773dade2..331b6ed3 100644 --- a/BigBaseV2/src/hooking.hpp +++ b/BigBaseV2/src/hooking.hpp @@ -50,7 +50,7 @@ namespace big static bool increment_stat_event(CNetworkIncrementStatEvent* net_event_struct, CNetGamePlayer* sender, int64_t a3); static bool is_dlc_present(Hash dlc_hash); - static bool received_event( + static void received_event( rage::netEventMgr* event_manager, CNetGamePlayer* source_player, CNetGamePlayer* target_player, diff --git a/BigBaseV2/src/hooks/received_event.cpp b/BigBaseV2/src/hooks/received_event.cpp index 1c02a743..6daedade 100644 --- a/BigBaseV2/src/hooks/received_event.cpp +++ b/BigBaseV2/src/hooks/received_event.cpp @@ -4,7 +4,7 @@ namespace big { - bool hooks::received_event( + void hooks::received_event( rage::netEventMgr* event_manager, CNetGamePlayer* source_player, CNetGamePlayer* target_player, @@ -19,14 +19,14 @@ namespace big { g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset); - return false; + return; } const auto event_name = *(char**)((DWORD64)event_manager + 8i64 * event_id + 243376); if (event_name == nullptr || source_player == nullptr || source_player->m_player_id < 0 || source_player->m_player_id >= 32) { g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset); - return false; + return; } switch ((RockstarEvent)event_id) @@ -47,7 +47,7 @@ namespace big uint32_t action; buffer->ReadDword(&action, 8); - if (action > 16 && action < 18) + if (action >= 16 && action <= 18) { g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset); @@ -58,7 +58,7 @@ namespace big g_notification_service->push_warning("Protection", fmt::format("{} sent TASK_VEHICLE_TEMP_ACTION crash.", source_player->get_name())); - return false; + return; } } buffer->Seek(0); @@ -75,7 +75,7 @@ namespace big { g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset); - return false; + return; } buffer->Seek(0); @@ -95,7 +95,7 @@ namespace big fmt::format("{} possible attempt at freezing entity.", source_player->get_name()) ); - return false; + return; } break; @@ -149,7 +149,7 @@ namespace big fmt::format("Denied player control request from {}", source_player->get_name()) ); - return false; + return; } }