From d3083df169359622a0d66afa69585d348d621694 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 20 Jul 2016 14:02:11 +0200 Subject: [PATCH] Core/Guilds: Fix Guild::HandleSetMemberNote logic according to method declaration. (#17078) This change has no effect on server behavior. --- src/server/game/Guilds/Guild.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 94e1ac9987..48d1f4225e 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1685,17 +1685,17 @@ void Guild::HandleSetBankTabInfo(WorldSession* session, uint8 tabId, std::string _BroadcastEvent(GE_BANK_TAB_UPDATED, ObjectGuid::Empty, aux, name.c_str(), icon.c_str()); } -void Guild::HandleSetMemberNote(WorldSession* session, std::string const& note, ObjectGuid guid, bool isPublic) +void Guild::HandleSetMemberNote(WorldSession* session, std::string const& note, ObjectGuid guid, bool officer) { // Player must have rights to set public/officer note - if (!_HasRankRight(session->GetPlayer(), isPublic ? GR_RIGHT_EPNOTE : GR_RIGHT_EOFFNOTE)) + if (!_HasRankRight(session->GetPlayer(), officer ? GR_RIGHT_EOFFNOTE : GR_RIGHT_EPNOTE)) SendCommandResult(session, GUILD_COMMAND_PUBLIC_NOTE, ERR_GUILD_PERMISSIONS); else if (Member* member = GetMember(guid)) { - if (isPublic) - member->SetPublicNote(note); - else + if (officer) member->SetOfficerNote(note); + else + member->SetPublicNote(note); HandleRoster(session); // FIXME - We should send SMSG_GUILD_MEMBER_UPDATE_NOTE }