Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Guild: HandleRoster should always have a valid session

Browse Source
This commit is contained in:
Dehravor committed 2014-01-02 10:37:44 +01:00
1 parent 03fbc0a69d
commit e794e85969
2 files changed
+4 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Guilds/Guild.cpp
+3 -11
View File
@@ -1303,7 +1303,7 @@ bool Guild::SetName(std::string const& name)
return true;
}
void Guild::HandleRoster(WorldSession* session /*= NULL*/)
void Guild::HandleRoster(WorldSession* session)
{
// Guess size
WorldPacket data(SMSG_GUILD_ROSTER, (4 + m_motd.length() + 1 + m_info.length() + 1 + 4 + _GetRanksSize() * (4 + 4 + GUILD_BANK_MAX_TABS * (4 + 4)) + m_members.size() * 50));
@@ -1318,16 +1318,8 @@ void Guild::HandleRoster(WorldSession* session /*= NULL*/)
for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
itr->second->WritePacket(data, _HasRankRight(session->GetPlayer(), GR_RIGHT_VIEWOFFNOTE));
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)
src/server/game/Guilds/Guild.h
+1 -1
View File
@@ -661,7 +661,7 @@ public:
bool SetName(std::string const& name);
// Handle client commands
void HandleRoster(WorldSession* session = NULL); // NULL = broadcast
void HandleRoster(WorldSession* session);
void HandleQuery(WorldSession* session);
void HandleSetMOTD(WorldSession* session, std::string const& motd);
void HandleSetInfo(WorldSession* session, std::string const& info);