diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-11 22:08:29 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-11 22:08:29 +0100 |
| commit | e13fdd9829a00d6b75e5346938333f78d53934f0 (patch) | |
| tree | ac9f5df806f30c03239973ffeaac937f0932e4b2 /src/server/game/Handlers/ChatHandler.cpp | |
| parent | 11764233c56ed612a043ff2240c6d8fa738d01f3 (diff) | |
| parent | b684157695c438517217e990309876e0b5608dcb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ChatHandler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 84c4359365f..6abde6cac04 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -328,14 +328,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; |