aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/CalendarHandler.cpp
diff options
context:
space:
mode:
authorSubv <s.v.h21@hotmail.com>2012-09-16 17:31:13 -0700
committerSubv <s.v.h21@hotmail.com>2012-09-16 17:31:13 -0700
commit4f213247625605635ae15c2de91f3ecf4e726761 (patch)
tree94d46c8c1230977bca03c1dd41db0d199491c27b /src/server/game/Handlers/CalendarHandler.cpp
parentbc912af806f3b5a916b18c0d4166b5371e09d614 (diff)
parent6df92dad615cd5459ba5bd2f659b7a432df4b6ff (diff)
Merge pull request #7793 from Elron103/pull-requests
Core/Calendar: Add TwoSide Interaction configuration option for Calendar...
Diffstat (limited to 'src/server/game/Handlers/CalendarHandler.cpp')
-rwxr-xr-xsrc/server/game/Handlers/CalendarHandler.cpp2
1 files changed, 1 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;