From 4e8b35062c4ca98dd8297cd6b9c7966a8a62e561 Mon Sep 17 00:00:00 2001 From: Phillip Date: Sat, 30 Sep 2017 19:12:14 +0000 Subject: [PATCH 1/2] Core/GuildFinder: Remove stupid "LIMIT 1" from loading query --- src/server/game/Guilds/GuildFinderMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp index cee8987fe92..168744ff5c3 100644 --- a/src/server/game/Guilds/GuildFinderMgr.cpp +++ b/src/server/game/Guilds/GuildFinderMgr.cpp @@ -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) { From b9183f9c3357dad0a1e2b7928c97b9d4bda25b83 Mon Sep 17 00:00:00 2001 From: Phillip Date: Sat, 30 Sep 2017 19:15:06 +0000 Subject: [PATCH 2/2] Core/GuildFinder: Fix crash, while deleting membersip request --- src/server/game/Guilds/GuildFinderMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp index 168744ff5c3..36d62f8c99a 100644 --- a/src/server/game/Guilds/GuildFinderMgr.cpp +++ b/src/server/game/Guilds/GuildFinderMgr.cpp @@ -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 GuildFinderMgr::GetAllMembershipRequestsForPlayer(uint32 playerGuid)