Merge pull request #70 from kadeshar/guild-crash-fix

Possible crash fix while adding member to guild
This commit is contained in:
bash
2025-09-19 20:01:08 +02:00
committed by GitHub

View File

@@ -2207,12 +2207,18 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max
bool Guild::AddMember(ObjectGuid guid, uint8 rankId)
{
Player* player = ObjectAccessor::FindConnectedPlayer(guid);
Player* leader = ObjectAccessor::FindConnectedPlayer(this->GetLeaderGUID());
Player* leader = nullptr;
if (this->GetLeaderGUID())
{
leader = ObjectAccessor::FindConnectedPlayer(this->GetLeaderGUID());
}
// Player cannot be in guild
if (player)
{
if (player->GetGuildId() != 0 ||
(!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && (leader->GetTeamId() != player->GetTeamId())))
(!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && (leader && leader->GetTeamId() != player->GetTeamId())))
return false;
}
else if (sCharacterCache->GetCharacterGuildIdByGuid(guid) != 0)