mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chat fix.

Browse source
This commit is contained in:
tomrus88 2009-12-18 02:48:16 +03:00
parent 58892c5025
commit 1ba1696434
3 changed files with 71 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

92
src/game/ChatHandler.cpp
View file

@ -73,7 +73,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
return; return;
} }
//sLog.outDebug("CHAT: packet received. type %u, lang %u", type, lang ); sLog.outDebug("CHAT: packet received. type %u, lang %u", type, lang );
// prevent talking at unknown language (cheating) // prevent talking at unknown language (cheating)
LanguageDesc const* langDesc = GetLanguageDescByID(lang); LanguageDesc const* langDesc = GetLanguageDescByID(lang);
@ -163,7 +163,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
case CHAT_MSG_EMOTE: case CHAT_MSG_EMOTE:
case CHAT_MSG_YELL: case CHAT_MSG_YELL:
{ {
std::string msg = ""; std::string msg;
recv_data >> msg; recv_data >> msg;
if(msg.empty()) if(msg.empty())
@ -200,9 +200,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
if(!normalizePlayerName(to)) if(!normalizePlayerName(to))
{ {
WorldPacket data(SMSG_CHAT_PLAYER_NOT_FOUND, (to.size()+1)); SendPlayerNotFoundNotice(to);
data<<to;
SendPacket(&data);
break; break;
} }
@ -211,9 +209,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
uint32 pSecurity = player ? player->GetSession()->GetSecurity() : SEC_PLAYER; uint32 pSecurity = player ? player->GetSession()->GetSecurity() : SEC_PLAYER;
if (!player || (tSecurity == SEC_PLAYER && pSecurity > SEC_PLAYER && !player->isAcceptWhispers())) if (!player || (tSecurity == SEC_PLAYER && pSecurity > SEC_PLAYER && !player->isAcceptWhispers()))
{ {
WorldPacket data(SMSG_CHAT_PLAYER_NOT_FOUND, (to.size()+1)); SendPlayerNotFoundNotice(to);
data<<to;
SendPacket(&data);
return; return;
} }
@ -223,9 +219,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
uint32 sideb = player->GetTeam(); uint32 sideb = player->GetTeam();
if( sidea != sideb ) if( sidea != sideb )
{ {
WorldPacket data(SMSG_CHAT_PLAYER_NOT_FOUND, (to.size()+1)); SendPlayerNotFoundNotice(to);
data<<to;
SendPacket(&data);
return; return;
} }
} }
@ -234,8 +228,9 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
} break; } break;
case CHAT_MSG_PARTY: case CHAT_MSG_PARTY:
case CHAT_MSG_PARTY_LEADER:
{ {
std::string msg = ""; std::string msg;
recv_data >> msg; recv_data >> msg;
if(msg.empty()) if(msg.empty())
@ -252,18 +247,24 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
// if player is in battleground, he cannot say to battleground members by /p // if player is in battleground, he cannot say to battleground members by /p
Group *group = GetPlayer()->GetOriginalGroup(); Group *group = GetPlayer()->GetOriginalGroup();
// so if player hasn't OriginalGroup and his player->GetGroup() is BG raid, then return if(!group)
if( !group && (!(group = GetPlayer()->GetGroup()) || group->isBGGroup()) ) {
group = _player->GetGroup();
if(!group || group->isBGGroup())
return;
}
if((type == CHAT_MSG_PARTY_LEADER) && !group->IsLeader(_player->GetGUID()))
return; return;
WorldPacket data; WorldPacket data;
ChatHandler::FillMessageData(&data, this, CHAT_MSG_PARTY, lang, NULL, 0, msg.c_str(),NULL); ChatHandler::FillMessageData(&data, this, type, lang, NULL, 0, msg.c_str(), NULL);
group->BroadcastPacket(&data, false, group->GetMemberGroup(GetPlayer()->GetGUID())); group->BroadcastPacket(&data, false, group->GetMemberGroup(GetPlayer()->GetGUID()));
} } break;
break;
case CHAT_MSG_GUILD: case CHAT_MSG_GUILD:
{ {
std::string msg = ""; std::string msg;
recv_data >> msg; recv_data >> msg;
if(msg.empty()) if(msg.empty())
@ -279,17 +280,13 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
break; break;
if (GetPlayer()->GetGuildId()) if (GetPlayer()->GetGuildId())
{ if (Guild *guild = sObjectMgr.GetGuildById(GetPlayer()->GetGuildId()))
Guild *guild = sObjectMgr.GetGuildById(GetPlayer()->GetGuildId());
if (guild)
guild->BroadcastToGuild(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL); guild->BroadcastToGuild(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
} } break;
break;
}
case CHAT_MSG_OFFICER: case CHAT_MSG_OFFICER:
{ {
std::string msg = ""; std::string msg;
recv_data >> msg; recv_data >> msg;
if(msg.empty()) if(msg.empty())
@ -305,16 +302,13 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
break; break;
if (GetPlayer()->GetGuildId()) if (GetPlayer()->GetGuildId())
{ if (Guild *guild = sObjectMgr.GetGuildById(GetPlayer()->GetGuildId()))
Guild *guild = sObjectMgr.GetGuildById(GetPlayer()->GetGuildId());
if (guild)
guild->BroadcastToOfficers(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL); guild->BroadcastToOfficers(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
} } break;
break;
}
case CHAT_MSG_RAID: case CHAT_MSG_RAID:
{ {
std::string msg=""; std::string msg;
recv_data >> msg; recv_data >> msg;
if(msg.empty()) if(msg.empty())
@ -331,9 +325,12 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
// if player is in battleground, he cannot say to battleground members by /ra // if player is in battleground, he cannot say to battleground members by /ra
Group *group = GetPlayer()->GetOriginalGroup(); Group *group = GetPlayer()->GetOriginalGroup();
// so if player hasn't OriginalGroup and his player->GetGroup() is BG raid or his group isn't raid, then return if(!group)
if ((!group && !(group = GetPlayer()->GetGroup())) || group->isBGGroup() || !group->isRaidGroup()) {
group = GetPlayer()->GetGroup();
if(!group || group->isBGGroup() || !group->isRaidGroup())
return; return;
}
WorldPacket data; WorldPacket data;
ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID, lang, "", 0, msg.c_str(), NULL); ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID, lang, "", 0, msg.c_str(), NULL);
@ -341,7 +338,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
} break; } break;
case CHAT_MSG_RAID_LEADER: case CHAT_MSG_RAID_LEADER:
{ {
std::string msg=""; std::string msg;
recv_data >> msg; recv_data >> msg;
if(msg.empty()) if(msg.empty())
@ -358,16 +355,21 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
// if player is in battleground, he cannot say to battleground members by /ra // if player is in battleground, he cannot say to battleground members by /ra
Group *group = GetPlayer()->GetOriginalGroup(); Group *group = GetPlayer()->GetOriginalGroup();
if ((!group && !(group = GetPlayer()->GetGroup())) || group->isBGGroup() || !group->isRaidGroup()) if(!group)
{
group = GetPlayer()->GetGroup();
if(!group || group->isBGGroup() || !group->isRaidGroup() || !group->IsLeader(_player->GetGUID()))
return; return;
}
WorldPacket data; WorldPacket data;
ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID_LEADER, lang, "", 0, msg.c_str(), NULL); ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID_LEADER, lang, "", 0, msg.c_str(), NULL);
group->BroadcastPacket(&data, false); group->BroadcastPacket(&data, false);
} break; } break;
case CHAT_MSG_RAID_WARNING: case CHAT_MSG_RAID_WARNING:
{ {
std::string msg=""; std::string msg;
recv_data >> msg; recv_data >> msg;
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang)) if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
@ -388,7 +390,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
case CHAT_MSG_BATTLEGROUND: case CHAT_MSG_BATTLEGROUND:
{ {
std::string msg=""; std::string msg;
recv_data >> msg; recv_data >> msg;
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang)) if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
@ -409,7 +411,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
case CHAT_MSG_BATTLEGROUND_LEADER: case CHAT_MSG_BATTLEGROUND_LEADER:
{ {
std::string msg=""; std::string msg;
recv_data >> msg; recv_data >> msg;
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang)) if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
@ -430,9 +432,8 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
case CHAT_MSG_CHANNEL: case CHAT_MSG_CHANNEL:
{ {
std::string channel = "", msg = ""; std::string channel, msg;
recv_data >> channel; recv_data >> channel;
recv_data >> msg; recv_data >> msg;
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang)) if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
@ -442,10 +443,8 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
break; break;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam())) if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
{
if(Channel *chn = cMgr->GetChannel(channel, _player)) if(Channel *chn = cMgr->GetChannel(channel, _player))
chn->Say(_player->GetGUID(), msg.c_str(), lang); chn->Say(_player->GetGUID(), msg.c_str(), lang);
}
} break; } break;
case CHAT_MSG_AFK: case CHAT_MSG_AFK:
@ -610,3 +609,10 @@ void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recv_data )
ChatHandler::FillMessageData(&data, this, CHAT_MSG_IGNORED, LANG_UNIVERSAL, NULL, GetPlayer()->GetGUID(), GetPlayer()->GetName(), NULL); ChatHandler::FillMessageData(&data, this, CHAT_MSG_IGNORED, LANG_UNIVERSAL, NULL, GetPlayer()->GetGUID(), GetPlayer()->GetName(), NULL);
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
} }
void WorldSession::SendPlayerNotFoundNotice(std::string name)
{
WorldPacket data(SMSG_CHAT_PLAYER_NOT_FOUND, name.size()+1);
data << name;
SendPacket(&data);
}

1
src/game/WorldSession.h
View file

@ -561,6 +561,7 @@ class MANGOS_DLL_SPEC WorldSession
void HandleQuestPushResult(WorldPacket& recvPacket); void HandleQuestPushResult(WorldPacket& recvPacket);
bool processChatmessageFurtherAfterSecurityChecks(std::string&, uint32); bool processChatmessageFurtherAfterSecurityChecks(std::string&, uint32);
void SendPlayerNotFoundNotice(std::string name);
void HandleMessagechatOpcode(WorldPacket& recvPacket); void HandleMessagechatOpcode(WorldPacket& recvPacket);
void HandleTextEmoteOpcode(WorldPacket& recvPacket); void HandleTextEmoteOpcode(WorldPacket& recvPacket);
void HandleChatIgnoredOpcode(WorldPacket& recvPacket); void HandleChatIgnoredOpcode(WorldPacket& recvPacket);