Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Chat/ChatLink.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/ChannelHandler.cpp src/server/scripts/EasternKingdoms/hinterlands.cpp
This commit is contained in:
commit
b9b57c2d62
56 files changed
+2367
-1625
No files matched your search
@@ -36,6 +36,7 @@ ChannelMgr* ChannelMgr::forTeam(uint32 team)
|
||||
|
||||
if (team == ALLIANCE)
|
||||
return ACE_Singleton<AllianceChannelMgr, ACE_Null_Mutex>::instance();
|
||||
|
||||
if (team == HORDE)
|
||||
return ACE_Singleton<HordeChannelMgr, ACE_Null_Mutex>::instance();
|
||||
|
||||
@@ -79,8 +80,8 @@ Channel* ChannelMgr::GetChannel(std::string const& name, Player* player, bool pk
|
||||
|
||||
return NULL;
|
||||
}
|
||||
else
|
||||
return i->second;
|
||||
|
||||
return i->second;
|
||||
}
|
||||
|
||||
void ChannelMgr::LeftChannel(std::string const& name)
|
||||
@@ -96,7 +97,7 @@ void ChannelMgr::LeftChannel(std::string const& name)
|
||||
|
||||
Channel* channel = i->second;
|
||||
|
||||
if (channel->GetNumPlayers() == 0 && !channel->IsConstant())
|
||||
if (!channel->GetNumPlayers() && !channel->IsConstant())
|
||||
{
|
||||
channels.erase(wname);
|
||||
delete channel;
|
||||
@@ -105,6 +106,6 @@ void ChannelMgr::LeftChannel(std::string const& name)
|
||||
|
||||
void ChannelMgr::MakeNotOnPacket(WorldPacket* data, std::string const& name)
|
||||
{
|
||||
data->Initialize(SMSG_CHANNEL_NOTIFY, (1+10)); // we guess size
|
||||
(*data) << (uint8)0x05 << name;
|
||||
data->Initialize(SMSG_CHANNEL_NOTIFY, 1 + name.size());
|
||||
(*data) << uint8(5) << name;
|
||||
}
|
||||
Reference in new issue
Block a user