diff options
| author | Giacomo Pozzoni <giacomo.pozzoni@dqc.se> | 2018-12-21 13:19:12 +0100 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomo.pozzoni@dqc.se> | 2018-12-21 13:19:12 +0100 |
| commit | afdbc5ffe38e9b845f6ef123849139e846a540ae (patch) | |
| tree | 583b9cf95de934e19f22578835988d0c3cc0669e /src/server/game/Handlers/ChatHandler.cpp | |
| parent | cb136387218bc7a5473cf1ca6707ec1ba3b8c1c0 (diff) | |
Revert "Core/Handlers: fix ".whisper on" with opposite faction/low level (#22298)"
This reverts commit 950e50ec4d102c0b852378bbe85a501d7450ed5c.
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
| -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 6ec8bf024f6..e30f92bbde9 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()) && !receiver->isAcceptWhispers()) + if (!sender->IsGameMaster() && sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ) && !receiver->IsInWhisperWhiteList(sender->GetGUID())) { 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()) && !receiver->isAcceptWhispers()) + if (GetPlayer()->GetTeam() != receiver->GetTeam() && !HasPermission(rbac::RBAC_PERM_TWO_SIDE_INTERACTION_CHAT) && !receiver->IsInWhisperWhiteList(sender->GetGUID())) { SendWrongFactionNotice(); return; |