public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed cross faction guilds not allowed by config

Browse Source
This commit is contained in:
kadeshar
2025-09-13 16:33:09 +02:00
parent 18a5a2be5c
commit 9bc46a7b77
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Guilds/Guild.cpp
View File

@@ -2207,10 +2207,12 @@ 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 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())))
return false; return false;
} }
else if (sCharacterCache->GetCharacterGuildIdByGuid(guid) != 0) else if (sCharacterCache->GetCharacterGuildIdByGuid(guid) != 0)