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/Guilds/Guild.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/Guilds/Guild.cpp')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 77484f372a3..fa7223205d5 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2520,7 +2520,7 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max { uint32 count = 0; - WorldPacket data(SMSG_CALENDAR_FILTER_GUILD); + WorldPacket data(SMSG_CALENDAR_EVENT_INITIAL_INVITES); data << uint32(count); // count placeholder for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) @@ -2539,7 +2539,7 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max if (member->GetGUID() != session->GetPlayer()->GetGUID() && level >= minLevel && level <= maxLevel && member->IsRankNotLower(minRank)) { data << member->GetGUID().WriteAsPacked(); - data << uint8(0); // unk + data << uint8(level); ++count; } } |