diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-10-02 10:50:28 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-10-02 10:50:28 +0200 |
| commit | 042a6985b1c5b95484c4e2db6890980e1f1b48d8 (patch) | |
| tree | 08823c736dde7b3efd1e1ab6ad1777f70f517bc7 /src/server/game/Guilds/Guild.cpp | |
| parent | 76f868728b372e6037c3b224d3233d30d38249b3 (diff) | |
Core/Misc: Port more ObjectGuid refactors from master branch
Diffstat (limited to 'src/server/game/Guilds/Guild.cpp')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index f26b4fc75a8..9f65db7d038 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2190,10 +2190,10 @@ bool Guild::AddMember(CharacterDatabaseTransaction trans, ObjectGuid guid, uint8 // Player cannot be in guild if (player) { - if (player->GetGuildId() != 0) + if (player->GetGuildId()) return false; } - else if (sCharacterCache->GetCharacterGuildIdByGuid(guid) != 0) + else if (sCharacterCache->GetCharacterGuildIdByGuid(guid)) return false; // Remove all player signs from another petitions @@ -2268,7 +2268,6 @@ bool Guild::AddMember(CharacterDatabaseTransaction trans, ObjectGuid guid, uint8 bool Guild::DeleteMember(CharacterDatabaseTransaction trans, ObjectGuid guid, bool isDisbanding, bool isKicked) { - ObjectGuid::LowType lowguid = guid.GetCounter(); Player* player = ObjectAccessor::FindConnectedPlayer(guid); // Guild master can be deleted when loading guild and guid doesn't exist in characters table @@ -2318,7 +2317,7 @@ bool Guild::DeleteMember(CharacterDatabaseTransaction trans, ObjectGuid guid, bo else sCharacterCache->UpdateCharacterGuildId(guid, 0); - _DeleteMemberFromDB(trans, lowguid); + _DeleteMemberFromDB(trans, guid.GetCounter()); if (!isDisbanding) _UpdateAccountsNumber(); |