Merge pull request #158 from hermensbas/fix/minor_crash_fixes

Workaround and minor core safety check
This commit is contained in:
bashermens
2026-01-23 12:21:21 +01:00
committed by GitHub
+13 -6
View File
@@ -350,14 +350,21 @@ bool Group::AddLeaderInvite(Player* player)
void Group::RemoveInvite(Player* player) void Group::RemoveInvite(Player* player)
{ {
if (player) if (!player)
{ return;
if (!m_invitees.empty())
m_invitees.erase(player); // mod_playerbots: double invite hack workaround
player->SetGroupInvite(nullptr); if (player->GetGroupInvite() != this)
} return;
auto itr = m_invitees.find(player);
if (itr != m_invitees.end())
m_invitees.erase(itr);
player->SetGroupInvite(nullptr);
} }
void Group::RemoveAllInvites() void Group::RemoveAllInvites()
{ {
for (InvitesList::iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr) for (InvitesList::iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)