diff options
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Guilds/GuildFinderMgr.h | 8 | ||||
| -rw-r--r-- | src/server/game/Handlers/GuildFinderHandler.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 9d7592db138..e2d5f32b938 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2650,7 +2650,7 @@ bool Guild::AddMember(uint64 guid, uint8 rankId) _UpdateAccountsNumber(); _LogEvent(GUILD_EVENT_LOG_JOIN_GUILD, lowguid); _BroadcastEvent(GE_JOINED, guid, name.c_str()); - sGuildFinderMgr->RemoveMembershipRequest(lowguid, GUID_LOPART(GetGUID())); + sGuildFinderMgr->RemoveAllMembershipRequestsFromPlayer(lowguid); // Call scripts if member was succesfully added (and stored to database) sScriptMgr->OnGuildAddMember(this, player, rankId); diff --git a/src/server/game/Guilds/GuildFinderMgr.h b/src/server/game/Guilds/GuildFinderMgr.h index 930d538ebca..691132512d1 100644 --- a/src/server/game/Guilds/GuildFinderMgr.h +++ b/src/server/game/Guilds/GuildFinderMgr.h @@ -37,7 +37,7 @@ enum GuildFinderOptionsAvailability { AVAILABILITY_WEEKDAYS = 0x1, AVAILABILITY_WEEKENDS = 0x2, - ALL_WEEK = AVAILABILITY_WEEKDAYS | AVAILABILITY_WEEKENDS + AVAILABILITY_ALWAYS = AVAILABILITY_WEEKDAYS | AVAILABILITY_WEEKENDS }; enum GuildFinderOptionsRoles @@ -50,8 +50,8 @@ enum GuildFinderOptionsRoles enum GuildFinderOptionsLevel { - ANY_FINDER_LEVEL = 0x1, - MAX_FINDER_LEVEL = 0x2, + ANY_FINDER_LEVEL = 0x1, + MAX_FINDER_LEVEL = 0x2, ALL_GUILDFINDER_LEVELS = ANY_FINDER_LEVEL | MAX_FINDER_LEVEL }; @@ -237,7 +237,7 @@ class GuildFinderMgr */ void RemoveMembershipRequest(uint32 playerId, uint32 guildId); - /// wipes everything related to a guild. Used when that guild is disbanded + /// Wipes everything related to a guild. Used when that guild is disbanded void DeleteGuild(uint32 guildId); /** diff --git a/src/server/game/Handlers/GuildFinderHandler.cpp b/src/server/game/Handlers/GuildFinderHandler.cpp index c017a10ca1a..d43c4eb86ca 100644 --- a/src/server/game/Handlers/GuildFinderHandler.cpp +++ b/src/server/game/Handlers/GuildFinderHandler.cpp @@ -64,7 +64,7 @@ void WorldSession::HandleGuildFinderAddRecruit(WorldPacket& recvPacket) return; if (!(classRoles & GUILDFINDER_ALL_ROLES) || classRoles > GUILDFINDER_ALL_ROLES) return; - if (!(availability & ALL_WEEK) || availability > ALL_WEEK) + if (!(availability & AVAILABILITY_ALWAYS) || availability > AVAILABILITY_ALWAYS) return; if (!(guildInterests & ALL_INTERESTS) || guildInterests > ALL_INTERESTS) return; @@ -85,7 +85,7 @@ void WorldSession::HandleGuildFinderBrowse(WorldPacket& recvPacket) if (!(classRoles & GUILDFINDER_ALL_ROLES) || classRoles > GUILDFINDER_ALL_ROLES) return; - if (!(availability & ALL_WEEK) || availability > ALL_WEEK) + if (!(availability & AVAILABILITY_ALWAYS) || availability > AVAILABILITY_ALWAYS) return; if (!(guildInterests & ALL_INTERESTS) || guildInterests > ALL_INTERESTS) return; @@ -421,7 +421,7 @@ void WorldSession::HandleGuildFinderSetGuildPost(WorldPacket& recvPacket) if (!(classRoles & GUILDFINDER_ALL_ROLES) || classRoles > GUILDFINDER_ALL_ROLES) return; - if (!(availability & ALL_WEEK) || availability > ALL_WEEK) + if (!(availability & AVAILABILITY_ALWAYS) || availability > AVAILABILITY_ALWAYS) return; if (!(guildInterests & ALL_INTERESTS) || guildInterests > ALL_INTERESTS) return; |