diff options
| author | Alan Deutscher <adeutscher@gmail.com> | 2017-01-07 04:03:03 -0800 |
|---|---|---|
| committer | Aokromes <Aokromes@users.noreply.github.com> | 2017-01-07 13:03:03 +0100 |
| commit | fc06465b17a57feafbf2c02316b1b910c2b98e89 (patch) | |
| tree | 870d6696753000994db9f79ab2ebd3de88ebdc07 /src | |
| parent | b1fa8ff028fbb7469ef93f5c5612869ec9ba37ae (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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Handlers/ChatHandler.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 8 |
4 files changed, 13 insertions, 1 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 77159430442..082da4cdeeb 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -412,7 +412,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) 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); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index d04248c0db6..e4e09935970 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1349,6 +1349,9 @@ void World::LoadConfigSettings(bool reload) // prevent character rename on character customization m_bool_configs[CONFIG_PREVENT_RENAME_CUSTOMIZATION] = sConfigMgr->GetBoolDefault("PreventRenameCharacterOnCustomization", false); + // Allow 5-man parties to use raid warnings + m_bool_configs[CONFIG_CHAT_PARTY_RAID_WARNINGS] = sConfigMgr->GetBoolDefault("PartyRaidWarnings", false); + // call ScriptMgr if we're reloading the configuration if (reload) sScriptMgr->OnConfigLoad(reload); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 711d9c9c8e5..77e06f62a53 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -113,6 +113,7 @@ enum WorldBoolConfigs CONFIG_WEATHER, CONFIG_ALWAYS_MAX_SKILL_FOR_LEVEL, CONFIG_QUEST_IGNORE_RAID, + CONFIG_CHAT_PARTY_RAID_WARNINGS, CONFIG_DETECT_POS_COLLISION, CONFIG_RESTRICTED_LFG_CHANNEL, CONFIG_CHAT_FAKE_MESSAGE_PREVENTING, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 389580e90bd..0e287aa203d 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -1794,6 +1794,14 @@ PreserveCustomChannels = 1 PreserveCustomChannelDuration = 14 # +# PartyRaidWarnings +# Description: Allow any user to use raid warnings when in a 5-man party. +# Default: 0 - (Disabled, Blizzlike) +# 1 - (Enabled) + +PartyRaidWarnings = 0 + +# ################################################################################################### ################################################################################################### |