Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-01 22:56:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

Browse Source
This commit is contained in:
Aokromes
2017-10-01 12:12:56 +02:00
parent bee0f14610 4120b36803
commit 6921d5653c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Guilds/GuildFinderMgr.cpp
View File

@@ -41,7 +41,7 @@ void GuildFinderMgr::LoadGuildSettings()
QueryResult result = CharacterDatabase.Query("SELECT gfgs.guildId, gfgs.availability, gfgs.classRoles, gfgs.interests, gfgs.level, gfgs.listed, gfgs.comment, c.race "
"FROM guild_finder_guild_settings gfgs "
"LEFT JOIN guild_member gm ON gm.guildid=gfgs.guildId "
"LEFT JOIN characters c ON c.guid = gm.guid LIMIT 1");
"LEFT JOIN characters c ON c.guid = gm.guid");
if (!result)
{
@@ -183,8 +183,6 @@ void GuildFinderMgr::RemoveMembershipRequest(uint32 playerId, uint32 guildId)
CharacterDatabase.CommitTransaction(trans);
_membershipRequests[guildId].erase(itr);
// Notify the applicant his submittion has been removed
if (Player* player = ObjectAccessor::FindPlayer(itr->GetPlayerGUID()))
SendMembershipRequestListUpdate(*player);
@@ -192,6 +190,8 @@ void GuildFinderMgr::RemoveMembershipRequest(uint32 playerId, uint32 guildId)
// Notify the guild master and officers the list changed
if (Guild* guild = sGuildMgr->GetGuildById(guildId))
SendApplicantListUpdate(*guild);
_membershipRequests[guildId].erase(itr);
}
std::list<MembershipRequest> GuildFinderMgr::GetAllMembershipRequestsForPlayer(uint32 playerGuid)