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

[0036] Fix chat handler. Author: @DDuarte

Browse source 
Signed-off-by: Yaki Khadafi <elsoldollo@gmail.com>
This commit is contained in:
Yaki Khadafi 2012-08-09 17:34:02 +03:00 • committed by Antz
parent 27f2d4ce1c
commit c05133f8fb
12 changed files with 352 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/game/Chat.cpp
View file

@ -2043,7 +2043,7 @@ bool ChatHandler::isValidChatMessage(const char* message)
}
// Note: target_guid used only in CHAT_MSG_WHISPER_INFORM mode (in this case channelName ignored)
void ChatHandler::FillMessageData(WorldPacket* data, WorldSession* session, uint8 type, uint32 language, const char* channelName, ObjectGuid targetGuid, const char* message, Unit* speaker)
void ChatHandler::FillMessageData(WorldPacket* data, WorldSession* session, uint8 type, uint32 language, const char* channelName, ObjectGuid targetGuid, const char* message, Unit* speaker, const char* addonPrefix /*= NULL*/)
{
uint32 messageLength = (message ? strlen(message) : 0) + 1;
@ -2097,6 +2097,12 @@ void ChatHandler::FillMessageData(WorldPacket* data, WorldSession* session, uint
*data << uint32(messageLength);
*data << message;
*data << uint8(0);
if (type == CHAT_MSG_RAID_BOSS_WHISPER || type == CHAT_MSG_RAID_BOSS_EMOTE)
{
*data << float(0.0f); // Added in 4.2.0, unk
*data << uint8(0); // Added in 4.2.0, unk
}
return;
}
default:
@ -2112,9 +2118,16 @@ void ChatHandler::FillMessageData(WorldPacket* data, WorldSession* session, uint
{
MANGOS_ASSERT(channelName);
*data << channelName;
}
*data << ObjectGuid(targetGuid);
}
else if (type == CHAT_MSG_ADDON)
{
MANGOS_ASSERT(addonPrefix);
*data << addonPrefix;
}
else
*data << ObjectGuid(targetGuid);
*data << uint32(messageLength);
*data << message;
if (session != 0 && type != CHAT_MSG_WHISPER_INFORM && type != CHAT_MSG_DND && type != CHAT_MSG_AFK)

2
src/game/Chat.h
View file

@ -69,7 +69,7 @@ class MANGOS_DLL_SPEC ChatHandler
explicit ChatHandler(Player* player);
~ChatHandler();
static void FillMessageData(WorldPacket* data, WorldSession* session, uint8 type, uint32 language, const char* channelName, ObjectGuid targetGuid, const char* message, Unit* speaker);
static void FillMessageData(WorldPacket* data, WorldSession* session, uint8 type, uint32 language, const char* channelName, ObjectGuid targetGuid, const char* message, Unit* speaker, const char* addonPrefix = NULL);
static void FillMessageData(WorldPacket* data, WorldSession* session, uint8 type, uint32 language, ObjectGuid targetGuid, const char* message)
{

177
src/game/ChatHandler.cpp
View file

@ -63,16 +63,31 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
uint32 type;
uint32 lang;
recv_data >> type;
recv_data >> lang;
if (type >= MAX_CHAT_MSG_TYPE)
switch (recv_data.GetOpcode())
{
sLog.outError("CHAT: Wrong message type received: %u", type);
case CMSG_MESSAGECHAT_SAY: type = CHAT_MSG_SAY; break;
case CMSG_MESSAGECHAT_YELL: type = CHAT_MSG_YELL; break;
case CMSG_MESSAGECHAT_CHANNEL: type = CHAT_MSG_CHANNEL; break;
case CMSG_MESSAGECHAT_WHISPER: type = CHAT_MSG_WHISPER; break;
case CMSG_MESSAGECHAT_GUILD: type = CHAT_MSG_GUILD; break;
case CMSG_MESSAGECHAT_OFFICER: type = CHAT_MSG_OFFICER; break;
case CMSG_MESSAGECHAT_AFK: type = CHAT_MSG_AFK; break;
case CMSG_MESSAGECHAT_DND: type = CHAT_MSG_DND; break;
case CMSG_MESSAGECHAT_EMOTE: type = CHAT_MSG_EMOTE; break;
case CMSG_MESSAGECHAT_PARTY: type = CHAT_MSG_PARTY; break;
case CMSG_MESSAGECHAT_RAID: type = CHAT_MSG_RAID; break;
case CMSG_MESSAGECHAT_BATTLEGROUND: type = CHAT_MSG_BATTLEGROUND; break;
case CMSG_MESSAGECHAT_RAID_WARNING: type = CHAT_MSG_RAID_WARNING; break;
default:
sLog.outError("HandleMessagechatOpcode : Unknown chat opcode (0x%X)", recv_data.GetOpcode());
recv_data.rfinish();
return;
}
DEBUG_LOG("CHAT: packet received. type %u, lang %u", type, lang);
// no language sent with emote packet.
if (type != CHAT_MSG_EMOTE && type != CHAT_MSG_AFK && type != CHAT_MSG_DND)
{
recv_data >> lang;
// prevent talking at unknown language (cheating)
LanguageDesc const* langDesc = GetLanguageDescByID(lang);
@ -123,6 +138,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
switch (type)
{
case CHAT_MSG_PARTY:
case CHAT_MSG_PARTY_LEADER:
case CHAT_MSG_RAID:
case CHAT_MSG_RAID_LEADER:
case CHAT_MSG_RAID_WARNING:
@ -157,6 +173,11 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
GetPlayer()->UpdateSpeakTime();
}
}
}
else
lang = LANG_UNIVERSAL;
DEBUG_LOG("CHAT: packet received. type %u lang %u", type, lang);
switch (type)
{
@ -165,7 +186,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_YELL:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
break;
@ -190,8 +211,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_WHISPER:
{
std::string to, msg;
recv_data >> to;
recv_data >> msg;
uint32 toLength = recv_data.ReadBits(10);
uint32 msgLength = recv_data.ReadBits(9);
to = recv_data.ReadString(toLength);
msg = recv_data.ReadString(msgLength);
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
return;
@ -230,7 +253,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_PARTY_LEADER:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
break;
@ -265,7 +288,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_GUILD:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
break;
@ -288,7 +311,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_OFFICER:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
break;
@ -311,7 +334,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_RAID:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
break;
@ -341,7 +364,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_RAID_LEADER:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (msg.empty())
break;
@ -372,7 +395,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_RAID_WARNING:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
return;
@ -394,7 +417,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_BATTLEGROUND:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
return;
@ -415,7 +438,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_BATTLEGROUND_LEADER:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
return;
@ -436,8 +459,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_CHANNEL:
{
std::string channel, msg;
recv_data >> channel;
recv_data >> msg;
uint32 channelLength = recv_data.ReadBits(10);
uint32 msgLength = recv_data.ReadBits(9);
msg = recv_data.ReadString(msgLength);
channel = recv_data.ReadString(channelLength);
if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
return;
@ -453,7 +478,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_AFK:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (!_player->isInCombat())
{
@ -479,7 +504,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
case CHAT_MSG_DND:
{
std::string msg;
recv_data >> msg;
msg = recv_data.ReadString(recv_data.ReadBits(9));
if (_player->isDND()) // Already DND
{
@ -506,6 +531,116 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
}
}
void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recv_data)
{
uint32 type;
switch (recv_data.GetOpcode())
{
case CMSG_MESSAGECHAT_ADDON_BATTLEGROUND: type = CHAT_MSG_BATTLEGROUND; break;
case CMSG_MESSAGECHAT_ADDON_GUILD: type = CHAT_MSG_GUILD; break;
case CMSG_MESSAGECHAT_ADDON_OFFICER: type = CHAT_MSG_OFFICER; break;
case CMSG_MESSAGECHAT_ADDON_PARTY: type = CHAT_MSG_PARTY; break;
case CMSG_MESSAGECHAT_ADDON_RAID: type = CHAT_MSG_RAID; break;
case CMSG_MESSAGECHAT_ADDON_WHISPER: type = CHAT_MSG_WHISPER; break;
default:
sLog.outError("HandleAddonMessagechatOpcode: Unknown addon chat opcode (0x%X)", recv_data.GetOpcode());
recv_data.rfinish();
return;
}
// Disabled addon channel?
if (!sWorld.getConfig(CONFIG_BOOL_ADDON_CHANNEL))
return;
switch (type)
{
case CHAT_MSG_BATTLEGROUND:
{
uint32 msgLen = recv_data.ReadBits(9);
uint32 prefixLen = recv_data.ReadBits(5);
std::string msg = recv_data.ReadString(msgLen);
std::string prefix = recv_data.ReadString(prefixLen);
Group* group = _player->GetGroup();
if (!group || !group->isBGGroup())
return;
WorldPacket data;
ChatHandler::FillMessageData(&data, this, type, LANG_ADDON, "", ObjectGuid(), msg.c_str(), NULL);
group->BroadcastPacket(&data, false);
break;
}
case CHAT_MSG_GUILD:
{
uint32 msgLen = recv_data.ReadBits(9);
uint32 prefixLen = recv_data.ReadBits(5);
std::string msg = recv_data.ReadString(msgLen);
std::string prefix = recv_data.ReadString(prefixLen);
if (_player->GetGuildId())
if (Guild* guild = sGuildMgr.GetGuildById(_player->GetGuildId()))
guild->BroadcastAddonToGuild(this, msg, prefix);
break;
}
case CHAT_MSG_OFFICER:
{
uint32 prefixLen = recv_data.ReadBits(5);
uint32 msgLen = recv_data.ReadBits(9);
std::string prefix = recv_data.ReadString(prefixLen);
std::string msg = recv_data.ReadString(msgLen);
if (_player->GetGuildId())
if (Guild* guild = sGuildMgr.GetGuildById(_player->GetGuildId()))
guild->BroadcastAddonToOfficers(this, msg, prefix);
break;
}
case CHAT_MSG_WHISPER:
{
uint32 msgLen = recv_data.ReadBits(9);
uint32 prefixLen = recv_data.ReadBits(5);
uint32 targetLen = recv_data.ReadBits(10);
std::string msg = recv_data.ReadString(msgLen);
std::string prefix = recv_data.ReadString(prefixLen);
std::string targetName = recv_data.ReadString(targetLen);
if (!normalizePlayerName(targetName))
break;
Player* receiver = sObjectMgr.GetPlayer(targetName.c_str());
if (!receiver)
break;
_player->WhisperAddon(msg, prefix, receiver->GetObjectGuid());
break;
}
// Messages sent to "RAID" while in a party will get delivered to "PARTY"
case CHAT_MSG_PARTY:
case CHAT_MSG_RAID:
{
uint32 prefixLen = recv_data.ReadBits(5);
uint32 msgLen = recv_data.ReadBits(9);
std::string prefix = recv_data.ReadString(prefixLen);
std::string msg = recv_data.ReadString(msgLen);
Group* group = _player->GetGroup();
if (!group || group->isBGGroup())
break;
WorldPacket data;
ChatHandler::FillMessageData(&data, this, type, LANG_ADDON, "", ObjectGuid(), msg.c_str(), NULL, prefix.c_str());
group->BroadcastPacket(&data, false, group->GetMemberGroup(_player->GetObjectGuid()));
break;
}
default:
{
sLog.outError("HandleAddonMessagechatOpcode: unknown addon message type %u", type);
break;
}
}
}
void WorldSession::HandleEmoteOpcode(WorldPacket& recv_data)
{
if (!GetPlayer()->isAlive() || GetPlayer()->hasUnitState(UNIT_STAT_DIED))

34
src/game/Guild.cpp
View file

@ -575,6 +575,23 @@ void Guild::BroadcastToGuild(WorldSession* session, const std::string& msg, uint
}
}
void Guild::BroadcastAddonToGuild(WorldSession* session, const std::string& msg, const std::string& prefix)
{
if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(), GR_RIGHT_GCHATSPEAK))
{
WorldPacket data;
ChatHandler::FillMessageData(&data, session,CHAT_MSG_GUILD, CHAT_MSG_ADDON, NULL, ObjectGuid(), msg.c_str(), NULL, prefix.c_str());
for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
{
Player* pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
if (pl && pl->GetSession() && HasRankRight(pl->GetRank(), GR_RIGHT_GCHATLISTEN) && !pl->GetSocial()->HasIgnore(session->GetPlayer()->GetObjectGuid()))
pl->GetSession()->SendPacket(&data);
}
}
}
void Guild::BroadcastToOfficers(WorldSession* session, const std::string& msg, uint32 language)
{
if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(), GR_RIGHT_OFFCHATSPEAK))
@ -592,6 +609,23 @@ void Guild::BroadcastToOfficers(WorldSession* session, const std::string& msg, u
}
}
void Guild::BroadcastAddonToOfficers(WorldSession* session, const std::string& msg, const std::string& prefix)
{
if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(), GR_RIGHT_OFFCHATSPEAK))
{
for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
{
WorldPacket data;
ChatHandler::FillMessageData(&data, session, CHAT_MSG_OFFICER, CHAT_MSG_ADDON, NULL, ObjectGuid(), msg.c_str(), NULL, prefix.c_str());
Player* pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
if (pl && pl->GetSession() && HasRankRight(pl->GetRank(), GR_RIGHT_OFFCHATLISTEN) && !pl->GetSocial()->HasIgnore(session->GetPlayer()->GetObjectGuid()))
pl->GetSession()->SendPacket(&data);
}
}
}
void Guild::BroadcastPacket(WorldPacket* packet)
{
for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)

2
src/game/Guild.h
View file

@ -343,7 +343,9 @@ class Guild
bool LoadMembersFromDB(QueryResult* guildMembersResult);
void BroadcastToGuild(WorldSession* session, const std::string& msg, uint32 language = LANG_UNIVERSAL);
void BroadcastAddonToGuild(WorldSession* session, const std::string& msg, const std::string& prefix);
void BroadcastToOfficers(WorldSession* session, const std::string& msg, uint32 language = LANG_UNIVERSAL);
void BroadcastAddonToOfficers(WorldSession* session, const std::string& msg, const std::string& prefix);
void BroadcastPacketToRank(WorldPacket* packet, uint32 rankId);
void BroadcastPacket(WorldPacket* packet);

2
src/game/Object.cpp
View file

@ -1627,6 +1627,8 @@ void WorldObject::BuildMonsterChat(WorldPacket* data, ObjectGuid senderGuid, uin
*data << uint32(strlen(text) + 1);
*data << text;
*data << uint8(0); // ChatTag
*data << float(0.0f);
*data << uint8(0);
}
void WorldObject::SendMessageToSet(WorldPacket* data, bool /*bToSelf*/)

34
src/game/Opcodes.cpp
View file

@ -194,8 +194,26 @@ void InitializeOpcodes()
//OPCODE(SMSG_GUILD_EVENT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//OPCODE(SMSG_GUILD_COMMAND_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//OPCODE(UMSG_UPDATE_GUILD, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
//OPCODE(CMSG_MESSAGECHAT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
//OPCODE(SMSG_MESSAGECHAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
OPCODE(CMSG_MESSAGECHAT_ADDON_BATTLEGROUND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_ADDON_GUILD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_ADDON_OFFICER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_ADDON_PARTY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_ADDON_RAID, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_ADDON_WHISPER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_AFK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_BATTLEGROUND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_CHANNEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_DND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_EMOTE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_GUILD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_OFFICER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_PARTY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_RAID, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_RAID_WARNING, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_SAY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_WHISPER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(CMSG_MESSAGECHAT_YELL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
OPCODE(SMSG_MESSAGECHAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
OPCODE(CMSG_JOIN_CHANNEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleJoinChannelOpcode );
//OPCODE(CMSG_LEAVE_CHANNEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLeaveChannelOpcode );
OPCODE(SMSG_CHANNEL_NOTIFY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
@ -302,11 +320,11 @@ void InitializeOpcodes()
//OPCODE(CMSG_TUTORIAL_FLAG, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialFlagOpcode );
//OPCODE(CMSG_TUTORIAL_CLEAR, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialClearOpcode );
//OPCODE(CMSG_TUTORIAL_RESET, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialResetOpcode );
//OPCODE(CMSG_STANDSTATECHANGE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleStandStateChangeOpcode );
//OPCODE(CMSG_EMOTE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEmoteOpcode );
//OPCODE(SMSG_EMOTE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//OPCODE(CMSG_TEXT_EMOTE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTextEmoteOpcode );
//OPCODE(SMSG_TEXT_EMOTE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
OPCODE(CMSG_STANDSTATECHANGE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleStandStateChangeOpcode );
OPCODE(CMSG_EMOTE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEmoteOpcode );
OPCODE(SMSG_EMOTE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
OPCODE(CMSG_TEXT_EMOTE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTextEmoteOpcode );
OPCODE(SMSG_TEXT_EMOTE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//OPCODE(CMSG_AUTOEQUIP_GROUND_ITEM, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
//OPCODE(CMSG_AUTOSTORE_GROUND_ITEM, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
//OPCODE(CMSG_AUTOSTORE_LOOT_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutostoreLootItemOpcode );
@ -711,7 +729,7 @@ void InitializeOpcodes()
//OPCODE(CMSG_GMTICKETSYSTEM_TOGGLE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
//OPCODE(CMSG_CANCEL_GROWTH_AURA, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCancelGrowthAuraOpcode );
//OPCODE(SMSG_CANCEL_AUTO_REPEAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//OPCODE(SMSG_STANDSTATE_UPDATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
OPCODE(SMSG_STANDSTATE_UPDATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//OPCODE(SMSG_LOOT_ALL_PASSED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//OPCODE(SMSG_LOOT_ROLL_WON, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//OPCODE(CMSG_LOOT_ROLL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootRoll );

32
src/game/Opcodes.h
View file

@ -188,8 +188,26 @@ enum Opcodes
SMSG_GUILD_EVENT = 0x1093,
SMSG_GUILD_COMMAND_RESULT = 0x1094,
UMSG_UPDATE_GUILD = 0x1095,
CMSG_MESSAGECHAT_ADDON_BATTLEGROUND = 0x0D46, // 4.3.4 15595
CMSG_MESSAGECHAT_ADDON_GUILD = 0x0544, // 4.3.4 15595
CMSG_MESSAGECHAT_ADDON_OFFICER = 0x3954, // 4.3.4 15595
CMSG_MESSAGECHAT_ADDON_PARTY = 0x0546, // 4.3.4 15595
CMSG_MESSAGECHAT_ADDON_RAID = 0x1D56, // 4.3.4 15595
CMSG_MESSAGECHAT_ADDON_WHISPER = 0x2146, // 4.3.4 15595
CMSG_MESSAGECHAT_AFK = 0x0D44, // 4.3.4 15595
CMSG_MESSAGECHAT_BATTLEGROUND = 0x2156, // 4.3.4 15595
CMSG_MESSAGECHAT_CHANNEL = 0x1D44, // 4.3.4 15595
CMSG_MESSAGECHAT_DND = 0x2946, // 4.3.4 15595
CMSG_MESSAGECHAT_EMOTE = 0x1156, // 4.3.4 15595
CMSG_MESSAGECHAT_GUILD = 0x3956, // 4.3.4 15595
CMSG_MESSAGECHAT_OFFICER = 0x1946, // 4.3.4 15595
CMSG_MESSAGECHAT_PARTY = 0x1D46, // 4.3.4 15595
CMSG_MESSAGECHAT_RAID = 0x2D44, // 4.3.4 15595
CMSG_MESSAGECHAT_RAID_WARNING = 0x0944, // 4.3.4 15595
CMSG_MESSAGECHAT_SAY = 0x1154, // 4.3.4 15595
SMSG_MESSAGECHAT = 0x1097,
CMSG_MESSAGECHAT_WHISPER = 0x0D56, // 4.3.4 15595
CMSG_MESSAGECHAT_YELL = 0x3544, // 4.3.4 15595
SMSG_MESSAGECHAT = 0x2026, // 4.3.4 15595
CMSG_JOIN_CHANNEL = 0x0156, // 4.3.4 15595
CMSG_LEAVE_CHANNEL = 0x1099,
SMSG_CHANNEL_NOTIFY = 0x0825, // 4.3.4 15595
@ -296,11 +314,11 @@ enum Opcodes
CMSG_TUTORIAL_FLAG = 0x10FF,
CMSG_TUTORIAL_CLEAR = 0x1100,
CMSG_TUTORIAL_RESET = 0x1101,
CMSG_STANDSTATECHANGE = 0x1102,
CMSG_EMOTE = 0x1103,
SMSG_EMOTE = 0x1104,
CMSG_TEXT_EMOTE = 0x1105,
SMSG_TEXT_EMOTE = 0x1106,
CMSG_STANDSTATECHANGE = 0x0535, // 4.3.4 15595
CMSG_EMOTE = 0x4C26, // 4.3.4 15595
SMSG_EMOTE = 0x0A34, // 4.3.4 15595
CMSG_TEXT_EMOTE = 0x2E24, // 4.3.4 15595
SMSG_TEXT_EMOTE = 0x0B05, // 4.3.4 15595
CMSG_AUTOEQUIP_GROUND_ITEM = 0x1107,
CMSG_AUTOSTORE_GROUND_ITEM = 0x1108,
CMSG_AUTOSTORE_LOOT_ITEM = 0x1109,
@ -705,7 +723,7 @@ enum Opcodes
CMSG_GMTICKETSYSTEM_TOGGLE = 0x129B,
CMSG_CANCEL_GROWTH_AURA = 0x129C,
SMSG_CANCEL_AUTO_REPEAT = 0x129D,
SMSG_STANDSTATE_UPDATE = 0x129E,
SMSG_STANDSTATE_UPDATE = 0x6F04, // 4.3.4 15595
SMSG_LOOT_ALL_PASSED = 0x129F,
SMSG_LOOT_ROLL_WON = 0x12A0,
CMSG_LOOT_ROLL = 0x12A1,

29
src/game/Player.cpp
View file

@ -18572,13 +18572,16 @@ void Player::RemovePet(PetSaveMode mode)
pet->Unsummon(mode, this);
}
void Player::BuildPlayerChat(WorldPacket* data, uint8 msgtype, const std::string& text, uint32 language) const
void Player::BuildPlayerChat(WorldPacket* data, uint8 msgtype, const std::string& text, uint32 language, const char* addonPrefix) const
{
*data << uint8(msgtype);
*data << uint32(language);
*data << ObjectGuid(GetObjectGuid());
*data << uint32(language); // language 2.1.0 ?
*data << ObjectGuid(GetObjectGuid());
*data << GetObjectGuid();
*data << uint32(0); // constant unknown time 4.3.4
if (addonPrefix)
*data << addonPrefix;
else
*data << GetObjectGuid();
*data << uint32(text.length() + 1);
*data << text;
*data << uint8(GetChatTag());
@ -18607,22 +18610,15 @@ void Player::TextEmote(const std::string& text)
void Player::Whisper(const std::string& text, uint32 language, ObjectGuid receiver)
{
if (language != LANG_ADDON) // if not addon data
language = LANG_UNIVERSAL; // whispers should always be readable
Player* rPlayer = sObjectMgr.GetPlayer(receiver);
WorldPacket data(SMSG_MESSAGECHAT, 200);
BuildPlayerChat(&data, CHAT_MSG_WHISPER, text, language);
rPlayer->GetSession()->SendPacket(&data);
// not send confirmation for addon messages
if (language != LANG_ADDON)
{
data.Initialize(SMSG_MESSAGECHAT, 200);
rPlayer->BuildPlayerChat(&data, CHAT_MSG_WHISPER_INFORM, text, language);
GetSession()->SendPacket(&data);
}
if (!isAcceptWhispers())
{
@ -18637,6 +18633,17 @@ void Player::Whisper(const std::string& text, uint32 language, ObjectGuid receiv
ChatHandler(this).PSendSysMessage(LANG_PLAYER_DND, rPlayer->GetName(), rPlayer->autoReplyMsg.c_str());
}
void Player::WhisperAddon(const std::string& text, const std::string& prefix, ObjectGuid receiver)
{
Player* rPlayer = sObjectMgr.GetPlayer(receiver);
std::string _text(text);
WorldPacket data(SMSG_MESSAGECHAT, 200);
BuildPlayerChat(&data, CHAT_MSG_WHISPER, _text, LANG_UNIVERSAL, prefix.c_str());
rPlayer->GetSession()->SendPacket(&data);
}
void Player::PetSpellInitialize()
{
Pet* pet = GetPet();

3
src/game/Player.h
View file

@ -1159,7 +1159,8 @@ class MANGOS_DLL_SPEC Player : public Unit
void Yell(const std::string& text, const uint32 language);
void TextEmote(const std::string& text);
void Whisper(const std::string& text, const uint32 language, ObjectGuid receiver);
void BuildPlayerChat(WorldPacket* data, uint8 msgtype, const std::string& text, uint32 language) const;
void WhisperAddon(const std::string& text, const std::string& prefix, ObjectGuid receiver);
void BuildPlayerChat(WorldPacket* data, uint8 msgtype, const std::string& text, uint32 language, const char* addonPrefix = NULL) const;
/*********************************************************/
/*** STORAGE SYSTEM ***/

1
src/game/WorldSession.h
View file

@ -693,6 +693,7 @@ class MANGOS_DLL_SPEC WorldSession
void SendWrongFactionNotice();
void SendChatRestrictedNotice(ChatRestrictionType restriction);
void HandleMessagechatOpcode(WorldPacket& recvPacket);
void HandleAddonMessagechatOpcode(WorldPacket& recvPacket);
void HandleTextEmoteOpcode(WorldPacket& recvPacket);
void HandleChatIgnoredOpcode(WorldPacket& recvPacket);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "0035"
#define REVISION_NR "0036"
#endif // __REVISION_NR_H__