From fb9893a190a76d964b3b833d4f80e2a01c3cbf65 Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 25 Feb 2013 15:37:20 +0100 Subject: Add missing change related to permission 'Two side interaction channel' --- src/server/game/Chat/Channels/Channel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 50ac4f66dec..ce155bc6bad 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -607,6 +607,7 @@ void Channel::Say(uint64 guid, std::string const& what, uint32 lang) if (Player* player = ObjectAccessor::FindPlayer(guid)) chatTag = player->GetChatTag(); + // TODO: Add proper RBAC check if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL)) lang = LANG_UNIVERSAL; @@ -669,7 +670,9 @@ void Channel::Invite(Player const* player, std::string const& newname) return; } - if (newp->GetTeam() != player->GetTeam() && !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL)) + if (newp->GetTeam() != player->GetTeam() && (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL) || + !player->GetSession()->HasPermission(RBAC_PERM_TWO_SIDE_INTERACTION_CHANNEL) || + !newp->GetSession()->HasPermission(RBAC_PERM_TWO_SIDE_INTERACTION_CHANNEL))) { WorldPacket data; MakeInviteWrongFaction(&data); -- cgit v1.2.3