aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/ChatHandler.cpp
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2014-11-10 15:18:42 +0100
committerRat <gmstreetrat@gmail.com>2014-11-10 15:18:42 +0100
commitef9bc5b17b3ad4f3bdfbd67c937b90d8d1dcd3eb (patch)
tree9e939bb2b427ba8ae3e4c5512a6fc9975469c31f /src/server/game/Handlers/ChatHandler.cpp
parentd268b81044707e15266eadb4ab49f176135d4c26 (diff)
parentac0ff1fc9b4c409089bbcb0256bdbc2f5cc4a405 (diff)
Merge branch 'Intel-dbc' into 6.x
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
-rw-r--r--src/server/game/Handlers/ChatHandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index 2798a81a7c5..a2fc248bb61 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -741,7 +741,7 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket& recvData)
if (!em)
return;
- uint32 emote_anim = em->textid;
+ uint32 emote_anim = em->EmoteID;
switch (emote_anim)
{