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

Style cleanup from the Mangos Futures Team

Browse source
This commit is contained in:
Antz 2020-09-14 18:30:19 +01:00
parent 809eee0f50
commit 283c68b6a9
No known key found for this signature in database
GPG key ID: 0DF907270598C85F
203 changed files with 12039 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

96
src/game/WorldHandlers/ChatHandler.cpp
View file

@ -50,7 +50,9 @@ bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg
{
// strip invisible characters for non-addon messages
if (sWorld.getConfig(CONFIG_BOOL_CHAT_FAKE_MESSAGE_PREVENTING))
{
stripLineInvisibleChars(msg);
}
if (sWorld.getConfig(CONFIG_UINT32_CHAT_STRICT_LINK_CHECKING_SEVERITY) && GetSecurity() < SEC_MODERATOR
&& !ChatHandler(this).isValidChatMessage(msg.c_str()))
@ -58,7 +60,9 @@ bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg
sLog.outError("Player %s (GUID: %u) sent a chatmessage with an invalid link: %s", GetPlayer()->GetName(),
GetPlayer()->GetGUIDLow(), msg.c_str());
if (sWorld.getConfig(CONFIG_UINT32_CHAT_STRICT_LINK_CHECKING_KICK))
{
KickPlayer();
}
return false;
}
}
@ -137,12 +141,16 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
{
// send in universal language if player in .gmon mode (ignore spell effects)
if (_player->isGameMaster())
{
lang = LANG_UNIVERSAL;
}
else
{
// send in universal language in two side iteration allowed mode
if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT))
{
lang = LANG_UNIVERSAL;
}
else
{
switch (type)
@ -154,13 +162,17 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_RAID_WARNING:
// allow two side chat at group channel if two side group allowed
if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP))
{
lang = LANG_UNIVERSAL;
}
break;
case CHAT_MSG_GUILD:
case CHAT_MSG_OFFICER:
// allow two side chat at guild channel if two side guild allowed
if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD))
{
lang = LANG_UNIVERSAL;
}
break;
}
}
@ -168,7 +180,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
// but overwrite it by SPELL_AURA_MOD_LANGUAGE auras (only single case used)
Unit::AuraList const& ModLangAuras = _player->GetAurasByType(SPELL_AURA_MOD_LANGUAGE);
if (!ModLangAuras.empty())
{
lang = ModLangAuras.front()->GetModifier()->m_miscvalue;
}
}
if (type != CHAT_MSG_AFK && type != CHAT_MSG_DND)
@ -185,7 +199,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
}
else
{
lang = LANG_UNIVERSAL;
}
DEBUG_LOG("CHAT: packet received. type %u lang %u", type, lang);
@ -199,10 +215,14 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
{
break;
}
if (ChatHandler(this).ParseCommands(msg.c_str()))
{
break;
}
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
{
@ -210,7 +230,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
if (type == CHAT_MSG_SAY)
{
@ -265,12 +287,16 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
return;
}
if (msg.empty())
{
break;
}
if (!normalizePlayerName(to))
{
SendPlayerNotFoundNotice(to);
{ break; }
{
break;
}
}
Player* player = sObjectMgr.GetPlayer(to.c_str());
@ -308,10 +334,14 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
{
break;
}
if (ChatHandler(this).ParseCommands(msg.c_str()))
{
break;
}
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
{
@ -319,7 +349,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
// if player is in battleground, he cannot say to battleground members by /p
Group* group = GetPlayer()->GetOriginalGroup();
@ -356,10 +388,14 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
{
break;
}
if (ChatHandler(this).ParseCommands(msg.c_str()))
{
break;
}
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
{
@ -367,7 +403,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
if (GetPlayer()->GetGuildId())
if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
@ -391,10 +429,14 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
{
break;
}
if (ChatHandler(this).ParseCommands(msg.c_str()))
{
break;
}
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
{
@ -402,7 +444,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
if (GetPlayer()->GetGuildId())
if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
@ -426,10 +470,14 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
{
break;
}
if (ChatHandler(this).ParseCommands(msg.c_str()))
{
break;
}
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
{
@ -437,7 +485,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
// if player is in battleground, he cannot say to battleground members by /ra
Group* group = GetPlayer()->GetOriginalGroup();
@ -468,10 +518,14 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
{
break;
}
if (ChatHandler(this).ParseCommands(msg.c_str()))
{
break;
}
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
{
@ -479,7 +533,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
// if player is in battleground, he cannot say to battleground members by /ra
Group* group = GetPlayer()->GetOriginalGroup();
@ -516,7 +572,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
Group* group = GetPlayer()->GetGroup();
if (!group || !group->isRaidGroup() ||
@ -548,7 +606,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
// battleground raid is always in Player->GetGroup(), never in GetOriginalGroup()
Group* group = GetPlayer()->GetGroup();
@ -581,7 +641,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
// battleground raid is always in Player->GetGroup(), never in GetOriginalGroup()
Group* group = GetPlayer()->GetGroup();
@ -617,7 +679,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
if (msg.empty())
{
break;
}
if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
{
@ -646,16 +710,22 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
if (_player->isAFK()) // Already AFK
{
if (msg.empty())
{
_player->ToggleAFK(); // Remove AFK
}
else
{
_player->autoReplyMsg = msg; // Update message
}
}
else // New AFK mode
{
_player->autoReplyMsg = msg.empty() ? GetMangosString(LANG_PLAYER_AFK_DEFAULT) : msg;
if (_player->isDND())
{
_player->ToggleDND();
}
_player->ToggleAFK();
}
@ -677,16 +747,22 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
if (_player->isDND()) // Already DND
{
if (msg.empty())
{
_player->ToggleDND(); // Remove DND
}
else
{
_player->autoReplyMsg = msg; // Update message
}
}
else // New DND mode
{
_player->autoReplyMsg = msg.empty() ? GetMangosString(LANG_PLAYER_DND_DEFAULT) : msg;
if (_player->isAFK())
{
_player->ToggleAFK();
}
_player->ToggleDND();
}
@ -760,7 +836,9 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recv_data)
if (_player->GetGuildId())
if (Guild* guild = sGuildMgr.GetGuildById(_player->GetGuildId()))
{
guild->BroadcastAddonToGuild(this, msg, prefix);
}
break;
}
@ -773,7 +851,9 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recv_data)
if (_player->GetGuildId())
if (Guild* guild = sGuildMgr.GetGuildById(_player->GetGuildId()))
{
guild->BroadcastAddonToOfficers(this, msg, prefix);
}
break;
}
case CHAT_MSG_WHISPER:
@ -786,11 +866,15 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recv_data)
std::string targetName = recv_data.ReadString(targetLen);
if (!normalizePlayerName(targetName))
{
break;
}
Player* receiver = sObjectMgr.GetPlayer(targetName.c_str());
if (!receiver)
{
break;
}
WorldPacket data;
ChatHandler::BuildChatPacket(data, type, msg.c_str(), LANG_UNIVERSAL, CHAT_TAG_NONE, ObjectGuid(), NULL, receiver->GetObjectGuid(), targetName.c_str(), NULL, 0, prefix.c_str());
@ -808,7 +892,9 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recv_data)
Group* group = _player->GetGroup();
if (!group || group->isBGGroup())
{
break;
}
WorldPacket data;
ChatHandler::BuildChatPacket(data, type, msg.c_str(), LANG_ADDON, CHAT_TAG_NONE, ObjectGuid(), NULL, ObjectGuid(), NULL, NULL, 0, prefix.c_str());
@ -859,9 +945,13 @@ namespace MaNGOS
data << uint32(i_emote_num);
data << uint32(namlen);
if (namlen > 1)
{
data.append(nam, namlen);
}
else
{
data << uint8(0x00);
}
DEBUG_LOG("SMSG_TEXT_EMOTE i_text_emote %u i_emote_num %u",
i_text_emote, i_emote_num);
@ -923,7 +1013,9 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket& recv_data)
{
// in feign death state allowed only text emotes.
if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
{
break;
}
GetPlayer()->HandleEmoteCommand(emote_id);
break;
@ -941,7 +1033,9 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket& recv_data)
// Send scripted event call
if (unit && unit->GetTypeId() == TYPEID_UNIT && ((Creature*)unit)->AI())
{
((Creature*)unit)->AI()->ReceiveEmote(GetPlayer(), text_emote);
}
}
void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recv_data)