diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-09-16 17:31:13 -0700 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-09-16 17:31:13 -0700 |
| commit | 4f213247625605635ae15c2de91f3ecf4e726761 (patch) | |
| tree | 94d46c8c1230977bca03c1dd41db0d199491c27b | |
| parent | bc912af806f3b5a916b18c0d4166b5371e09d614 (diff) | |
| parent | 6df92dad615cd5459ba5bd2f659b7a432df4b6ff (diff) | |
Merge pull request #7793 from Elron103/pull-requests
Core/Calendar: Add TwoSide Interaction configuration option for Calendar...
| -rwxr-xr-x | src/server/game/Handlers/CalendarHandler.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/World/World.cpp | 1 | ||||
| -rwxr-xr-x | src/server/game/World/World.h | 1 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 8 |
4 files changed, 11 insertions, 1 deletions
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index b207547147c..d1209eead22 100755 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -431,7 +431,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; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 21555b7ab80..1d1fb45b74e 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -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); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 3de3b8c3211..90bb82f1c2e 100755 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -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, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 907011c4b0e..55443f4253b 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -1210,6 +1210,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. # Default: 0 - (Disabled) |