ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

fix(ReceivedEvent): Actually catch stupid crash

Browse Source
This commit is contained in:
Yimura 2022-05-10 21:59:03 +02:00
parent 54829582f5
commit ec52c71365
No known key found for this signature in database
GPG Key ID: 3D8FF4397E768682
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BigBaseV2/src/hooking.hpp
View File

@ -50,7 +50,7 @@ namespace big
static bool increment_stat_event(CNetworkIncrementStatEvent* net_event_struct, CNetGamePlayer* sender, int64_t a3); static bool increment_stat_event(CNetworkIncrementStatEvent* net_event_struct, CNetGamePlayer* sender, int64_t a3);
static bool is_dlc_present(Hash dlc_hash); static bool is_dlc_present(Hash dlc_hash);
static bool received_event( static void received_event(
rage::netEventMgr* event_manager, rage::netEventMgr* event_manager,
CNetGamePlayer* source_player, CNetGamePlayer* source_player,
CNetGamePlayer* target_player, CNetGamePlayer* target_player,

16
BigBaseV2/src/hooks/received_event.cpp
View File

@ -4,7 +4,7 @@
namespace big namespace big
{ {
bool hooks::received_event( void hooks::received_event(
rage::netEventMgr* event_manager, rage::netEventMgr* event_manager,
CNetGamePlayer* source_player, CNetGamePlayer* source_player,
CNetGamePlayer* target_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); 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); 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) 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); g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
return false; return;
} }
switch ((RockstarEvent)event_id) switch ((RockstarEvent)event_id)
@ -47,7 +47,7 @@ namespace big
uint32_t action; uint32_t action;
buffer->ReadDword(&action, 8); 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); 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", g_notification_service->push_warning("Protection",
fmt::format("{} sent TASK_VEHICLE_TEMP_ACTION crash.", source_player->get_name())); fmt::format("{} sent TASK_VEHICLE_TEMP_ACTION crash.", source_player->get_name()));
return false; return;
} }
} }
buffer->Seek(0); 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); g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
return false; return;
} }
buffer->Seek(0); buffer->Seek(0);
@ -95,7 +95,7 @@ namespace big
fmt::format("{} possible attempt at freezing entity.", source_player->get_name()) fmt::format("{} possible attempt at freezing entity.", source_player->get_name())
); );
return false; return;
} }
break; break;
@ -149,7 +149,7 @@ namespace big
fmt::format("Denied player control request from {}", source_player->get_name()) fmt::format("Denied player control request from {}", source_player->get_name())
); );
return false; return;
} }
} }