diff options
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ChatHandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index c908a772458..1c960961eaf 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -529,8 +529,10 @@ void WorldSession::HandleEmoteOpcode(WorldPackets::Chat::EmoteClient& /* packet if (!GetPlayer()->IsAlive() || GetPlayer()->HasUnitState(UNIT_STATE_DIED)) return; - sScriptMgr->OnPlayerEmote(GetPlayer(), 0); - GetPlayer()->HandleEmoteCommand(0); + sScriptMgr->OnPlayerClearEmote(GetPlayer()); + + if (_player->GetUInt32Value(UNIT_NPC_EMOTESTATE)) + _player->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); } void WorldSession::HandleTextEmoteOpcode(WorldPackets::Chat::CTextEmote& packet) |