aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShocker <shocker@freakz.ro>2011-03-26 05:10:18 +0200
committerShocker <shocker@freakz.ro>2011-03-26 05:10:18 +0200
commitab83c3668769828b40f96e545fc9d78150fc3ba3 (patch)
tree9862ca074f8f6f6c49f56793f110fa6613ce220b /src
parentb9af020e7210c0dc6198aa71012eff51c3529ce1 (diff)
Core/Groups: Allow inviting members of opposite faction with GM mode on.
Closes #510
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Server/Protocol/Handlers/GroupHandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
index d3fbe4c157b..6feda854699 100755
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -86,7 +86,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recv_data)
return;
// can't group with
- if (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && GetPlayer()->GetTeam() != player->GetTeam())
+ if (!GetPlayer()->isGameMaster() && !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && GetPlayer()->GetTeam() != player->GetTeam())
{
SendPartyResult(PARTY_OP_INVITE, membername, ERR_PLAYER_WRONG_FACTION);
return;