diff options
| author | Rat <gmstreetrat@gmail.com> | 2015-03-29 11:25:48 +0200 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2015-03-29 11:25:48 +0200 |
| commit | 3660c3a37f7f5a61e14f28c09f94f57fe6315788 (patch) | |
| tree | 61e92a0de035697d350d1545c1bdafd569d91778 /src/server/game/Maps/MapManager.cpp | |
| parent | eebc468e628acc801a6426e03815150c8cfd9172 (diff) | |
| parent | c26dbb786a91b0454a8648039b63d3dc9ddd1c42 (diff) | |
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
| -rw-r--r-- | src/server/game/Maps/MapManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 89ca656675b..d49bde4415d 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -155,9 +155,10 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) // can only enter in a raid group if ((!group || !group->isRaidGroup()) && !sWorld->getBoolConfig(CONFIG_INSTANCE_IGNORE_RAID)) { - // probably there must be special opcode, because client has this string constant in GlobalStrings.lua /// @todo this is not a good place to send the message - player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName); + WorldPacket data(SMSG_RAID_GROUP_ONLY); + data << uint32(0) << uint32(2); + player->GetSession()->SendPacket(&data); TC_LOG_DEBUG("maps", "MAP: Player '%s' must be in a raid group to enter instance '%s'", player->GetName().c_str(), mapName); return false; } |