Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Calendar: Add TwoSide Interaction configuration option for Calendar Invites

Browse Source
This commit is contained in:
hexa-
2012-09-17 02:13:36 +02:00
parent 5b14848a10
commit 6df92dad61
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,7 +425,7 @@ void WorldSession::HandleCalendarEventInvite(WorldPacket& recvData)
return;
}
if (_player->GetTeam() != team)
if (_player->GetTeam() != team && !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CALENDAR))
{
SendCalendarCommandResult(CALENDAR_ERROR_NOT_ALLIED);
return;

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

@@ -655,6 +655,7 @@ void World::LoadConfigSettings(bool reload)
m_int_configs[CONFIG_REALM_ZONE] = ConfigMgr::GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT);
m_bool_configs[CONFIG_ALLOW_TWO_SIDE_ACCOUNTS] = ConfigMgr::GetBoolDefault("AllowTwoSide.Accounts", true);
m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CALENDAR]= ConfigMgr::GetBoolDefault("AllowTwoSide.Interaction.Calendar", false);
m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT] = ConfigMgr::GetBoolDefault("AllowTwoSide.Interaction.Chat", false);
m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL] = ConfigMgr::GetBoolDefault("AllowTwoSide.Interaction.Channel", false);
m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP] = ConfigMgr::GetBoolDefault("AllowTwoSide.Interaction.Group", false);

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

@@ -91,6 +91,7 @@ enum WorldBoolConfigs
CONFIG_GRID_UNLOAD,
CONFIG_STATS_SAVE_ONLY_ON_LOGOUT,
CONFIG_ALLOW_TWO_SIDE_ACCOUNTS,
CONFIG_ALLOW_TWO_SIDE_INTERACTION_CALENDAR,
CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT,
CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL,
CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP,

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

@@ -1209,6 +1209,14 @@ Warden.BanDuration = 86400
AllowTwoSide.Accounts = 1
#
# AllowTwoSide.Interaction.Calendar
# Description: Allow calendar invites between factions.
# Default: 0 - (Disabled)
# 1 - (Enabled)
AllowTwoSide.Interaction.Calendar = 0
#
# AllowTwoSide.Interaction.Chat
# Description: Allow say chat between factions.