diff options
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ChatHandler.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index bf71dc44379..34185d478d5 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -570,8 +570,7 @@ void WorldSession::HandleEmoteOpcode(WorldPackets::Chat::EmoteClient& /* packet sScriptMgr->OnPlayerClearEmote(GetPlayer()); - if (_player->GetUInt32Value(UNIT_NPC_EMOTESTATE)) - _player->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + _player->SetEmoteState(EMOTE_ONESHOT_NONE); } void WorldSession::HandleTextEmoteOpcode(WorldPackets::Chat::CTextEmote& packet) @@ -603,7 +602,7 @@ void WorldSession::HandleTextEmoteOpcode(WorldPackets::Chat::CTextEmote& packet) break; case EMOTE_STATE_DANCE: case EMOTE_STATE_READ: - _player->SetUInt32Value(UNIT_NPC_EMOTESTATE, emoteAnim); + _player->SetEmoteState(Emote(emoteAnim)); break; default: // Only allow text-emotes for "dead" entities (feign death included) |