diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-18 01:01:11 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-18 01:01:11 +0100 |
| commit | 4027686b5b127cf9865a51648de16fa5a51a2682 (patch) | |
| tree | 090295eaa158b5babc88aa97acdb02cf0f04ebb8 /src/server/game/Guilds/Guild.cpp | |
| parent | 4d80611a1095ca5e7681b48878dceac3ac2e4011 (diff) | |
| parent | bbd84d211de5ae19bdc6c8abe19064b1b926003b (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Handlers/ItemHandler.cpp
Diffstat (limited to 'src/server/game/Guilds/Guild.cpp')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 12c1a1f09d3..a586b389630 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1394,7 +1394,7 @@ bool Guild::SetName(std::string const& name) return true; } -void Guild::HandleRoster(WorldSession* session /*= NULL*/) +void Guild::HandleRoster(WorldSession* session) { ByteBuffer memberData(100); // Guess size @@ -1475,16 +1475,8 @@ void Guild::HandleRoster(WorldSession* session /*= NULL*/) data.AppendPackedTime(m_createdDate); data << uint32(0); - if (session) - { - TC_LOG_DEBUG("guild", "SMSG_GUILD_ROSTER [%s]", session->GetPlayerInfo().c_str()); - session->SendPacket(&data); - } - else - { - TC_LOG_DEBUG("guild", "SMSG_GUILD_ROSTER [Broadcast]"); - BroadcastPacket(&data); - } + TC_LOG_DEBUG("guild", "SMSG_GUILD_ROSTER [%s]", session->GetPlayerInfo().c_str()); + session->SendPacket(&data); } void Guild::HandleQuery(WorldSession* session) |