josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Chat: Prevent turning whispers on, receive spam about AFK or DND in case of whispering with addon message

Browse Source
This commit is contained in:
tobmaps
2011-07-24 03:14:28 +07:00
parent f526b61e1a
commit 5a370392d4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+9 -3
View File
@@ -19266,7 +19266,9 @@ void Player::TextEmote(const std::string& text)
void Player::Whisper(const std::string& text, uint32 language, uint64 receiver) void Player::Whisper(const std::string& text, uint32 language, uint64 receiver)
{ {
if (language != LANG_ADDON) // if not addon data bool isAddonMessage = language == LANG_ADDON;
if (!isAddonMessage) // if not addon data
language = LANG_UNIVERSAL; // whispers should always be readable language = LANG_UNIVERSAL; // whispers should always be readable
Player *rPlayer = sObjectMgr->GetPlayer(receiver); Player *rPlayer = sObjectMgr->GetPlayer(receiver);
@@ -19282,17 +19284,21 @@ void Player::Whisper(const std::string& text, uint32 language, uint64 receiver)
rPlayer->GetSession()->SendPacket(&data); rPlayer->GetSession()->SendPacket(&data);
// not send confirmation for addon messages // not send confirmation for addon messages
if (language != LANG_ADDON) if (!isAddonMessage)
{ {
data.Initialize(SMSG_MESSAGECHAT, 200); data.Initialize(SMSG_MESSAGECHAT, 200);
rPlayer->BuildPlayerChat(&data, CHAT_MSG_WHISPER_INFORM, _text, language); rPlayer->BuildPlayerChat(&data, CHAT_MSG_WHISPER_INFORM, _text, language);
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
} }
} }
else else if (!isAddonMessage)
// announce to player that player he is whispering to is dnd and cannot receive his message // announce to player that player he is whispering to is dnd and cannot receive his message
ChatHandler(this).PSendSysMessage(LANG_PLAYER_DND, rPlayer->GetName(), rPlayer->dndMsg.c_str()); ChatHandler(this).PSendSysMessage(LANG_PLAYER_DND, rPlayer->GetName(), rPlayer->dndMsg.c_str());
// rest stuff shouldn't happen in case of addon message
if (isAddonMessage)
return;
if (!isAcceptWhispers() && !isGameMaster() && !rPlayer->isGameMaster()) if (!isAcceptWhispers() && !isGameMaster() && !rPlayer->isGameMaster())
{ {
SetAcceptWhispers(true); SetAcceptWhispers(true);