mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-15 23:20:36 +01:00
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:
Spp
@@ -23,19 +23,20 @@
|
||||
|
||||
void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 channelId;
|
||||
uint32 channelLength, passLength;
|
||||
std::string channelName, pass;
|
||||
std::string channelName, password;
|
||||
|
||||
recvPacket >> channelId;
|
||||
recvPacket.ReadBit(); // unknowns
|
||||
recvPacket.ReadBit();
|
||||
uint8 unknown1 = recvPacket.ReadBit(); // unknowns
|
||||
uint8 unknown2 = recvPacket.ReadBit();
|
||||
channelLength = recvPacket.ReadBits(8);
|
||||
passLength = recvPacket.ReadBits(8);
|
||||
channelName = recvPacket.ReadString(channelLength);
|
||||
pass = recvPacket.ReadString(passLength);
|
||||
password = recvPacket.ReadString(passLength);
|
||||
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_JOIN_CHANNEL %s Channel: %u, unk1: %u, unk2: %u, channel: %s, password: %s",
|
||||
GetPlayerInfo().c_str(), channelId, unknown1, unknown2, channelName.c_str(), password.c_str());
|
||||
|
||||
if (channelId)
|
||||
{
|
||||
@@ -43,254 +44,272 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
|
||||
if (!channel)
|
||||
return;
|
||||
|
||||
AreaTableEntry const* current_zone = GetAreaEntryByAreaID(_player->GetZoneId());
|
||||
if (!current_zone)
|
||||
return;
|
||||
|
||||
if (!_player->CanJoinConstantChannelInZone(channel, current_zone))
|
||||
AreaTableEntry const* zone = GetAreaEntryByAreaID(GetPlayer()->GetZoneId());
|
||||
if (!zone || !GetPlayer()->CanJoinConstantChannelInZone(channel, zone))
|
||||
return;
|
||||
}
|
||||
|
||||
if (channelName.empty())
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
{
|
||||
cMgr->setTeam(_player->GetTeam());
|
||||
if (Channel* chn = cMgr->GetJoinChannel(channelName, channelId))
|
||||
chn->Join(_player->GetGUID(), pass.c_str());
|
||||
cMgr->setTeam(GetPlayer()->GetTeam());
|
||||
if (Channel* channel = cMgr->GetJoinChannel(channelName, channelId))
|
||||
channel->JoinChannel(GetPlayer(), password);
|
||||
}
|
||||
}
|
||||
|
||||
void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 unk;
|
||||
std::string channelname;
|
||||
std::string channelName;
|
||||
recvPacket >> unk; // channel id?
|
||||
uint32 length = recvPacket.ReadBits(8);
|
||||
channelname = recvPacket.ReadString(length);
|
||||
channelName = recvPacket.ReadString(length);
|
||||
|
||||
if (channelname.empty())
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_LEAVE_CHANNEL %s Channel: %s, unk1: %u",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), unk);
|
||||
|
||||
if (channelName.empty())
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
{
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->Leave(_player->GetGUID(), true);
|
||||
cMgr->LeftChannel(channelname);
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->LeaveChannel(GetPlayer(), true);
|
||||
cMgr->LeftChannel(channelName);
|
||||
}
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelList(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 length = recvPacket.ReadBits(8);
|
||||
std::string channelname = recvPacket.ReadString(length);
|
||||
std::string channelName = recvPacket.ReadString(length);
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->List(_player);
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "%s %s Channel: %s",
|
||||
recvPacket.GetOpcode() == CMSG_CHANNEL_DISPLAY_LIST ? "CMSG_CHANNEL_DISPLAY_LIST" : "CMSG_CHANNEL_LIST",
|
||||
GetPlayerInfo().c_str(), channelName.c_str());
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->List(GetPlayer());
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelPassword(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
uint32 nameLength = recvPacket.ReadBits(8);
|
||||
uint32 passLength = recvPacket.ReadBits(7);
|
||||
|
||||
std::string channelname = recvPacket.ReadString(nameLength);
|
||||
std::string pass = recvPacket.ReadString(passLength);
|
||||
std::string channelName = recvPacket.ReadString(nameLength);
|
||||
std::string password = recvPacket.ReadString(passLength);
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->Password(_player->GetGUID(), pass.c_str());
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_PASSWORD %s Channel: %s, Password: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), password.c_str());
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->Password(GetPlayer(), password);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelSetOwner(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 channelLength = recvPacket.ReadBits(8);
|
||||
uint32 nameLength = recvPacket.ReadBits(7);
|
||||
|
||||
std::string newp = recvPacket.ReadString(nameLength);
|
||||
std::string channelname = recvPacket.ReadString(channelLength);
|
||||
std::string targetName = recvPacket.ReadString(nameLength);
|
||||
std::string channelName = recvPacket.ReadString(channelLength);
|
||||
|
||||
if (!normalizePlayerName(newp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_SET_OWNER %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->SetOwner(_player->GetGUID(), newp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->SetOwner(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelOwner(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
uint32 length = recvPacket.ReadBits(8);
|
||||
std::string channelname = recvPacket.ReadString(length);
|
||||
std::string channelName = recvPacket.ReadString(length);
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->SendWhoOwner(_player->GetGUID());
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_OWNER %s Channel: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str());
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->SendWhoOwner(GetPlayer()->GetGUID());
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelModerator(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 channelLength = recvPacket.ReadBits(8);
|
||||
uint32 nameLength = recvPacket.ReadBits(7);
|
||||
|
||||
std::string otp = recvPacket.ReadString(nameLength);
|
||||
std::string channelname = recvPacket.ReadString(channelLength);
|
||||
std::string targetName = recvPacket.ReadString(nameLength);
|
||||
std::string channelName = recvPacket.ReadString(channelLength);
|
||||
|
||||
if (!normalizePlayerName(otp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_MODERATOR %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->SetModerator(_player->GetGUID(), otp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->SetModerator(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelUnmoderator(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 nameLength = recvPacket.ReadBits(7);
|
||||
uint32 channelLength = recvPacket.ReadBits(8);
|
||||
|
||||
std::string channelname = recvPacket.ReadString(channelLength);
|
||||
std::string otp = recvPacket.ReadString(nameLength);
|
||||
std::string channelName = recvPacket.ReadString(channelLength);
|
||||
std::string targetName = recvPacket.ReadString(nameLength);
|
||||
|
||||
if (!normalizePlayerName(otp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNMODERATOR %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->UnsetModerator(_player->GetGUID(), otp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->UnsetModerator(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelMute(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
uint32 channelLength = recvPacket.ReadBits(8);
|
||||
uint32 nameLength = recvPacket.ReadBits(7);
|
||||
|
||||
std::string channelname = recvPacket.ReadString(channelLength);
|
||||
std::string otp = recvPacket.ReadString(nameLength);
|
||||
std::string channelName = recvPacket.ReadString(channelLength);
|
||||
std::string targetName = recvPacket.ReadString(nameLength);
|
||||
|
||||
if (!normalizePlayerName(otp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_MUTE %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->SetMute(_player->GetGUID(), otp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->SetMute(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 nameLength = recvPacket.ReadBits(8);
|
||||
uint32 channelLength = recvPacket.ReadBits(7);
|
||||
|
||||
std::string otp = recvPacket.ReadString(nameLength);
|
||||
std::string channelname = recvPacket.ReadString(channelLength);
|
||||
std::string targetName = recvPacket.ReadString(nameLength);
|
||||
std::string channelName = recvPacket.ReadString(channelLength);
|
||||
|
||||
if (!normalizePlayerName(otp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNMUTE %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->UnsetMute(_player->GetGUID(), otp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->UnsetMute(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelInvite(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
uint32 nameLength = recvPacket.ReadBits(7);
|
||||
uint32 channelLength = recvPacket.ReadBits(8);
|
||||
|
||||
std::string otp = recvPacket.ReadString(nameLength);
|
||||
std::string channelname = recvPacket.ReadString(channelLength);
|
||||
std::string targetName = recvPacket.ReadString(nameLength);
|
||||
std::string channelName = recvPacket.ReadString(channelLength);
|
||||
|
||||
if (!normalizePlayerName(otp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_INVITE %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->Invite(_player->GetGUID(), otp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->Invite(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelKick(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
uint32 channelLength = recvPacket.ReadBits(8);
|
||||
uint32 nameLength = recvPacket.ReadBits(7);
|
||||
|
||||
std::string channelname = recvPacket.ReadString(channelLength);
|
||||
std::string otp = recvPacket.ReadString(nameLength);
|
||||
std::string channelName = recvPacket.ReadString(channelLength);
|
||||
std::string targetName = recvPacket.ReadString(nameLength);
|
||||
|
||||
if (!normalizePlayerName(otp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_KICK %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->Kick(_player->GetGUID(), otp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->Kick(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelBan(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
uint32 channelLength, nameLength;
|
||||
std::string channelname, otp;
|
||||
std::string channelName, targetName;
|
||||
|
||||
channelLength = recvPacket.ReadBits(8);
|
||||
nameLength = recvPacket.ReadBits(7);
|
||||
|
||||
otp = recvPacket.ReadString(nameLength);
|
||||
channelname = recvPacket.ReadString(channelLength);
|
||||
targetName = recvPacket.ReadString(nameLength);
|
||||
channelName = recvPacket.ReadString(channelLength);
|
||||
|
||||
if (!normalizePlayerName(otp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_BAN %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->Ban(_player->GetGUID(), otp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->Ban(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelUnban(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 channelLength = recvPacket.ReadBits(7);
|
||||
uint32 nameLength = recvPacket.ReadBits(8);
|
||||
|
||||
std::string otp = recvPacket.ReadString(nameLength);
|
||||
std::string channelname = recvPacket.ReadString(channelLength);
|
||||
std::string targetName = recvPacket.ReadString(nameLength);
|
||||
std::string channelName = recvPacket.ReadString(channelLength);
|
||||
|
||||
if (!normalizePlayerName(otp))
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNBAN %s Channel: %s, Target: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
|
||||
|
||||
if (!normalizePlayerName(targetName))
|
||||
return;
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->UnBan(_player->GetGUID(), otp.c_str());
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->UnBan(GetPlayer(), targetName);
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
|
||||
uint32 length = recvPacket.ReadBits(8);
|
||||
std::string channelname = recvPacket.ReadString(length);
|
||||
std::string channelName = recvPacket.ReadString(length);
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
chn->Announce(_player->GetGUID());
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_ANNOUNCEMENTS %s Channel: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str());
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->Announce(GetPlayer());
|
||||
}
|
||||
|
||||
void WorldSession::HandleChannelDisplayListQuery(WorldPacket &recvPacket)
|
||||
@@ -301,17 +320,23 @@ void WorldSession::HandleChannelDisplayListQuery(WorldPacket &recvPacket)
|
||||
|
||||
void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
std::string channelname;
|
||||
recvPacket >> channelname;
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(_player->GetTeam()))
|
||||
std::string channelName;
|
||||
recvPacket >> channelName;
|
||||
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_GET_CHANNEL_MEMBER_COUNT %s Channel: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str());
|
||||
|
||||
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam()))
|
||||
{
|
||||
if (Channel* chn = cMgr->GetChannel(channelname, _player))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
{
|
||||
WorldPacket data(SMSG_CHANNEL_MEMBER_COUNT, chn->GetName().size()+1+1+4);
|
||||
data << chn->GetName();
|
||||
data << uint8(chn->GetFlags());
|
||||
data << uint32(chn->GetNumPlayers());
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "SMSG_CHANNEL_MEMBER_COUNT %s Channel: %s Count: %u",
|
||||
GetPlayerInfo().c_str(), channelName.c_str(), channel->GetNumPlayers());
|
||||
|
||||
WorldPacket data(SMSG_CHANNEL_MEMBER_COUNT, channel->GetName().size() + 1 + 4);
|
||||
data << channel->GetName();
|
||||
data << uint8(channel->GetFlags());
|
||||
data << uint32(channel->GetNumPlayers());
|
||||
SendPacket(&data);
|
||||
}
|
||||
}
|
||||
@@ -319,10 +344,15 @@ void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
|
||||
|
||||
void WorldSession::HandleSetChannelWatch(WorldPacket& recvPacket)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
|
||||
std::string channelname;
|
||||
recvPacket >> channelname;
|
||||
/*if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
|
||||
if (Channel* chn = cMgr->GetChannel(channelName, _player))
|
||||
chn->JoinNotify(_player->GetGUID());*/
|
||||
std::string channelName;
|
||||
recvPacket >> channelName;
|
||||
|
||||
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_SET_CHANNEL_WATCH %s Channel: %s",
|
||||
GetPlayerInfo().c_str(), channelName.c_str());
|
||||
|
||||
/*
|
||||
if (ChannelMgr* cMgr = channelMgr(GetPlayer()->GetTeam()))
|
||||
if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
|
||||
channel->JoinNotify(GetPlayer());
|
||||
*/
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user