diff --git a/BigBaseV2/src/function_types.hpp b/BigBaseV2/src/function_types.hpp index 737234d9..a867bf65 100644 --- a/BigBaseV2/src/function_types.hpp +++ b/BigBaseV2/src/function_types.hpp @@ -16,6 +16,8 @@ namespace big::functions using trigger_script_event = int(int unk0, int64_t* args, int argCount, int bitFlags); + using increment_stat_event = bool(uint64_t net_event_struct, int64_t sender, int64_t a3); + // Received Event Signatures START using read_bitbuf_array = bool(rage::datBitBuffer* buffer, PVOID read, int bits, int); using read_bitbuf_dword = bool(rage::datBitBuffer* buffer, PVOID read, int bits); diff --git a/BigBaseV2/src/hooking.cpp b/BigBaseV2/src/hooking.cpp index c831c454..0238ae6a 100644 --- a/BigBaseV2/src/hooking.cpp +++ b/BigBaseV2/src/hooking.cpp @@ -42,6 +42,8 @@ namespace big m_gta_thread_tick_hook("GTA Thread Tick", g_pointers->m_gta_thread_tick, &hooks::gta_thread_tick), m_gta_thread_kill_hook("GTA Thread Kill", g_pointers->m_gta_thread_kill, &hooks::gta_thread_kill), + m_increment_stat_hook("Increment Stat Event", g_pointers->m_increment_stat_event, &hooks::increment_stat_event), + m_error_screen_hook("Error Screen", g_pointers->m_error_screen, &hooks::disable_error_screen), m_received_event_hook("Received Event", g_pointers->m_received_event, &hooks::received_event) @@ -72,6 +74,8 @@ namespace big m_gta_thread_kill_hook.enable(); m_gta_thread_tick_hook.enable(); + m_increment_stat_hook.enable(); + m_error_screen_hook.enable(); m_received_event_hook.enable(); @@ -87,6 +91,8 @@ namespace big m_error_screen_hook.disable(); + m_increment_stat_hook.disable(); + m_gta_thread_tick_hook.disable(); m_gta_thread_kill_hook.disable(); diff --git a/BigBaseV2/src/hooking.hpp b/BigBaseV2/src/hooking.hpp index e6f823ef..51518c43 100644 --- a/BigBaseV2/src/hooking.hpp +++ b/BigBaseV2/src/hooking.hpp @@ -27,6 +27,8 @@ namespace big static rage::eThreadState gta_thread_tick(GtaThread* a1, unsigned int a2); static rage::eThreadState gta_thread_kill(GtaThread* thread); + static bool increment_stat_event(uint64_t net_event_struct, CNetGamePlayer* sender, int64_t a3); + static bool received_event( rage::netEventMgr* event_manager, CNetGamePlayer* source_player, @@ -71,6 +73,8 @@ namespace big detour_hook m_gta_thread_tick_hook; detour_hook m_gta_thread_kill_hook; + detour_hook m_increment_stat_hook; + detour_hook m_received_event_hook; }; diff --git a/BigBaseV2/src/hooks/increment_stat_event.cpp b/BigBaseV2/src/hooks/increment_stat_event.cpp new file mode 100644 index 00000000..3c6bca10 --- /dev/null +++ b/BigBaseV2/src/hooks/increment_stat_event.cpp @@ -0,0 +1,31 @@ +#include "hooking.hpp" +#include "natives.hpp" +#include "util/notify.hpp" + +namespace big +{ + bool hooks::increment_stat_event(uint64_t net_event_struct, CNetGamePlayer* sender, int64_t a3) + { + Hash hash = *reinterpret_cast(net_event_struct + 0x30); + Player sender_id = sender->player_id; + + switch (hash) + { + case RAGE_JOAAT("MPPLY_GAME_EXPLOITS"): + case RAGE_JOAAT("MPPLY_VC_HATE"): + case RAGE_JOAAT("MPPLY_EXPLOITS"): + case RAGE_JOAAT("MPPLY_TC_ANNOYINGME"): + case RAGE_JOAAT("MPPLY_TC_HATE"): + char report[64]; + strcpy(report, "~g~BLOCKED REPORT~s~\nFrom: "); + strcat(report, PLAYER::GET_PLAYER_NAME(sender_id)); + strcat(report, ""); + + notify::above_map(report); + + return true; + } + + return g_hooking->m_increment_stat_hook.get_original()(net_event_struct, sender, a3); + } +} \ No newline at end of file diff --git a/BigBaseV2/src/hooks/received_event.cpp b/BigBaseV2/src/hooks/received_event.cpp index 9ad1fee3..7143787d 100644 --- a/BigBaseV2/src/hooks/received_event.cpp +++ b/BigBaseV2/src/hooks/received_event.cpp @@ -30,34 +30,6 @@ namespace big switch ((RockstarEvent)event_id) { - case RockstarEvent::NETWORK_INCREMENT_STAT_EVENT: - { - Hash hash; - buffer->ReadDword(&hash, 32); - - switch (hash) - { - case RAGE_JOAAT("MPPLY_GAME_EXPLOITS"): - case RAGE_JOAAT("MPPLY_VC_HATE"): - case RAGE_JOAAT("MPPLY_EXPLOITS"): - case RAGE_JOAAT("MPPLY_TC_ANNOYINGME"): - case RAGE_JOAAT("MPPLY_TC_HATE"): - g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset); - - char report[64]; - strcpy(report, "~g~BLOCKED REPORT~s~\nFrom: "); - strcat(report, PLAYER::GET_PLAYER_NAME(source_player->player_id)); - strcat(report, ""); - - notify::above_map(report); - - return false; - } - - buffer->Seek(0); - - break; - } case RockstarEvent::NETWORK_CLEAR_PED_TASKS_EVENT: { if (source_player->player_id < 32) diff --git a/BigBaseV2/src/pointers.cpp b/BigBaseV2/src/pointers.cpp index eb6cd40d..f0c67380 100644 --- a/BigBaseV2/src/pointers.cpp +++ b/BigBaseV2/src/pointers.cpp @@ -123,6 +123,11 @@ namespace big m_gta_thread_kill = ptr.as(); }); + main_batch.add("Increment Stat Event", "48 89 5C 24 ? 48 89 74 24 ? 55 57 41 55 41 56 41 57 48 8B EC 48 83 EC 60 8B 79 30", [this](memory::handle ptr) + { + m_increment_stat_event = ptr.as(); + }); + main_batch.add("Error Screen", "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 41 56 41 57 48 83 EC 60 4C 8B F2 48 8B 94 24 ? ? ? ? 33 DB", [this](memory::handle ptr) { m_error_screen = ptr.as(); diff --git a/BigBaseV2/src/pointers.hpp b/BigBaseV2/src/pointers.hpp index 0b9b1e08..e438b82a 100644 --- a/BigBaseV2/src/pointers.hpp +++ b/BigBaseV2/src/pointers.hpp @@ -46,6 +46,8 @@ namespace big functions::gta_thread_tick* m_gta_thread_tick{}; functions::gta_thread_kill* m_gta_thread_kill{}; + functions::increment_stat_event* m_increment_stat_event{}; + functions::trigger_script_event* m_trigger_script_event{}; // Received Event Signatures START