aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/ChatHandler.cpp
diff options
context:
space:
mode:
authorAlan Deutscher <adeutscher@gmail.com>2017-01-07 04:03:03 -0800
committerShauren <shauren.trinity@gmail.com>2018-12-09 14:18:42 +0100
commit77150bc8ec0998ac0f5722a1a58cae9165f5fb70 (patch)
tree75e50506c8e655280bc3839bd1892d155cecc87c /src/server/game/Handlers/ChatHandler.cpp
parentea0cd9366289a3cecdc78ed4a69c08fecc55a2c0 (diff)
Core/Chat: Added option to allow 5-man parties to use raid warnings
Closes #17889 * Added parentheses to satisfy TravisCI. * Adjusted to a boolean config option instead of an integer. (cherry-picked from fc06465b17a57feafbf2c02316b1b910c2b98e89)
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
-rw-r--r--src/server/game/Handlers/ChatHandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index bf724ae21ff..592c565a6f2 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -360,7 +360,7 @@ void WorldSession::HandleChatMessage(ChatMsg type, uint32 lang, std::string msg,
case CHAT_MSG_RAID_WARNING:
{
Group* group = GetPlayer()->GetGroup();
- if (!group || !group->isRaidGroup() || !(group->IsLeader(GetPlayer()->GetGUID()) || group->IsAssistant(GetPlayer()->GetGUID())) || group->isBGGroup())
+ if (!group || (group->isRaidGroup() && !(group->IsLeader(GetPlayer()->GetGUID()) || group->IsAssistant(GetPlayer()->GetGUID()))) || group->isBGGroup() || !sWorld->getBoolConfig(CONFIG_CHAT_PARTY_RAID_WARNINGS))
return;
sScriptMgr->OnPlayerChat(GetPlayer(), type, lang, msg, group);