sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent dc6be0655f c0aec97676
commit fd567ddcfa
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Guilds/Guild.cpp
+8 -2
View File
@@ -2207,12 +2207,18 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max
bool Guild::AddMember(ObjectGuid guid, uint8 rankId) bool Guild::AddMember(ObjectGuid guid, uint8 rankId)
{ {
Player* player = ObjectAccessor::FindConnectedPlayer(guid); 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 // Player cannot be in guild
if (player) if (player)
{ {
if (player->GetGuildId() != 0 || 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; return false;
} }
else if (sCharacterCache->GetCharacterGuildIdByGuid(guid) != 0) else if (sCharacterCache->GetCharacterGuildIdByGuid(guid) != 0)