diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-03-10 18:51:09 +0100 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2015-03-10 18:51:09 +0100 |
| commit | 654d7fc7d5612cc90d0f2f4324d540bad5d55ac5 (patch) | |
| tree | 21b6a17c77bb60acabd3a0f9e13a7eea2d40ea91 /src/server/game/Handlers/ChatHandler.cpp | |
| parent | 47517b21288bfba1584453e20b2e022fd4288e32 (diff) | |
| parent | 7b9ec7101c87ae3b25b6ba8028f30a1a3d17d1f5 (diff) | |
Merge pull request #14327 from DJScias/opcode_emoteclient
Core/Packets: update & enabled CMSG_EMOTE
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ChatHandler.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 47084fc9ecb..c37bcb6aaf8 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -524,15 +524,13 @@ void WorldSession::HandleChatMessageDNDOpcode(WorldPackets::Chat::ChatMessageDND sScriptMgr->OnPlayerChat(sender, CHAT_MSG_DND, LANG_UNIVERSAL, packet.Text); } -void WorldSession::HandleEmoteOpcode(WorldPacket& recvData) +void WorldSession::HandleEmoteOpcode(WorldPackets::Chat::EmoteClient& packet) { if (!GetPlayer()->IsAlive() || GetPlayer()->HasUnitState(UNIT_STATE_DIED)) return; - uint32 emote; - recvData >> emote; - sScriptMgr->OnPlayerEmote(GetPlayer(), emote); - GetPlayer()->HandleEmoteCommand(emote); + sScriptMgr->OnPlayerEmote(GetPlayer(), packet.EmoteID); + GetPlayer()->HandleEmoteCommand(packet.EmoteID); } void WorldSession::HandleTextEmoteOpcode(WorldPackets::Chat::CTextEmote& packet) |