aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSnapperRy <snapperryen@gmail.com>2016-07-15 18:31:52 +0200
committerGitHub <noreply@github.com>2016-07-15 18:31:52 +0200
commita732749d721eefe7558d23e44c5f8dc18194e6d4 (patch)
tree948cf3b7d1cec0ae10c506f1110860f3d045b7d5 /src
parente9ef43cc205540e17cbd68ef30655533520e58aa (diff)
Core/Unit: remove emote state when creature attacks another unit (#17542)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 87a2da9743f..a78be0e3301 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -8584,6 +8584,9 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
ToCreature()->SendAIReaction(AI_REACTION_HOSTILE);
ToCreature()->CallAssistance();
+
+ // Remove emote state - will be restored on creature reset
+ SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
}
// delay offhand weapon attack to next attack time