Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Chat: Added option to allow 5-man parties to use raid warnings

Browse Source 
Closes #17889

* Added parentheses to satisfy TravisCI.

* Adjusted to a boolean config option instead of an integer.

(cherry-picked from fc06465b17)
This commit is contained in:
Alan Deutscher
2017-01-07 04:03:03 -08:00
committed by Shauren
parent ea0cd93662
commit 77150bc8ec
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Handlers/ChatHandler.cpp
View File

@@ -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);

3
src/server/game/World/World.cpp
View File

@@ -1490,6 +1490,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);
// Check Invalid Position
m_bool_configs[CONFIG_CREATURE_CHECK_INVALID_POSITION] = sConfigMgr->GetBoolDefault("Creature.CheckInvalidPosition", false);
m_bool_configs[CONFIG_GAME_OBJECT_CHECK_INVALID_POSITION] = sConfigMgr->GetBoolDefault("GameObject.CheckInvalidPosition", false);

1
src/server/game/World/World.h
View File

@@ -122,6 +122,7 @@ enum WorldBoolConfigs
CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY,
CONFIG_WEATHER,
CONFIG_QUEST_IGNORE_RAID,
CONFIG_CHAT_PARTY_RAID_WARNINGS,
CONFIG_DETECT_POS_COLLISION,
CONFIG_RESTRICTED_LFG_CHANNEL,
CONFIG_CHAT_FAKE_MESSAGE_PREVENTING,

8
src/server/worldserver/worldserver.conf.dist
View File

@@ -1834,6 +1834,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
#
###################################################################################################