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

fix(PlayerJoin): don't notify above map while joining (#482)

Browse Source
This commit is contained in:
Yimura 2022-10-19 22:27:01 +02:00 committed by GitHub
parent b0c2b1db40
commit a31e5daf41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BigBaseV2/src/hooks/player_management/assign_physical_index.cpp
View File

@ -6,10 +6,14 @@ namespace big
{ {
void* hooks::assign_physical_index(CNetworkPlayerMgr* netPlayerMgr, CNetGamePlayer* player, uint8_t new_index) void* hooks::assign_physical_index(CNetworkPlayerMgr* netPlayerMgr, CNetGamePlayer* player, uint8_t new_index)
{ {
auto returnResult = g_hooking->m_assign_physical_index_hook.get_original<decltype(&hooks::assign_physical_index)>()(netPlayerMgr, player, new_index); const auto result = g_hooking->m_assign_physical_index_hook.get_original<decltype(&hooks::assign_physical_index)>()(netPlayerMgr, player, new_index);
if (new_index == 0xFF) { const auto* net_player_data = player->get_net_data();
if (new_index == static_cast<uint8_t>(-1))
{
g_player_service->player_leave(player); g_player_service->player_leave(player);
if (const auto* net_player_data = player->get_net_data(); net_player_data)
if (net_player_data)
{ {
if (g->notifications.player_leave.log) if (g->notifications.player_leave.log)
LOG(INFO) << "Player left '" << net_player_data->m_name LOG(INFO) << "Player left '" << net_player_data->m_name
@ -19,13 +23,14 @@ namespace big
if (g->notifications.player_leave.notify) if (g->notifications.player_leave.notify)
g_notification_service->push("Player Left", fmt::format("{} freeing slot #{} with Rockstar ID: {}", net_player_data->m_name, player->m_player_id, net_player_data->m_gamer_handle_2.m_rockstar_id)); g_notification_service->push("Player Left", fmt::format("{} freeing slot #{} with Rockstar ID: {}", net_player_data->m_name, player->m_player_id, net_player_data->m_gamer_handle_2.m_rockstar_id));
} }
return returnResult;
return result;
} }
g_player_service->player_join(player); g_player_service->player_join(player);
if (const auto* net_player_data = player->get_net_data(); net_player_data) if (net_player_data)
{ {
if (g->notifications.player_join.above_map) if (g->notifications.player_join.above_map && *g_pointers->m_is_session_started) // prevent loading screen spam
notify::player_joined(player); notify::player_joined(player);
if (g->notifications.player_join.log) if (g->notifications.player_join.log)
@ -36,6 +41,6 @@ namespace big
if (g->notifications.player_join.notify) if (g->notifications.player_join.notify)
g_notification_service->push("Player Joined", fmt::format("{} taking slot #{} with Rockstar ID: {}", net_player_data->m_name, player->m_player_id, net_player_data->m_gamer_handle_2.m_rockstar_id)); g_notification_service->push("Player Joined", fmt::format("{} taking slot #{} with Rockstar ID: {}", net_player_data->m_name, player->m_player_id, net_player_data->m_gamer_handle_2.m_rockstar_id));
} }
return returnResult; return result;
} }
} }