From 44ea9cbb2584abc85646285a631aacfa9ae71152 Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 11 Mar 2013 10:52:43 +0100 Subject: Core/RBAC: Fix players not being able to reply GMs from the other faction (Partial revert of 377cfdb) --- src/server/game/Handlers/ChatHandler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/game/Handlers/ChatHandler.cpp') diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 9f942024851..81de643bcf5 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -271,14 +271,15 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) Player* receiver = sObjectAccessor->FindPlayerByName(to); if (!receiver || (!HasPermission(RBAC_PERM_CAN_FILTER_WHISPERS) && - receiver->GetSession()->HasPermission(RBAC_PERM_CAN_FILTER_WHISPERS) && !receiver->isAcceptWhispers() && !receiver->IsInWhisperWhiteList(sender->GetGUID()))) { SendPlayerNotFoundNotice(to); return; } - if (GetPlayer()->GetTeam() != receiver->GetTeam() && !HasPermission(RBAC_PERM_TWO_SIDE_INTERACTION_CHAT)) + // @todo: check only sender permission and add receiver to whiteList if receiver does not have the permission + if (GetPlayer()->GetTeam() != receiver->GetTeam() && !HasPermission(RBAC_PERM_TWO_SIDE_INTERACTION_CHAT) && + !receiver->GetSession()->HasPermission(RBAC_PERM_TWO_SIDE_INTERACTION_CHAT)) { SendWrongFactionNotice(); return; -- cgit v1.2.3