diff options
| author | Carbenium <keresztesschmidt@gmail.com> | 2015-03-13 22:31:58 +0100 |
|---|---|---|
| committer | Carbenium <keresztesschmidt@gmail.com> | 2015-03-13 22:44:23 +0100 |
| commit | c68449f49ea539116f8a45db107b8120f60715eb (patch) | |
| tree | 4f62d38432a439f76b3c568a92e022d854d7fa8b /src/server/game/Handlers/ChatHandler.cpp | |
| parent | 8c329aff72c405c9224b8040a282abcf45996f78 (diff) | |
Core/Emote: Fix an issue with EMOTE_STATE_READ, which persisted after closing the map
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) |