diff options
| author | Gooyeth <566327+Gooyeth@users.noreply.github.com> | 2018-12-18 01:03:52 -0600 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2018-12-18 08:03:52 +0100 |
| commit | 950e50ec4d102c0b852378bbe85a501d7450ed5c (patch) | |
| tree | 270fe9ae8ca4e1beedfcc2fe709e4b3629eb3408 | |
| parent | c7445669e8577884fd512fe009f7d3da4cf0429a (diff) | |
Core/Handlers: fix ".whisper on" with opposite faction/low level (#22298)
| -rw-r--r-- | src/server/game/Handlers/ChatHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index e30f92bbde9..6ec8bf024f6 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -340,13 +340,13 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) SendPlayerNotFoundNotice(to); return; } - if (!sender->IsGameMaster() && sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ) && !receiver->IsInWhisperWhiteList(sender->GetGUID())) + if (!sender->IsGameMaster() && sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ) && !receiver->IsInWhisperWhiteList(sender->GetGUID()) && !receiver->isAcceptWhispers()) { SendNotification(GetTrinityString(LANG_WHISPER_REQ), sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)); return; } - if (GetPlayer()->GetTeam() != receiver->GetTeam() && !HasPermission(rbac::RBAC_PERM_TWO_SIDE_INTERACTION_CHAT) && !receiver->IsInWhisperWhiteList(sender->GetGUID())) + if (GetPlayer()->GetTeam() != receiver->GetTeam() && !HasPermission(rbac::RBAC_PERM_TWO_SIDE_INTERACTION_CHAT) && !receiver->IsInWhisperWhiteList(sender->GetGUID()) && !receiver->isAcceptWhispers()) { SendWrongFactionNotice(); return; |