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

Sanity checks for get_net_data. (#3068)

Browse Source
This commit is contained in:
gir489 2024-05-08 04:33:21 -04:00 committed by GitHub
parent 1b82c94d4d
commit b7d75d4fcd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/services/players/player.cpp
View File

@ -25,17 +25,17 @@ namespace big
const char* player::get_name() const const char* player::get_name() const
{ {
return m_net_game_player == nullptr ? "" : m_net_game_player->get_name(); return get_net_game_player() == nullptr ? "" : m_net_game_player->get_name();
} }
rage::rlGamerInfo* player::get_net_data() const rage::rlGamerInfo* player::get_net_data() const
{ {
return m_net_game_player == nullptr ? nullptr : m_net_game_player->get_net_data(); return get_net_game_player() == nullptr ? nullptr : m_net_game_player->get_net_data();
} }
CNetGamePlayer* player::get_net_game_player() const CNetGamePlayer* player::get_net_game_player() const
{ {
return m_net_game_player; return (m_net_game_player == nullptr || m_net_game_player->m_player_info == nullptr) ? nullptr : m_net_game_player;
} }
CPed* player::get_ped() const CPed* player::get_ped() const
@ -48,8 +48,8 @@ namespace big
CPlayerInfo* player::get_player_info() const CPlayerInfo* player::get_player_info() const
{ {
if (m_net_game_player != nullptr && m_net_game_player->m_player_info != nullptr) if (auto net_player = get_net_game_player())
return m_net_game_player->m_player_info; return net_player->m_player_info;
return nullptr; return nullptr;
} }
@ -128,14 +128,14 @@ namespace big
uint8_t player::id() const uint8_t player::id() const
{ {
if (*g_pointers->m_gta.m_is_session_started) if (*g_pointers->m_gta.m_is_session_started)
return m_net_game_player == nullptr ? -1 : m_net_game_player->m_player_id; return get_net_game_player() == nullptr ? -1 : m_net_game_player->m_player_id;
else else
return self::id; return self::id;
} }
bool player::is_host() const bool player::is_host() const
{ {
return m_net_game_player == nullptr ? false : m_net_game_player->is_host(); return get_net_game_player() == nullptr ? false : m_net_game_player->is_host();
} }
bool player::is_friend() const bool player::is_friend() const
@ -145,12 +145,12 @@ namespace big
bool player::is_valid() const bool player::is_valid() const
{ {
return m_net_game_player == nullptr ? false : m_net_game_player->is_valid(); return get_net_game_player() == nullptr ? false : m_net_game_player->is_valid();
} }
bool player::equals(const CNetGamePlayer* net_game_player) const bool player::equals(const CNetGamePlayer* net_game_player) const
{ {
return net_game_player == m_net_game_player; return net_game_player == get_net_game_player();
} }
std::string player::to_lowercase_identifier() const std::string player::to_lowercase_identifier() const