diff options
| author | megamage <none@none> | 2009-01-09 16:43:23 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-09 16:43:23 -0600 |
| commit | 1ffb1cef3344206dfea149cb78146c30449d51c2 (patch) | |
| tree | 655ac591f6f5aaca3dc65d67f3940f589e2394db /src/game/ChatHandler.cpp | |
| parent | 5c8f52d134899e10484dd47e91b612e2228842bf (diff) | |
| parent | 90a82a81ad5d20d5e7188d6e9d660280f0b1eab4 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/ChatHandler.cpp')
| -rw-r--r-- | src/game/ChatHandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index bcaa2c80768..ea59facefd9 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -316,9 +316,9 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data ) break; Group *group = GetPlayer()->GetGroup(); - if(!group || !group->isRaidGroup()) + if(!group || !group->isRaidGroup() || group->isBGGroup()) return; - + WorldPacket data; ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID, lang, "", 0, msg.c_str(),NULL); group->BroadcastPacket(&data); @@ -342,7 +342,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data ) break; Group *group = GetPlayer()->GetGroup(); - if(!group || !group->isRaidGroup() || !group->IsLeader(GetPlayer()->GetGUID())) + if(!group || !group->isRaidGroup() || !group->IsLeader(GetPlayer()->GetGUID()) || group->isBGGroup()) return; WorldPacket data; @@ -362,7 +362,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data ) break; Group *group = GetPlayer()->GetGroup(); - if(!group || !group->isRaidGroup() || !(group->IsLeader(GetPlayer()->GetGUID()) || group->IsAssistant(GetPlayer()->GetGUID()))) + if(!group || !group->isRaidGroup() || !(group->IsLeader(GetPlayer()->GetGUID()) || group->IsAssistant(GetPlayer()->GetGUID())) || group->isBGGroup()) return; WorldPacket data; @@ -383,7 +383,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data ) break; Group *group = GetPlayer()->GetGroup(); - if(!group || !group->isRaidGroup()) + if(!group || !group->isRaidGroup() || !group->isBGGroup()) return; WorldPacket data; @@ -404,7 +404,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data ) break; Group *group = GetPlayer()->GetGroup(); - if(!group || !group->isRaidGroup() || !group->IsLeader(GetPlayer()->GetGUID())) + if(!group || !group->isRaidGroup() || !group->IsLeader(GetPlayer()->GetGUID()) || !group->isBGGroup()) return; WorldPacket data; @@ -587,4 +587,4 @@ void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recv_data ) void WorldSession::HandleChannelDeclineInvite(WorldPacket &recvPacket) { sLog.outDebug("Opcode %u", recvPacket.GetOpcode()); -}
\ No newline at end of file +} |