aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MovementHandler.cpp
diff options
context:
space:
mode:
authorDuarte Duarte <dnpd.dd@gmail.com>2014-09-08 15:04:24 +0100
committerDuarte Duarte <dnpd.dd@gmail.com>2014-09-08 15:04:24 +0100
commit3206acf1e4882945f95370998c6089dedcaff7a6 (patch)
tree9e3bd4312be95da715ce815d2f8679d976dc2276 /src/server/game/Handlers/MovementHandler.cpp
parent6885eb4f2c7cf8941d4018b36a0b522e77092504 (diff)
parent57ceeae828f94557e865f5a903a2914e1ce3dfea (diff)
Merge pull request #13051 from Dekadencee/FixEmotes
Player/Emotes: Fix infinite dance and read map animation
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
-rw-r--r--src/server/game/Handlers/MovementHandler.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index b59f9aca943..139be4e9d4c 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -297,6 +297,10 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvPacket)
return;
}
+ // stop some emotes at player move
+ if (plrMover && (plrMover->GetUInt32Value(UNIT_NPC_EMOTESTATE) != 0))
+ plrMover->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
+
/* handle special cases */
if (movementInfo.transport.guid)
{